From ecba45c93391066bc30c7bd602c3a7683fbb99a7 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 31 七月 2020 10:56:12 +0800
Subject: [PATCH] 临时备份
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 2
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 10137 ++++++++++++++++++++++----------------------
ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs | 19
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json | 56
ZigbeeApp/Home.Ios/Resources/DeviceName.ini | 3
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 17
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 20
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 24
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480-1.png | 0
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 41
ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs | 23
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs | 77
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs | 12
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-3.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png | 0
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs | 167
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs | 10
ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs | 4
ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs | 8
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs | 88
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 136
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs | 151
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs | 10
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 73
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-3.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242-1.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 86
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs | 60
ZigbeeApp/Shared/DLL/Android/Shared.Droid.dll | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs | 17
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs | 5
ZigbeeApp/Home.Ios/Info.plist | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 39
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs | 298 -
ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs | 14
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs | 6
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs | 10
ZigbeeApp/Shared/Shared.projitems | 7
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs | 182
ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png | 0
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs | 24
ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini | 3
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs | 6
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 4
ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 18
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 34
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 13
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-3.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 34
ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs | 6
ZigbeeApp/Shared/Common/CommonPage.cs | 4
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 99
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs | 7
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 48
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs | 53
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 6
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs | 10
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496-1.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelThreeButton.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs | 10
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 27
ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs | 24
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelFourButton.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008-1.png | 0
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png | 0
ZigbeeApp/Home.Ios/Resources/Language.ini | 2
ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png | 0
ZigbeeApp/Home.Ios/Home.IOS.csproj | 58
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs | 28
ZigbeeApp/Shared/R.cs | 8
ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 80
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs | 15
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs | 94
ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs | 190
ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs | 4
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png | 0
ZigbeeApp/Shared/Common/Device.cs | 129
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs | 10
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 83
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs | 47
ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs | 2
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs | 2
/dev/null | 203
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.png | 0
ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelTwoButton.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs | 10
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs | 16
ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs | 13
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 3
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828-1.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs | 8
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs | 6
ZigbeeApp/Shared/Common/House.cs | 54
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.png | 0
ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.png | 0
134 files changed, 6,187 insertions(+), 7,227 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
index be83f7f..7a871b7 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/DeviceName.ini
@@ -105,9 +105,6 @@
MGCD01/M-ZB.10 = 1306 / 鍚搁《寮忕噧姘斾紶鎰熷櫒 / 鍚搁《寮忕噧姘斾紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣�
;PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
MSPM25/M-ZB.10 = 1307 / PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� / PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� / 1307 / 绌烘皵璐ㄩ噺 / 浼犳劅鍣�
-;娓╂箍搴︿紶鎰熷櫒(杩欎釜涓滆タ濂藉儚鏈変袱涓�)
-MTH01/M-ZB.10 = 1308 / 娓╂箍搴︿紶鎰熷櫒 / 娓╂箍搴︿紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣�
-MSHIM01/M-ZB.10 = 1308 / 娓╂箍搴︿紶鎰熷櫒 / 娓╂箍搴︿紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣�
;***************************************************************
; 缁х數鍣ㄨ澶�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 3aa1b68..6c90466 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -1880,8 +1880,6 @@
16141=绱ф�ユ寜閽�
16142=闂ㄧ獥浼犳劅鍣�
16143=閽ュ寵鎵�
-16144=鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
-16145=闀挎寜姝ゆ寜閿�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png
index 91fa891..19d8078 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelFourButton.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png
index 6b9e971..96688db 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelThreeButton.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png
index fcaef59..bd1271c 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Instruct/PanelTwoButton.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/iconBackgroundColor1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/iconBackgroundColor1.png
deleted file mode 100755
index cecc4ee..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/iconBackgroundColor1.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/iconSelectedBackgroundColor1.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/iconSelectedBackgroundColor1.png
deleted file mode 100755
index b2c5368..0000000
--- a/ZigbeeApp/GateWay.Droid/Assets/Phone/ZigeeLogic/iconSelectedBackgroundColor1.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index af819da..9a22a2e 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -37,10 +37,11 @@
<MandroidI18n>CJK</MandroidI18n>
<AndroidTlsProvider>btls</AndroidTlsProvider>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
- <EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
- <AndroidSupportedAbis />
<AndroidDexTool>d8</AndroidDexTool>
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+<AndroidKeyStore>True</AndroidKeyStore>
+<AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL Home/HDL Home.keystore</AndroidSigningKeyStore>
+<EmbedAssembliesIntoApk>true</EmbedAssembliesIntoApk>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -56,6 +57,8 @@
<CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidUseAapt2>false</AndroidUseAapt2>
+ <AndroidKeyStore></AndroidKeyStore>
+ <AndroidSigningKeyStore>/Users/hdl/Desktop/Keystore/HDL\ Home/HDL\ Home.keystore</AndroidSigningKeyStore>
</PropertyGroup>
<ItemGroup>
<Reference Include="BouncyCastle.Crypto, Version=1.8.1.0, Culture=neutral, PublicKeyToken=0e99375e54769942">
@@ -2329,12 +2332,6 @@
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\SynchronizationSelected.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\ZigeeLogic\iconBackgroundColor1.png" />
- </ItemGroup>
- <ItemGroup>
- <AndroidAsset Include="Assets\Phone\ZigeeLogic\iconSelectedBackgroundColor1.png" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index 2aa220d..a0fa82c 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120072403" android:installLocation="auto" android:versionName="1.1.0120072403">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.hdl.home" android:versionCode="0120072401" android:installLocation="auto" android:versionName="1.1.0120072401">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.hdl.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 46c911e..135e242 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -2,7 +2,6 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -15,7 +14,7 @@
{
- [System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
public partial class Resource
{
@@ -26,238 +25,241 @@
public static void UpdateIdValues()
{
+ global::ZXing.Mobile.Resource.Id.contentFrame = global::GateWay.Droid.Resource.Id.contentFrame;
+ global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::GateWay.Droid.Resource.Layout.zxingscanneractivitylayout;
+ global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::GateWay.Droid.Resource.Layout.zxingscannerfragmentlayout;
}
public partial class Animation
{
- // aapt resource value: 0x7f050000
- public const int abc_fade_in = 2131034112;
+ // aapt resource value: 0x7F010000
+ public const int abc_fade_in = 2130771968;
- // aapt resource value: 0x7f050001
- public const int abc_fade_out = 2131034113;
+ // aapt resource value: 0x7F010001
+ public const int abc_fade_out = 2130771969;
- // aapt resource value: 0x7f050002
- public const int abc_grow_fade_in_from_bottom = 2131034114;
+ // aapt resource value: 0x7F010002
+ public const int abc_grow_fade_in_from_bottom = 2130771970;
- // aapt resource value: 0x7f050003
- public const int abc_popup_enter = 2131034115;
+ // aapt resource value: 0x7F010003
+ public const int abc_popup_enter = 2130771971;
- // aapt resource value: 0x7f050004
- public const int abc_popup_exit = 2131034116;
+ // aapt resource value: 0x7F010004
+ public const int abc_popup_exit = 2130771972;
- // aapt resource value: 0x7f050005
- public const int abc_shrink_fade_out_from_bottom = 2131034117;
+ // aapt resource value: 0x7F010005
+ public const int abc_shrink_fade_out_from_bottom = 2130771973;
- // aapt resource value: 0x7f050006
- public const int abc_slide_in_bottom = 2131034118;
+ // aapt resource value: 0x7F010006
+ public const int abc_slide_in_bottom = 2130771974;
- // aapt resource value: 0x7f050007
- public const int abc_slide_in_top = 2131034119;
+ // aapt resource value: 0x7F010007
+ public const int abc_slide_in_top = 2130771975;
- // aapt resource value: 0x7f050008
- public const int abc_slide_out_bottom = 2131034120;
+ // aapt resource value: 0x7F010008
+ public const int abc_slide_out_bottom = 2130771976;
- // aapt resource value: 0x7f050009
- public const int abc_slide_out_top = 2131034121;
+ // aapt resource value: 0x7F010009
+ public const int abc_slide_out_top = 2130771977;
- // aapt resource value: 0x7f05000a
- public const int design_bottom_sheet_slide_in = 2131034122;
+ // aapt resource value: 0x7F01000A
+ public const int design_bottom_sheet_slide_in = 2130771978;
- // aapt resource value: 0x7f05000b
- public const int design_bottom_sheet_slide_out = 2131034123;
+ // aapt resource value: 0x7F01000B
+ public const int design_bottom_sheet_slide_out = 2130771979;
- // aapt resource value: 0x7f05000c
- public const int design_snackbar_in = 2131034124;
+ // aapt resource value: 0x7F01000C
+ public const int design_snackbar_in = 2130771980;
- // aapt resource value: 0x7f05000d
- public const int design_snackbar_out = 2131034125;
+ // aapt resource value: 0x7F01000D
+ public const int design_snackbar_out = 2130771981;
- // aapt resource value: 0x7f05000e
- public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
+ // aapt resource value: 0x7F01000E
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
- // aapt resource value: 0x7f05000f
- public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
+ // aapt resource value: 0x7F01000F
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
- // aapt resource value: 0x7f050010
- public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
+ // aapt resource value: 0x7F010010
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
- // aapt resource value: 0x7f050011
- public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
+ // aapt resource value: 0x7F010011
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
- // aapt resource value: 0x7f050012
- public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
+ // aapt resource value: 0x7F010012
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
- // aapt resource value: 0x7f050013
- public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
+ // aapt resource value: 0x7F010013
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
- // aapt resource value: 0x7f050014
- public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
+ // aapt resource value: 0x7F010014
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
- // aapt resource value: 0x7f050015
- public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
+ // aapt resource value: 0x7F010015
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
- // aapt resource value: 0x7f050016
- public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
+ // aapt resource value: 0x7F010016
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
- // aapt resource value: 0x7f050017
- public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
+ // aapt resource value: 0x7F010017
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
- // aapt resource value: 0x7f050018
- public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
+ // aapt resource value: 0x7F010018
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
- // aapt resource value: 0x7f050019
- public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
+ // aapt resource value: 0x7F010019
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
- // aapt resource value: 0x7f05001a
- public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
+ // aapt resource value: 0x7F01001A
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
- // aapt resource value: 0x7f05001b
- public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
+ // aapt resource value: 0x7F01001B
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
- // aapt resource value: 0x7f05001c
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
+ // aapt resource value: 0x7F01001C
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
- // aapt resource value: 0x7f05001d
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
+ // aapt resource value: 0x7F01001D
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
- // aapt resource value: 0x7f05001e
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
+ // aapt resource value: 0x7F01001E
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
- // aapt resource value: 0x7f05001f
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
+ // aapt resource value: 0x7F01001F
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
- // aapt resource value: 0x7f050020
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
+ // aapt resource value: 0x7F010020
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
- // aapt resource value: 0x7f050021
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
+ // aapt resource value: 0x7F010021
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
- // aapt resource value: 0x7f050022
- public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
+ // aapt resource value: 0x7F010022
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
- // aapt resource value: 0x7f050023
- public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
+ // aapt resource value: 0x7F010023
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
- // aapt resource value: 0x7f050024
- public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
+ // aapt resource value: 0x7F010024
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
- // aapt resource value: 0x7f050025
- public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
+ // aapt resource value: 0x7F010025
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
- // aapt resource value: 0x7f050026
- public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
+ // aapt resource value: 0x7F010026
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
- // aapt resource value: 0x7f050027
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
+ // aapt resource value: 0x7F010027
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
- // aapt resource value: 0x7f050028
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
+ // aapt resource value: 0x7F010028
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
- // aapt resource value: 0x7f050029
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
+ // aapt resource value: 0x7F010029
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
- // aapt resource value: 0x7f05002a
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
+ // aapt resource value: 0x7F01002A
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
- // aapt resource value: 0x7f05002b
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
+ // aapt resource value: 0x7F01002B
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
- // aapt resource value: 0x7f05002c
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
+ // aapt resource value: 0x7F01002C
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
- // aapt resource value: 0x7f05002d
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
+ // aapt resource value: 0x7F01002D
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
- // aapt resource value: 0x7f05002e
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
+ // aapt resource value: 0x7F01002E
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
- // aapt resource value: 0x7f05002f
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
+ // aapt resource value: 0x7F01002F
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
- // aapt resource value: 0x7f050030
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
+ // aapt resource value: 0x7F010030
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
- // aapt resource value: 0x7f050031
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
+ // aapt resource value: 0x7F010031
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
- // aapt resource value: 0x7f050032
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
+ // aapt resource value: 0x7F010032
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
- // aapt resource value: 0x7f050033
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
+ // aapt resource value: 0x7F010033
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
- // aapt resource value: 0x7f050034
- public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
+ // aapt resource value: 0x7F010034
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
- // aapt resource value: 0x7f050035
- public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
+ // aapt resource value: 0x7F010035
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
- // aapt resource value: 0x7f050036
- public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
+ // aapt resource value: 0x7F010036
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
- // aapt resource value: 0x7f050037
- public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
+ // aapt resource value: 0x7F010037
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
- // aapt resource value: 0x7f050038
- public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
+ // aapt resource value: 0x7F010038
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
- // aapt resource value: 0x7f050039
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
+ // aapt resource value: 0x7F010039
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
- // aapt resource value: 0x7f05003a
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
+ // aapt resource value: 0x7F01003A
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
- // aapt resource value: 0x7f05003b
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
+ // aapt resource value: 0x7F01003B
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
- // aapt resource value: 0x7f05003c
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
+ // aapt resource value: 0x7F01003C
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
- // aapt resource value: 0x7f05003d
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
+ // aapt resource value: 0x7F01003D
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
- // aapt resource value: 0x7f05003e
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
+ // aapt resource value: 0x7F01003E
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
- // aapt resource value: 0x7f05003f
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
+ // aapt resource value: 0x7F01003F
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
- // aapt resource value: 0x7f050040
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
+ // aapt resource value: 0x7F010040
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
- // aapt resource value: 0x7f050041
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
+ // aapt resource value: 0x7F010041
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
- // aapt resource value: 0x7f050042
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
+ // aapt resource value: 0x7F010042
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
- // aapt resource value: 0x7f050043
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
+ // aapt resource value: 0x7F010043
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
- // aapt resource value: 0x7f050044
- public const int move_in = 2131034180;
+ // aapt resource value: 0x7F010044
+ public const int move_in = 2130772036;
- // aapt resource value: 0x7f050045
- public const int move_out = 2131034181;
+ // aapt resource value: 0x7F010045
+ public const int move_out = 2130772037;
- // aapt resource value: 0x7f050046
- public const int pickerview_dialog_scale_in = 2131034182;
+ // aapt resource value: 0x7F010046
+ public const int pickerview_dialog_scale_in = 2130772038;
- // aapt resource value: 0x7f050047
- public const int pickerview_dialog_scale_out = 2131034183;
+ // aapt resource value: 0x7F010047
+ public const int pickerview_dialog_scale_out = 2130772039;
- // aapt resource value: 0x7f050048
- public const int pickerview_slide_in_bottom = 2131034184;
+ // aapt resource value: 0x7F010048
+ public const int pickerview_slide_in_bottom = 2130772040;
- // aapt resource value: 0x7f050049
- public const int pickerview_slide_out_bottom = 2131034185;
+ // aapt resource value: 0x7F010049
+ public const int pickerview_slide_out_bottom = 2130772041;
- // aapt resource value: 0x7f05004a
- public const int tooltip_enter = 2131034186;
+ // aapt resource value: 0x7F01004A
+ public const int tooltip_enter = 2130772042;
- // aapt resource value: 0x7f05004b
- public const int tooltip_exit = 2131034187;
+ // aapt resource value: 0x7F01004B
+ public const int tooltip_exit = 2130772043;
static Animation()
{
@@ -272,8 +274,8 @@
public partial class Animator
{
- // aapt resource value: 0x7f060000
- public const int design_appbar_state_list_animator = 2131099648;
+ // aapt resource value: 0x7F020000
+ public const int design_appbar_state_list_animator = 2130837504;
static Animator()
{
@@ -288,8 +290,8 @@
public partial class Array
{
- // aapt resource value: 0x7f0f0000
- public const int arc_colors_default = 2131689472;
+ // aapt resource value: 0x7F030000
+ public const int arc_colors_default = 2130903040;
static Array()
{
@@ -304,1355 +306,1355 @@
public partial class Attribute
{
- // aapt resource value: 0x7f010052
- public const int actionBarDivider = 2130772050;
+ // aapt resource value: 0x7F040000
+ public const int actionBarDivider = 2130968576;
- // aapt resource value: 0x7f010053
- public const int actionBarItemBackground = 2130772051;
+ // aapt resource value: 0x7F040001
+ public const int actionBarItemBackground = 2130968577;
- // aapt resource value: 0x7f01004c
- public const int actionBarPopupTheme = 2130772044;
+ // aapt resource value: 0x7F040002
+ public const int actionBarPopupTheme = 2130968578;
- // aapt resource value: 0x7f010051
- public const int actionBarSize = 2130772049;
+ // aapt resource value: 0x7F040003
+ public const int actionBarSize = 2130968579;
- // aapt resource value: 0x7f01004e
- public const int actionBarSplitStyle = 2130772046;
+ // aapt resource value: 0x7F040004
+ public const int actionBarSplitStyle = 2130968580;
- // aapt resource value: 0x7f01004d
- public const int actionBarStyle = 2130772045;
+ // aapt resource value: 0x7F040005
+ public const int actionBarStyle = 2130968581;
- // aapt resource value: 0x7f010048
- public const int actionBarTabBarStyle = 2130772040;
+ // aapt resource value: 0x7F040006
+ public const int actionBarTabBarStyle = 2130968582;
- // aapt resource value: 0x7f010047
- public const int actionBarTabStyle = 2130772039;
+ // aapt resource value: 0x7F040007
+ public const int actionBarTabStyle = 2130968583;
- // aapt resource value: 0x7f010049
- public const int actionBarTabTextStyle = 2130772041;
+ // aapt resource value: 0x7F040008
+ public const int actionBarTabTextStyle = 2130968584;
- // aapt resource value: 0x7f01004f
- public const int actionBarTheme = 2130772047;
+ // aapt resource value: 0x7F040009
+ public const int actionBarTheme = 2130968585;
- // aapt resource value: 0x7f010050
- public const int actionBarWidgetTheme = 2130772048;
+ // aapt resource value: 0x7F04000A
+ public const int actionBarWidgetTheme = 2130968586;
- // aapt resource value: 0x7f01006d
- public const int actionButtonStyle = 2130772077;
+ // aapt resource value: 0x7F04000B
+ public const int actionButtonStyle = 2130968587;
- // aapt resource value: 0x7f010069
- public const int actionDropDownStyle = 2130772073;
+ // aapt resource value: 0x7F04000C
+ public const int actionDropDownStyle = 2130968588;
- // aapt resource value: 0x7f0100c4
- public const int actionLayout = 2130772164;
+ // aapt resource value: 0x7F04000D
+ public const int actionLayout = 2130968589;
- // aapt resource value: 0x7f010054
- public const int actionMenuTextAppearance = 2130772052;
+ // aapt resource value: 0x7F04000E
+ public const int actionMenuTextAppearance = 2130968590;
- // aapt resource value: 0x7f010055
- public const int actionMenuTextColor = 2130772053;
+ // aapt resource value: 0x7F04000F
+ public const int actionMenuTextColor = 2130968591;
- // aapt resource value: 0x7f010058
- public const int actionModeBackground = 2130772056;
+ // aapt resource value: 0x7F040010
+ public const int actionModeBackground = 2130968592;
- // aapt resource value: 0x7f010057
- public const int actionModeCloseButtonStyle = 2130772055;
+ // aapt resource value: 0x7F040011
+ public const int actionModeCloseButtonStyle = 2130968593;
- // aapt resource value: 0x7f01005a
- public const int actionModeCloseDrawable = 2130772058;
+ // aapt resource value: 0x7F040012
+ public const int actionModeCloseDrawable = 2130968594;
- // aapt resource value: 0x7f01005c
- public const int actionModeCopyDrawable = 2130772060;
+ // aapt resource value: 0x7F040013
+ public const int actionModeCopyDrawable = 2130968595;
- // aapt resource value: 0x7f01005b
- public const int actionModeCutDrawable = 2130772059;
+ // aapt resource value: 0x7F040014
+ public const int actionModeCutDrawable = 2130968596;
- // aapt resource value: 0x7f010060
- public const int actionModeFindDrawable = 2130772064;
+ // aapt resource value: 0x7F040015
+ public const int actionModeFindDrawable = 2130968597;
- // aapt resource value: 0x7f01005d
- public const int actionModePasteDrawable = 2130772061;
+ // aapt resource value: 0x7F040016
+ public const int actionModePasteDrawable = 2130968598;
- // aapt resource value: 0x7f010062
- public const int actionModePopupWindowStyle = 2130772066;
+ // aapt resource value: 0x7F040017
+ public const int actionModePopupWindowStyle = 2130968599;
- // aapt resource value: 0x7f01005e
- public const int actionModeSelectAllDrawable = 2130772062;
+ // aapt resource value: 0x7F040018
+ public const int actionModeSelectAllDrawable = 2130968600;
- // aapt resource value: 0x7f01005f
- public const int actionModeShareDrawable = 2130772063;
+ // aapt resource value: 0x7F040019
+ public const int actionModeShareDrawable = 2130968601;
- // aapt resource value: 0x7f010059
- public const int actionModeSplitBackground = 2130772057;
+ // aapt resource value: 0x7F04001A
+ public const int actionModeSplitBackground = 2130968602;
- // aapt resource value: 0x7f010056
- public const int actionModeStyle = 2130772054;
+ // aapt resource value: 0x7F04001B
+ public const int actionModeStyle = 2130968603;
- // aapt resource value: 0x7f010061
- public const int actionModeWebSearchDrawable = 2130772065;
+ // aapt resource value: 0x7F04001C
+ public const int actionModeWebSearchDrawable = 2130968604;
- // aapt resource value: 0x7f01004a
- public const int actionOverflowButtonStyle = 2130772042;
+ // aapt resource value: 0x7F04001D
+ public const int actionOverflowButtonStyle = 2130968605;
- // aapt resource value: 0x7f01004b
- public const int actionOverflowMenuStyle = 2130772043;
+ // aapt resource value: 0x7F04001E
+ public const int actionOverflowMenuStyle = 2130968606;
- // aapt resource value: 0x7f0100c6
- public const int actionProviderClass = 2130772166;
+ // aapt resource value: 0x7F04001F
+ public const int actionProviderClass = 2130968607;
- // aapt resource value: 0x7f0100c5
- public const int actionViewClass = 2130772165;
+ // aapt resource value: 0x7F040020
+ public const int actionViewClass = 2130968608;
- // aapt resource value: 0x7f010075
- public const int activityChooserViewStyle = 2130772085;
+ // aapt resource value: 0x7F040021
+ public const int activityChooserViewStyle = 2130968609;
- // aapt resource value: 0x7f01009a
- public const int alertDialogButtonGroupStyle = 2130772122;
+ // aapt resource value: 0x7F040022
+ public const int alertDialogButtonGroupStyle = 2130968610;
- // aapt resource value: 0x7f01009b
- public const int alertDialogCenterButtons = 2130772123;
+ // aapt resource value: 0x7F040023
+ public const int alertDialogCenterButtons = 2130968611;
- // aapt resource value: 0x7f010099
- public const int alertDialogStyle = 2130772121;
+ // aapt resource value: 0x7F040024
+ public const int alertDialogStyle = 2130968612;
- // aapt resource value: 0x7f01009c
- public const int alertDialogTheme = 2130772124;
+ // aapt resource value: 0x7F040025
+ public const int alertDialogTheme = 2130968613;
- // aapt resource value: 0x7f0100b2
- public const int allowStacking = 2130772146;
+ // aapt resource value: 0x7F040026
+ public const int allowStacking = 2130968614;
- // aapt resource value: 0x7f0100b3
- public const int alpha = 2130772147;
+ // aapt resource value: 0x7F040027
+ public const int alpha = 2130968615;
- // aapt resource value: 0x7f0100c1
- public const int alphabeticModifiers = 2130772161;
+ // aapt resource value: 0x7F040028
+ public const int alphabeticModifiers = 2130968616;
- // aapt resource value: 0x7f0101a3
- public const int arc_border_color = 2130772387;
+ // aapt resource value: 0x7F040029
+ public const int arc_border_color = 2130968617;
- // aapt resource value: 0x7f0101a2
- public const int arc_border_width = 2130772386;
+ // aapt resource value: 0x7F04002A
+ public const int arc_border_width = 2130968618;
- // aapt resource value: 0x7f0101a1
- public const int arc_colors = 2130772385;
+ // aapt resource value: 0x7F04002B
+ public const int arc_colors = 2130968619;
- // aapt resource value: 0x7f0101a4
- public const int arc_max = 2130772388;
+ // aapt resource value: 0x7F04002C
+ public const int arc_max = 2130968620;
- // aapt resource value: 0x7f0101a5
- public const int arc_min = 2130772389;
+ // aapt resource value: 0x7F04002D
+ public const int arc_min = 2130968621;
- // aapt resource value: 0x7f01019f
- public const int arc_open_angle = 2130772383;
+ // aapt resource value: 0x7F04002E
+ public const int arc_open_angle = 2130968622;
- // aapt resource value: 0x7f0101a6
- public const int arc_progress = 2130772390;
+ // aapt resource value: 0x7F04002F
+ public const int arc_progress = 2130968623;
- // aapt resource value: 0x7f0101ae
- public const int arc_progress_bar_color = 2130772398;
+ // aapt resource value: 0x7F040030
+ public const int arc_progress_bar_color = 2130968624;
- // aapt resource value: 0x7f0101af
- public const int arc_progress_bar_text_unit = 2130772399;
+ // aapt resource value: 0x7F040031
+ public const int arc_progress_bar_text_unit = 2130968625;
- // aapt resource value: 0x7f0101a0
- public const int arc_rotate_angle = 2130772384;
+ // aapt resource value: 0x7F040032
+ public const int arc_rotate_angle = 2130968626;
- // aapt resource value: 0x7f0101ad
- public const int arc_shadow_radius = 2130772397;
+ // aapt resource value: 0x7F040033
+ public const int arc_shadow_radius = 2130968627;
- // aapt resource value: 0x7f0101a8
- public const int arc_thumb_color = 2130772392;
+ // aapt resource value: 0x7F040034
+ public const int arc_thumb_color = 2130968628;
- // aapt resource value: 0x7f0101a9
- public const int arc_thumb_radius = 2130772393;
+ // aapt resource value: 0x7F040035
+ public const int arc_thumb_radius = 2130968629;
- // aapt resource value: 0x7f0101ab
- public const int arc_thumb_shadow_color = 2130772395;
+ // aapt resource value: 0x7F040036
+ public const int arc_thumb_shadow_color = 2130968630;
- // aapt resource value: 0x7f0101aa
- public const int arc_thumb_shadow_radius = 2130772394;
+ // aapt resource value: 0x7F040037
+ public const int arc_thumb_shadow_radius = 2130968631;
- // aapt resource value: 0x7f0101a7
- public const int arc_thumb_width = 2130772391;
+ // aapt resource value: 0x7F040038
+ public const int arc_thumb_width = 2130968632;
- // aapt resource value: 0x7f01019e
- public const int arc_width = 2130772382;
+ // aapt resource value: 0x7F040039
+ public const int arc_width = 2130968633;
- // aapt resource value: 0x7f0100ba
- public const int arrowHeadLength = 2130772154;
+ // aapt resource value: 0x7F04003A
+ public const int arrowHeadLength = 2130968634;
- // aapt resource value: 0x7f0100bb
- public const int arrowShaftLength = 2130772155;
+ // aapt resource value: 0x7F04003B
+ public const int arrowShaftLength = 2130968635;
- // aapt resource value: 0x7f0100a1
- public const int autoCompleteTextViewStyle = 2130772129;
+ // aapt resource value: 0x7F04003C
+ public const int autoCompleteTextViewStyle = 2130968636;
- // aapt resource value: 0x7f01003b
- public const int autoSizeMaxTextSize = 2130772027;
+ // aapt resource value: 0x7F04003D
+ public const int autoSizeMaxTextSize = 2130968637;
- // aapt resource value: 0x7f01003a
- public const int autoSizeMinTextSize = 2130772026;
+ // aapt resource value: 0x7F04003E
+ public const int autoSizeMinTextSize = 2130968638;
- // aapt resource value: 0x7f010039
- public const int autoSizePresetSizes = 2130772025;
+ // aapt resource value: 0x7F04003F
+ public const int autoSizePresetSizes = 2130968639;
- // aapt resource value: 0x7f010038
- public const int autoSizeStepGranularity = 2130772024;
+ // aapt resource value: 0x7F040040
+ public const int autoSizeStepGranularity = 2130968640;
- // aapt resource value: 0x7f010037
- public const int autoSizeTextType = 2130772023;
+ // aapt resource value: 0x7F040041
+ public const int autoSizeTextType = 2130968641;
- // aapt resource value: 0x7f010015
- public const int background = 2130771989;
+ // aapt resource value: 0x7F040042
+ public const int background = 2130968642;
- // aapt resource value: 0x7f010017
- public const int backgroundSplit = 2130771991;
+ // aapt resource value: 0x7F040043
+ public const int backgroundSplit = 2130968643;
- // aapt resource value: 0x7f010016
- public const int backgroundStacked = 2130771990;
+ // aapt resource value: 0x7F040044
+ public const int backgroundStacked = 2130968644;
- // aapt resource value: 0x7f0100fd
- public const int backgroundTint = 2130772221;
+ // aapt resource value: 0x7F040045
+ public const int backgroundTint = 2130968645;
- // aapt resource value: 0x7f0100fe
- public const int backgroundTintMode = 2130772222;
+ // aapt resource value: 0x7F040046
+ public const int backgroundTintMode = 2130968646;
- // aapt resource value: 0x7f0100bc
- public const int barLength = 2130772156;
+ // aapt resource value: 0x7F040047
+ public const int barLength = 2130968647;
- // aapt resource value: 0x7f010128
- public const int behavior_autoHide = 2130772264;
+ // aapt resource value: 0x7F040048
+ public const int behavior_autoHide = 2130968648;
- // aapt resource value: 0x7f010105
- public const int behavior_hideable = 2130772229;
+ // aapt resource value: 0x7F040049
+ public const int behavior_hideable = 2130968649;
- // aapt resource value: 0x7f010131
- public const int behavior_overlapTop = 2130772273;
+ // aapt resource value: 0x7F04004A
+ public const int behavior_overlapTop = 2130968650;
- // aapt resource value: 0x7f010104
- public const int behavior_peekHeight = 2130772228;
+ // aapt resource value: 0x7F04004B
+ public const int behavior_peekHeight = 2130968651;
- // aapt resource value: 0x7f010106
- public const int behavior_skipCollapsed = 2130772230;
+ // aapt resource value: 0x7F04004C
+ public const int behavior_skipCollapsed = 2130968652;
- // aapt resource value: 0x7f01015a
- public const int biometricPromptDialogTheme = 2130772314;
+ // aapt resource value: 0x7F04004D
+ public const int biometricPromptDialogTheme = 2130968653;
- // aapt resource value: 0x7f010126
- public const int borderWidth = 2130772262;
+ // aapt resource value: 0x7F04004F
+ public const int borderlessButtonStyle = 2130968655;
- // aapt resource value: 0x7f010072
- public const int borderlessButtonStyle = 2130772082;
+ // aapt resource value: 0x7F04004E
+ public const int borderWidth = 2130968654;
- // aapt resource value: 0x7f010120
- public const int bottomSheetDialogTheme = 2130772256;
+ // aapt resource value: 0x7F040050
+ public const int bottomSheetDialogTheme = 2130968656;
- // aapt resource value: 0x7f010121
- public const int bottomSheetStyle = 2130772257;
+ // aapt resource value: 0x7F040051
+ public const int bottomSheetStyle = 2130968657;
- // aapt resource value: 0x7f01006f
- public const int buttonBarButtonStyle = 2130772079;
+ // aapt resource value: 0x7F040052
+ public const int buttonBarButtonStyle = 2130968658;
- // aapt resource value: 0x7f01009f
- public const int buttonBarNegativeButtonStyle = 2130772127;
+ // aapt resource value: 0x7F040053
+ public const int buttonBarNegativeButtonStyle = 2130968659;
- // aapt resource value: 0x7f0100a0
- public const int buttonBarNeutralButtonStyle = 2130772128;
+ // aapt resource value: 0x7F040054
+ public const int buttonBarNeutralButtonStyle = 2130968660;
- // aapt resource value: 0x7f01009e
- public const int buttonBarPositiveButtonStyle = 2130772126;
+ // aapt resource value: 0x7F040055
+ public const int buttonBarPositiveButtonStyle = 2130968661;
- // aapt resource value: 0x7f01006e
- public const int buttonBarStyle = 2130772078;
+ // aapt resource value: 0x7F040056
+ public const int buttonBarStyle = 2130968662;
- // aapt resource value: 0x7f0100f2
- public const int buttonGravity = 2130772210;
+ // aapt resource value: 0x7F040057
+ public const int buttonGravity = 2130968663;
- // aapt resource value: 0x7f01002a
- public const int buttonPanelSideLayout = 2130772010;
+ // aapt resource value: 0x7F040058
+ public const int buttonPanelSideLayout = 2130968664;
- // aapt resource value: 0x7f0100a2
- public const int buttonStyle = 2130772130;
+ // aapt resource value: 0x7F040059
+ public const int buttonStyle = 2130968665;
- // aapt resource value: 0x7f0100a3
- public const int buttonStyleSmall = 2130772131;
+ // aapt resource value: 0x7F04005A
+ public const int buttonStyleSmall = 2130968666;
- // aapt resource value: 0x7f0100b4
- public const int buttonTint = 2130772148;
+ // aapt resource value: 0x7F04005B
+ public const int buttonTint = 2130968667;
- // aapt resource value: 0x7f0100b5
- public const int buttonTintMode = 2130772149;
+ // aapt resource value: 0x7F04005C
+ public const int buttonTintMode = 2130968668;
- // aapt resource value: 0x7f0100a4
- public const int checkboxStyle = 2130772132;
+ // aapt resource value: 0x7F04005D
+ public const int checkboxStyle = 2130968669;
- // aapt resource value: 0x7f0100a5
- public const int checkedTextViewStyle = 2130772133;
+ // aapt resource value: 0x7F04005E
+ public const int checkedTextViewStyle = 2130968670;
- // aapt resource value: 0x7f0100d5
- public const int closeIcon = 2130772181;
+ // aapt resource value: 0x7F04005F
+ public const int closeIcon = 2130968671;
- // aapt resource value: 0x7f010027
- public const int closeItemLayout = 2130772007;
+ // aapt resource value: 0x7F040060
+ public const int closeItemLayout = 2130968672;
- // aapt resource value: 0x7f0100f4
- public const int collapseContentDescription = 2130772212;
+ // aapt resource value: 0x7F040061
+ public const int collapseContentDescription = 2130968673;
- // aapt resource value: 0x7f0100f3
- public const int collapseIcon = 2130772211;
+ // aapt resource value: 0x7F040063
+ public const int collapsedTitleGravity = 2130968675;
- // aapt resource value: 0x7f010113
- public const int collapsedTitleGravity = 2130772243;
+ // aapt resource value: 0x7F040064
+ public const int collapsedTitleTextAppearance = 2130968676;
- // aapt resource value: 0x7f01010d
- public const int collapsedTitleTextAppearance = 2130772237;
+ // aapt resource value: 0x7F040062
+ public const int collapseIcon = 2130968674;
- // aapt resource value: 0x7f0100b6
- public const int color = 2130772150;
+ // aapt resource value: 0x7F040065
+ public const int color = 2130968677;
- // aapt resource value: 0x7f010091
- public const int colorAccent = 2130772113;
+ // aapt resource value: 0x7F040066
+ public const int colorAccent = 2130968678;
- // aapt resource value: 0x7f010098
- public const int colorBackgroundFloating = 2130772120;
+ // aapt resource value: 0x7F040067
+ public const int colorBackgroundFloating = 2130968679;
- // aapt resource value: 0x7f010095
- public const int colorButtonNormal = 2130772117;
+ // aapt resource value: 0x7F040068
+ public const int colorButtonNormal = 2130968680;
- // aapt resource value: 0x7f010093
- public const int colorControlActivated = 2130772115;
+ // aapt resource value: 0x7F040069
+ public const int colorControlActivated = 2130968681;
- // aapt resource value: 0x7f010094
- public const int colorControlHighlight = 2130772116;
+ // aapt resource value: 0x7F04006A
+ public const int colorControlHighlight = 2130968682;
- // aapt resource value: 0x7f010092
- public const int colorControlNormal = 2130772114;
+ // aapt resource value: 0x7F04006B
+ public const int colorControlNormal = 2130968683;
- // aapt resource value: 0x7f0100b1
- public const int colorError = 2130772145;
+ // aapt resource value: 0x7F04006C
+ public const int colorError = 2130968684;
- // aapt resource value: 0x7f01008f
- public const int colorPrimary = 2130772111;
+ // aapt resource value: 0x7F04006D
+ public const int colorPrimary = 2130968685;
- // aapt resource value: 0x7f010090
- public const int colorPrimaryDark = 2130772112;
+ // aapt resource value: 0x7F04006E
+ public const int colorPrimaryDark = 2130968686;
- // aapt resource value: 0x7f010096
- public const int colorSwitchThumbNormal = 2130772118;
+ // aapt resource value: 0x7F04006F
+ public const int colorSwitchThumbNormal = 2130968687;
- // aapt resource value: 0x7f0100da
- public const int commitIcon = 2130772186;
+ // aapt resource value: 0x7F040070
+ public const int commitIcon = 2130968688;
- // aapt resource value: 0x7f0100c7
- public const int contentDescription = 2130772167;
+ // aapt resource value: 0x7F040071
+ public const int contentDescription = 2130968689;
- // aapt resource value: 0x7f010020
- public const int contentInsetEnd = 2130772000;
+ // aapt resource value: 0x7F040072
+ public const int contentInsetEnd = 2130968690;
- // aapt resource value: 0x7f010024
- public const int contentInsetEndWithActions = 2130772004;
+ // aapt resource value: 0x7F040073
+ public const int contentInsetEndWithActions = 2130968691;
- // aapt resource value: 0x7f010021
- public const int contentInsetLeft = 2130772001;
+ // aapt resource value: 0x7F040074
+ public const int contentInsetLeft = 2130968692;
- // aapt resource value: 0x7f010022
- public const int contentInsetRight = 2130772002;
+ // aapt resource value: 0x7F040075
+ public const int contentInsetRight = 2130968693;
- // aapt resource value: 0x7f01001f
- public const int contentInsetStart = 2130771999;
+ // aapt resource value: 0x7F040076
+ public const int contentInsetStart = 2130968694;
- // aapt resource value: 0x7f010023
- public const int contentInsetStartWithNavigation = 2130772003;
+ // aapt resource value: 0x7F040077
+ public const int contentInsetStartWithNavigation = 2130968695;
- // aapt resource value: 0x7f01010e
- public const int contentScrim = 2130772238;
+ // aapt resource value: 0x7F040078
+ public const int contentScrim = 2130968696;
- // aapt resource value: 0x7f010097
- public const int controlBackground = 2130772119;
+ // aapt resource value: 0x7F040079
+ public const int controlBackground = 2130968697;
- // aapt resource value: 0x7f010147
- public const int counterEnabled = 2130772295;
+ // aapt resource value: 0x7F04007A
+ public const int counterEnabled = 2130968698;
- // aapt resource value: 0x7f010148
- public const int counterMaxLength = 2130772296;
+ // aapt resource value: 0x7F04007B
+ public const int counterMaxLength = 2130968699;
- // aapt resource value: 0x7f01014a
- public const int counterOverflowTextAppearance = 2130772298;
+ // aapt resource value: 0x7F04007C
+ public const int counterOverflowTextAppearance = 2130968700;
- // aapt resource value: 0x7f010149
- public const int counterTextAppearance = 2130772297;
+ // aapt resource value: 0x7F04007D
+ public const int counterTextAppearance = 2130968701;
- // aapt resource value: 0x7f0101b2
- public const int curtain_bar_bg_color = 2130772402;
+ // aapt resource value: 0x7F04007E
+ public const int curtain_bar_bg_color = 2130968702;
- // aapt resource value: 0x7f0101b3
- public const int curtain_bar_border_color = 2130772403;
+ // aapt resource value: 0x7F04007F
+ public const int curtain_bar_border_color = 2130968703;
- // aapt resource value: 0x7f0101b0
- public const int curtain_bar_color = 2130772400;
+ // aapt resource value: 0x7F040080
+ public const int curtain_bar_color = 2130968704;
- // aapt resource value: 0x7f0101b5
- public const int curtain_bar_height = 2130772405;
+ // aapt resource value: 0x7F040081
+ public const int curtain_bar_height = 2130968705;
- // aapt resource value: 0x7f0101b4
- public const int curtain_bar_width = 2130772404;
+ // aapt resource value: 0x7F040082
+ public const int curtain_bar_width = 2130968706;
- // aapt resource value: 0x7f010018
- public const int customNavigationLayout = 2130771992;
+ // aapt resource value: 0x7F040083
+ public const int customNavigationLayout = 2130968707;
- // aapt resource value: 0x7f0100d4
- public const int defaultQueryHint = 2130772180;
+ // aapt resource value: 0x7F040084
+ public const int defaultQueryHint = 2130968708;
- // aapt resource value: 0x7f010067
- public const int dialogPreferredPadding = 2130772071;
+ // aapt resource value: 0x7F040085
+ public const int dialogPreferredPadding = 2130968709;
- // aapt resource value: 0x7f010066
- public const int dialogTheme = 2130772070;
+ // aapt resource value: 0x7F040086
+ public const int dialogTheme = 2130968710;
- // aapt resource value: 0x7f01000e
- public const int displayOptions = 2130771982;
+ // aapt resource value: 0x7F040087
+ public const int displayOptions = 2130968711;
- // aapt resource value: 0x7f010014
- public const int divider = 2130771988;
+ // aapt resource value: 0x7F040088
+ public const int divider = 2130968712;
- // aapt resource value: 0x7f010074
- public const int dividerHorizontal = 2130772084;
+ // aapt resource value: 0x7F040089
+ public const int dividerHorizontal = 2130968713;
- // aapt resource value: 0x7f0100c0
- public const int dividerPadding = 2130772160;
+ // aapt resource value: 0x7F04008A
+ public const int dividerPadding = 2130968714;
- // aapt resource value: 0x7f010073
- public const int dividerVertical = 2130772083;
+ // aapt resource value: 0x7F04008B
+ public const int dividerVertical = 2130968715;
- // aapt resource value: 0x7f0100b8
- public const int drawableSize = 2130772152;
+ // aapt resource value: 0x7F04008C
+ public const int drawableSize = 2130968716;
- // aapt resource value: 0x7f010009
- public const int drawerArrowStyle = 2130771977;
+ // aapt resource value: 0x7F04008D
+ public const int drawerArrowStyle = 2130968717;
- // aapt resource value: 0x7f010086
- public const int dropDownListViewStyle = 2130772102;
+ // aapt resource value: 0x7F04008F
+ public const int dropdownListPreferredItemHeight = 2130968719;
- // aapt resource value: 0x7f01006a
- public const int dropdownListPreferredItemHeight = 2130772074;
+ // aapt resource value: 0x7F04008E
+ public const int dropDownListViewStyle = 2130968718;
- // aapt resource value: 0x7f01007b
- public const int editTextBackground = 2130772091;
+ // aapt resource value: 0x7F040090
+ public const int editTextBackground = 2130968720;
- // aapt resource value: 0x7f01007a
- public const int editTextColor = 2130772090;
+ // aapt resource value: 0x7F040091
+ public const int editTextColor = 2130968721;
- // aapt resource value: 0x7f0100a6
- public const int editTextStyle = 2130772134;
+ // aapt resource value: 0x7F040092
+ public const int editTextStyle = 2130968722;
- // aapt resource value: 0x7f010025
- public const int elevation = 2130772005;
+ // aapt resource value: 0x7F040093
+ public const int elevation = 2130968723;
- // aapt resource value: 0x7f010145
- public const int errorEnabled = 2130772293;
+ // aapt resource value: 0x7F040094
+ public const int errorEnabled = 2130968724;
- // aapt resource value: 0x7f010146
- public const int errorTextAppearance = 2130772294;
+ // aapt resource value: 0x7F040095
+ public const int errorTextAppearance = 2130968725;
- // aapt resource value: 0x7f010029
- public const int expandActivityOverflowButtonDrawable = 2130772009;
+ // aapt resource value: 0x7F040096
+ public const int expandActivityOverflowButtonDrawable = 2130968726;
- // aapt resource value: 0x7f0100ff
- public const int expanded = 2130772223;
+ // aapt resource value: 0x7F040097
+ public const int expanded = 2130968727;
- // aapt resource value: 0x7f010114
- public const int expandedTitleGravity = 2130772244;
+ // aapt resource value: 0x7F040098
+ public const int expandedTitleGravity = 2130968728;
- // aapt resource value: 0x7f010107
- public const int expandedTitleMargin = 2130772231;
+ // aapt resource value: 0x7F040099
+ public const int expandedTitleMargin = 2130968729;
- // aapt resource value: 0x7f01010b
- public const int expandedTitleMarginBottom = 2130772235;
+ // aapt resource value: 0x7F04009A
+ public const int expandedTitleMarginBottom = 2130968730;
- // aapt resource value: 0x7f01010a
- public const int expandedTitleMarginEnd = 2130772234;
+ // aapt resource value: 0x7F04009B
+ public const int expandedTitleMarginEnd = 2130968731;
- // aapt resource value: 0x7f010108
- public const int expandedTitleMarginStart = 2130772232;
+ // aapt resource value: 0x7F04009C
+ public const int expandedTitleMarginStart = 2130968732;
- // aapt resource value: 0x7f010109
- public const int expandedTitleMarginTop = 2130772233;
+ // aapt resource value: 0x7F04009D
+ public const int expandedTitleMarginTop = 2130968733;
- // aapt resource value: 0x7f01010c
- public const int expandedTitleTextAppearance = 2130772236;
+ // aapt resource value: 0x7F04009E
+ public const int expandedTitleTextAppearance = 2130968734;
- // aapt resource value: 0x7f010124
- public const int fabSize = 2130772260;
+ // aapt resource value: 0x7F04009F
+ public const int fabSize = 2130968735;
- // aapt resource value: 0x7f010004
- public const int fastScrollEnabled = 2130771972;
+ // aapt resource value: 0x7F0400A0
+ public const int fastScrollEnabled = 2130968736;
- // aapt resource value: 0x7f010007
- public const int fastScrollHorizontalThumbDrawable = 2130771975;
+ // aapt resource value: 0x7F0400A1
+ public const int fastScrollHorizontalThumbDrawable = 2130968737;
- // aapt resource value: 0x7f010008
- public const int fastScrollHorizontalTrackDrawable = 2130771976;
+ // aapt resource value: 0x7F0400A2
+ public const int fastScrollHorizontalTrackDrawable = 2130968738;
- // aapt resource value: 0x7f010005
- public const int fastScrollVerticalThumbDrawable = 2130771973;
+ // aapt resource value: 0x7F0400A3
+ public const int fastScrollVerticalThumbDrawable = 2130968739;
- // aapt resource value: 0x7f010006
- public const int fastScrollVerticalTrackDrawable = 2130771974;
+ // aapt resource value: 0x7F0400A4
+ public const int fastScrollVerticalTrackDrawable = 2130968740;
- // aapt resource value: 0x7f010158
- public const int font = 2130772312;
+ // aapt resource value: 0x7F0400A5
+ public const int font = 2130968741;
- // aapt resource value: 0x7f01003c
- public const int fontFamily = 2130772028;
+ // aapt resource value: 0x7F0400A6
+ public const int fontFamily = 2130968742;
- // aapt resource value: 0x7f010151
- public const int fontProviderAuthority = 2130772305;
+ // aapt resource value: 0x7F0400A7
+ public const int fontProviderAuthority = 2130968743;
- // aapt resource value: 0x7f010154
- public const int fontProviderCerts = 2130772308;
+ // aapt resource value: 0x7F0400A8
+ public const int fontProviderCerts = 2130968744;
- // aapt resource value: 0x7f010155
- public const int fontProviderFetchStrategy = 2130772309;
+ // aapt resource value: 0x7F0400A9
+ public const int fontProviderFetchStrategy = 2130968745;
- // aapt resource value: 0x7f010156
- public const int fontProviderFetchTimeout = 2130772310;
+ // aapt resource value: 0x7F0400AA
+ public const int fontProviderFetchTimeout = 2130968746;
- // aapt resource value: 0x7f010152
- public const int fontProviderPackage = 2130772306;
+ // aapt resource value: 0x7F0400AB
+ public const int fontProviderPackage = 2130968747;
- // aapt resource value: 0x7f010153
- public const int fontProviderQuery = 2130772307;
+ // aapt resource value: 0x7F0400AC
+ public const int fontProviderQuery = 2130968748;
- // aapt resource value: 0x7f010157
- public const int fontStyle = 2130772311;
+ // aapt resource value: 0x7F0400AD
+ public const int fontStyle = 2130968749;
- // aapt resource value: 0x7f010159
- public const int fontWeight = 2130772313;
+ // aapt resource value: 0x7F0400AE
+ public const int fontWeight = 2130968750;
- // aapt resource value: 0x7f010129
- public const int foregroundInsidePadding = 2130772265;
+ // aapt resource value: 0x7F0400AF
+ public const int foregroundInsidePadding = 2130968751;
- // aapt resource value: 0x7f0100b9
- public const int gapBetweenBars = 2130772153;
+ // aapt resource value: 0x7F0400B0
+ public const int gapBetweenBars = 2130968752;
- // aapt resource value: 0x7f0100d6
- public const int goIcon = 2130772182;
+ // aapt resource value: 0x7F0400B1
+ public const int goIcon = 2130968753;
- // aapt resource value: 0x7f0101ac
- public const int hdl_arc_thumb_mode = 2130772396;
+ // aapt resource value: 0x7F0400B2
+ public const int hdl_arc_thumb_mode = 2130968754;
- // aapt resource value: 0x7f01012f
- public const int headerLayout = 2130772271;
+ // aapt resource value: 0x7F0400B3
+ public const int headerLayout = 2130968755;
- // aapt resource value: 0x7f01000a
- public const int height = 2130771978;
+ // aapt resource value: 0x7F0400B4
+ public const int height = 2130968756;
- // aapt resource value: 0x7f01001e
- public const int hideOnContentScroll = 2130771998;
+ // aapt resource value: 0x7F0400B5
+ public const int hideOnContentScroll = 2130968757;
- // aapt resource value: 0x7f01014b
- public const int hintAnimationEnabled = 2130772299;
+ // aapt resource value: 0x7F0400B6
+ public const int hintAnimationEnabled = 2130968758;
- // aapt resource value: 0x7f010144
- public const int hintEnabled = 2130772292;
+ // aapt resource value: 0x7F0400B7
+ public const int hintEnabled = 2130968759;
- // aapt resource value: 0x7f010143
- public const int hintTextAppearance = 2130772291;
+ // aapt resource value: 0x7F0400B8
+ public const int hintTextAppearance = 2130968760;
- // aapt resource value: 0x7f01006c
- public const int homeAsUpIndicator = 2130772076;
+ // aapt resource value: 0x7F0400B9
+ public const int homeAsUpIndicator = 2130968761;
- // aapt resource value: 0x7f010019
- public const int homeLayout = 2130771993;
+ // aapt resource value: 0x7F0400BA
+ public const int homeLayout = 2130968762;
- // aapt resource value: 0x7f010012
- public const int icon = 2130771986;
+ // aapt resource value: 0x7F0400BB
+ public const int icon = 2130968763;
- // aapt resource value: 0x7f0100c9
- public const int iconTint = 2130772169;
+ // aapt resource value: 0x7F0400BE
+ public const int iconifiedByDefault = 2130968766;
- // aapt resource value: 0x7f0100ca
- public const int iconTintMode = 2130772170;
+ // aapt resource value: 0x7F0400BC
+ public const int iconTint = 2130968764;
- // aapt resource value: 0x7f0100d2
- public const int iconifiedByDefault = 2130772178;
+ // aapt resource value: 0x7F0400BD
+ public const int iconTintMode = 2130968765;
- // aapt resource value: 0x7f01007c
- public const int imageButtonStyle = 2130772092;
+ // aapt resource value: 0x7F0400BF
+ public const int imageButtonStyle = 2130968767;
- // aapt resource value: 0x7f01001b
- public const int indeterminateProgressStyle = 2130771995;
+ // aapt resource value: 0x7F0400C0
+ public const int indeterminateProgressStyle = 2130968768;
- // aapt resource value: 0x7f010028
- public const int initialActivityCount = 2130772008;
+ // aapt resource value: 0x7F0400C1
+ public const int initialActivityCount = 2130968769;
- // aapt resource value: 0x7f010130
- public const int insetForeground = 2130772272;
+ // aapt resource value: 0x7F0400C2
+ public const int insetForeground = 2130968770;
- // aapt resource value: 0x7f01000b
- public const int isLightTheme = 2130771979;
+ // aapt resource value: 0x7F0400C3
+ public const int isLightTheme = 2130968771;
- // aapt resource value: 0x7f01012d
- public const int itemBackground = 2130772269;
+ // aapt resource value: 0x7F0400C4
+ public const int itemBackground = 2130968772;
- // aapt resource value: 0x7f01012b
- public const int itemIconTint = 2130772267;
+ // aapt resource value: 0x7F0400C5
+ public const int itemIconTint = 2130968773;
- // aapt resource value: 0x7f01001d
- public const int itemPadding = 2130771997;
+ // aapt resource value: 0x7F0400C6
+ public const int itemPadding = 2130968774;
- // aapt resource value: 0x7f01012e
- public const int itemTextAppearance = 2130772270;
+ // aapt resource value: 0x7F0400C7
+ public const int itemTextAppearance = 2130968775;
- // aapt resource value: 0x7f01012c
- public const int itemTextColor = 2130772268;
+ // aapt resource value: 0x7F0400C8
+ public const int itemTextColor = 2130968776;
- // aapt resource value: 0x7f010118
- public const int keylines = 2130772248;
+ // aapt resource value: 0x7F0400C9
+ public const int keylines = 2130968777;
- // aapt resource value: 0x7f0100d1
- public const int layout = 2130772177;
+ // aapt resource value: 0x7F0400CA
+ public const int layout = 2130968778;
- // aapt resource value: 0x7f010000
- public const int layoutManager = 2130771968;
+ // aapt resource value: 0x7F0400CB
+ public const int layoutManager = 2130968779;
- // aapt resource value: 0x7f01011b
- public const int layout_anchor = 2130772251;
+ // aapt resource value: 0x7F0400CC
+ public const int layout_anchor = 2130968780;
- // aapt resource value: 0x7f01011d
- public const int layout_anchorGravity = 2130772253;
+ // aapt resource value: 0x7F0400CD
+ public const int layout_anchorGravity = 2130968781;
- // aapt resource value: 0x7f01011a
- public const int layout_behavior = 2130772250;
+ // aapt resource value: 0x7F0400CE
+ public const int layout_behavior = 2130968782;
- // aapt resource value: 0x7f010116
- public const int layout_collapseMode = 2130772246;
+ // aapt resource value: 0x7F0400CF
+ public const int layout_collapseMode = 2130968783;
- // aapt resource value: 0x7f010117
- public const int layout_collapseParallaxMultiplier = 2130772247;
+ // aapt resource value: 0x7F0400D0
+ public const int layout_collapseParallaxMultiplier = 2130968784;
- // aapt resource value: 0x7f01011f
- public const int layout_dodgeInsetEdges = 2130772255;
+ // aapt resource value: 0x7F0400D1
+ public const int layout_dodgeInsetEdges = 2130968785;
- // aapt resource value: 0x7f01011e
- public const int layout_insetEdge = 2130772254;
+ // aapt resource value: 0x7F0400D2
+ public const int layout_insetEdge = 2130968786;
- // aapt resource value: 0x7f01011c
- public const int layout_keyline = 2130772252;
+ // aapt resource value: 0x7F0400D3
+ public const int layout_keyline = 2130968787;
- // aapt resource value: 0x7f010102
- public const int layout_scrollFlags = 2130772226;
+ // aapt resource value: 0x7F0400D4
+ public const int layout_scrollFlags = 2130968788;
- // aapt resource value: 0x7f010103
- public const int layout_scrollInterpolator = 2130772227;
+ // aapt resource value: 0x7F0400D5
+ public const int layout_scrollInterpolator = 2130968789;
- // aapt resource value: 0x7f010197
- public const int layout_srlBackgroundColor = 2130772375;
+ // aapt resource value: 0x7F0400D6
+ public const int layout_srlBackgroundColor = 2130968790;
- // aapt resource value: 0x7f01015b
- public const int layout_srlSpinnerStyle = 2130772315;
+ // aapt resource value: 0x7F0400D7
+ public const int layout_srlSpinnerStyle = 2130968791;
- // aapt resource value: 0x7f01008e
- public const int listChoiceBackgroundIndicator = 2130772110;
+ // aapt resource value: 0x7F0400D8
+ public const int listChoiceBackgroundIndicator = 2130968792;
- // aapt resource value: 0x7f010068
- public const int listDividerAlertDialog = 2130772072;
+ // aapt resource value: 0x7F0400D9
+ public const int listDividerAlertDialog = 2130968793;
- // aapt resource value: 0x7f01002e
- public const int listItemLayout = 2130772014;
+ // aapt resource value: 0x7F0400DA
+ public const int listItemLayout = 2130968794;
- // aapt resource value: 0x7f01002b
- public const int listLayout = 2130772011;
+ // aapt resource value: 0x7F0400DB
+ public const int listLayout = 2130968795;
- // aapt resource value: 0x7f0100ae
- public const int listMenuViewStyle = 2130772142;
+ // aapt resource value: 0x7F0400DC
+ public const int listMenuViewStyle = 2130968796;
- // aapt resource value: 0x7f010087
- public const int listPopupWindowStyle = 2130772103;
+ // aapt resource value: 0x7F0400DD
+ public const int listPopupWindowStyle = 2130968797;
- // aapt resource value: 0x7f010081
- public const int listPreferredItemHeight = 2130772097;
+ // aapt resource value: 0x7F0400DE
+ public const int listPreferredItemHeight = 2130968798;
- // aapt resource value: 0x7f010083
- public const int listPreferredItemHeightLarge = 2130772099;
+ // aapt resource value: 0x7F0400DF
+ public const int listPreferredItemHeightLarge = 2130968799;
- // aapt resource value: 0x7f010082
- public const int listPreferredItemHeightSmall = 2130772098;
+ // aapt resource value: 0x7F0400E0
+ public const int listPreferredItemHeightSmall = 2130968800;
- // aapt resource value: 0x7f010084
- public const int listPreferredItemPaddingLeft = 2130772100;
+ // aapt resource value: 0x7F0400E1
+ public const int listPreferredItemPaddingLeft = 2130968801;
- // aapt resource value: 0x7f010085
- public const int listPreferredItemPaddingRight = 2130772101;
+ // aapt resource value: 0x7F0400E2
+ public const int listPreferredItemPaddingRight = 2130968802;
- // aapt resource value: 0x7f010013
- public const int logo = 2130771987;
+ // aapt resource value: 0x7F0400E3
+ public const int logo = 2130968803;
- // aapt resource value: 0x7f0100f7
- public const int logoDescription = 2130772215;
+ // aapt resource value: 0x7F0400E4
+ public const int logoDescription = 2130968804;
- // aapt resource value: 0x7f010132
- public const int maxActionInlineWidth = 2130772274;
+ // aapt resource value: 0x7F0400E5
+ public const int maxActionInlineWidth = 2130968805;
- // aapt resource value: 0x7f0100f1
- public const int maxButtonHeight = 2130772209;
+ // aapt resource value: 0x7F0400E6
+ public const int maxButtonHeight = 2130968806;
- // aapt resource value: 0x7f0100be
- public const int measureWithLargestChild = 2130772158;
+ // aapt resource value: 0x7F0400E7
+ public const int measureWithLargestChild = 2130968807;
- // aapt resource value: 0x7f01012a
- public const int menu = 2130772266;
+ // aapt resource value: 0x7F0400E8
+ public const int menu = 2130968808;
- // aapt resource value: 0x7f01002c
- public const int multiChoiceItemLayout = 2130772012;
+ // aapt resource value: 0x7F0400E9
+ public const int multiChoiceItemLayout = 2130968809;
- // aapt resource value: 0x7f0100f6
- public const int navigationContentDescription = 2130772214;
+ // aapt resource value: 0x7F0400EA
+ public const int navigationContentDescription = 2130968810;
- // aapt resource value: 0x7f0100f5
- public const int navigationIcon = 2130772213;
+ // aapt resource value: 0x7F0400EB
+ public const int navigationIcon = 2130968811;
- // aapt resource value: 0x7f01000d
- public const int navigationMode = 2130771981;
+ // aapt resource value: 0x7F0400EC
+ public const int navigationMode = 2130968812;
- // aapt resource value: 0x7f0100c2
- public const int numericModifiers = 2130772162;
+ // aapt resource value: 0x7F0400ED
+ public const int numericModifiers = 2130968813;
- // aapt resource value: 0x7f0100cd
- public const int overlapAnchor = 2130772173;
+ // aapt resource value: 0x7F0400EE
+ public const int overlapAnchor = 2130968814;
- // aapt resource value: 0x7f0100cf
- public const int paddingBottomNoButtons = 2130772175;
+ // aapt resource value: 0x7F0400EF
+ public const int paddingBottomNoButtons = 2130968815;
- // aapt resource value: 0x7f0100fb
- public const int paddingEnd = 2130772219;
+ // aapt resource value: 0x7F0400F0
+ public const int paddingEnd = 2130968816;
- // aapt resource value: 0x7f0100fa
- public const int paddingStart = 2130772218;
+ // aapt resource value: 0x7F0400F1
+ public const int paddingStart = 2130968817;
- // aapt resource value: 0x7f0100d0
- public const int paddingTopNoTitle = 2130772176;
+ // aapt resource value: 0x7F0400F2
+ public const int paddingTopNoTitle = 2130968818;
- // aapt resource value: 0x7f01008b
- public const int panelBackground = 2130772107;
+ // aapt resource value: 0x7F0400F3
+ public const int panelBackground = 2130968819;
- // aapt resource value: 0x7f01008d
- public const int panelMenuListTheme = 2130772109;
+ // aapt resource value: 0x7F0400F4
+ public const int panelMenuListTheme = 2130968820;
- // aapt resource value: 0x7f01008c
- public const int panelMenuListWidth = 2130772108;
+ // aapt resource value: 0x7F0400F5
+ public const int panelMenuListWidth = 2130968821;
- // aapt resource value: 0x7f01014e
- public const int passwordToggleContentDescription = 2130772302;
+ // aapt resource value: 0x7F0400F6
+ public const int passwordToggleContentDescription = 2130968822;
- // aapt resource value: 0x7f01014d
- public const int passwordToggleDrawable = 2130772301;
+ // aapt resource value: 0x7F0400F7
+ public const int passwordToggleDrawable = 2130968823;
- // aapt resource value: 0x7f01014c
- public const int passwordToggleEnabled = 2130772300;
+ // aapt resource value: 0x7F0400F8
+ public const int passwordToggleEnabled = 2130968824;
- // aapt resource value: 0x7f01014f
- public const int passwordToggleTint = 2130772303;
+ // aapt resource value: 0x7F0400F9
+ public const int passwordToggleTint = 2130968825;
- // aapt resource value: 0x7f010150
- public const int passwordToggleTintMode = 2130772304;
+ // aapt resource value: 0x7F0400FA
+ public const int passwordToggleTintMode = 2130968826;
- // aapt resource value: 0x7f010078
- public const int popupMenuStyle = 2130772088;
+ // aapt resource value: 0x7F0400FB
+ public const int popupMenuStyle = 2130968827;
- // aapt resource value: 0x7f010026
- public const int popupTheme = 2130772006;
+ // aapt resource value: 0x7F0400FC
+ public const int popupTheme = 2130968828;
- // aapt resource value: 0x7f010079
- public const int popupWindowStyle = 2130772089;
+ // aapt resource value: 0x7F0400FD
+ public const int popupWindowStyle = 2130968829;
- // aapt resource value: 0x7f0100cb
- public const int preserveIconSpacing = 2130772171;
+ // aapt resource value: 0x7F0400FE
+ public const int preserveIconSpacing = 2130968830;
- // aapt resource value: 0x7f010125
- public const int pressedTranslationZ = 2130772261;
+ // aapt resource value: 0x7F0400FF
+ public const int pressedTranslationZ = 2130968831;
- // aapt resource value: 0x7f01001c
- public const int progressBarPadding = 2130771996;
+ // aapt resource value: 0x7F040100
+ public const int progressBarPadding = 2130968832;
- // aapt resource value: 0x7f01001a
- public const int progressBarStyle = 2130771994;
+ // aapt resource value: 0x7F040101
+ public const int progressBarStyle = 2130968833;
- // aapt resource value: 0x7f0100dc
- public const int queryBackground = 2130772188;
+ // aapt resource value: 0x7F040102
+ public const int queryBackground = 2130968834;
- // aapt resource value: 0x7f0100d3
- public const int queryHint = 2130772179;
+ // aapt resource value: 0x7F040103
+ public const int queryHint = 2130968835;
- // aapt resource value: 0x7f0100a7
- public const int radioButtonStyle = 2130772135;
+ // aapt resource value: 0x7F040104
+ public const int radioButtonStyle = 2130968836;
- // aapt resource value: 0x7f0100a8
- public const int ratingBarStyle = 2130772136;
+ // aapt resource value: 0x7F040105
+ public const int ratingBarStyle = 2130968837;
- // aapt resource value: 0x7f0100a9
- public const int ratingBarStyleIndicator = 2130772137;
+ // aapt resource value: 0x7F040106
+ public const int ratingBarStyleIndicator = 2130968838;
- // aapt resource value: 0x7f0100aa
- public const int ratingBarStyleSmall = 2130772138;
+ // aapt resource value: 0x7F040107
+ public const int ratingBarStyleSmall = 2130968839;
- // aapt resource value: 0x7f010002
- public const int reverseLayout = 2130771970;
+ // aapt resource value: 0x7F040108
+ public const int reverseLayout = 2130968840;
- // aapt resource value: 0x7f010123
- public const int rippleColor = 2130772259;
+ // aapt resource value: 0x7F040109
+ public const int rippleColor = 2130968841;
- // aapt resource value: 0x7f010112
- public const int scrimAnimationDuration = 2130772242;
+ // aapt resource value: 0x7F04010A
+ public const int scrimAnimationDuration = 2130968842;
- // aapt resource value: 0x7f010111
- public const int scrimVisibleHeightTrigger = 2130772241;
+ // aapt resource value: 0x7F04010B
+ public const int scrimVisibleHeightTrigger = 2130968843;
- // aapt resource value: 0x7f0100d8
- public const int searchHintIcon = 2130772184;
+ // aapt resource value: 0x7F04010C
+ public const int searchHintIcon = 2130968844;
- // aapt resource value: 0x7f0100d7
- public const int searchIcon = 2130772183;
+ // aapt resource value: 0x7F04010D
+ public const int searchIcon = 2130968845;
- // aapt resource value: 0x7f010080
- public const int searchViewStyle = 2130772096;
+ // aapt resource value: 0x7F04010E
+ public const int searchViewStyle = 2130968846;
- // aapt resource value: 0x7f0101b1
- public const int second_curtain_bar_color = 2130772401;
+ // aapt resource value: 0x7F04010F
+ public const int second_curtain_bar_color = 2130968847;
- // aapt resource value: 0x7f0101b7
- public const int second_wave_color = 2130772407;
+ // aapt resource value: 0x7F040110
+ public const int second_wave_color = 2130968848;
- // aapt resource value: 0x7f0100ab
- public const int seekBarStyle = 2130772139;
+ // aapt resource value: 0x7F040111
+ public const int seekBarStyle = 2130968849;
- // aapt resource value: 0x7f010070
- public const int selectableItemBackground = 2130772080;
+ // aapt resource value: 0x7F040112
+ public const int selectableItemBackground = 2130968850;
- // aapt resource value: 0x7f010071
- public const int selectableItemBackgroundBorderless = 2130772081;
+ // aapt resource value: 0x7F040113
+ public const int selectableItemBackgroundBorderless = 2130968851;
- // aapt resource value: 0x7f0100c3
- public const int showAsAction = 2130772163;
+ // aapt resource value: 0x7F040114
+ public const int showAsAction = 2130968852;
- // aapt resource value: 0x7f0100bf
- public const int showDividers = 2130772159;
+ // aapt resource value: 0x7F040115
+ public const int showDividers = 2130968853;
- // aapt resource value: 0x7f0100e8
- public const int showText = 2130772200;
+ // aapt resource value: 0x7F040116
+ public const int showText = 2130968854;
- // aapt resource value: 0x7f01002f
- public const int showTitle = 2130772015;
+ // aapt resource value: 0x7F040117
+ public const int showTitle = 2130968855;
- // aapt resource value: 0x7f01002d
- public const int singleChoiceItemLayout = 2130772013;
+ // aapt resource value: 0x7F040118
+ public const int singleChoiceItemLayout = 2130968856;
- // aapt resource value: 0x7f010001
- public const int spanCount = 2130771969;
+ // aapt resource value: 0x7F040119
+ public const int spanCount = 2130968857;
- // aapt resource value: 0x7f0100b7
- public const int spinBars = 2130772151;
+ // aapt resource value: 0x7F04011A
+ public const int spinBars = 2130968858;
- // aapt resource value: 0x7f01006b
- public const int spinnerDropDownItemStyle = 2130772075;
+ // aapt resource value: 0x7F04011B
+ public const int spinnerDropDownItemStyle = 2130968859;
- // aapt resource value: 0x7f0100ac
- public const int spinnerStyle = 2130772140;
+ // aapt resource value: 0x7F04011C
+ public const int spinnerStyle = 2130968860;
- // aapt resource value: 0x7f0100e7
- public const int splitTrack = 2130772199;
+ // aapt resource value: 0x7F04011D
+ public const int splitTrack = 2130968861;
- // aapt resource value: 0x7f010030
- public const int srcCompat = 2130772016;
+ // aapt resource value: 0x7F04011E
+ public const int srcCompat = 2130968862;
- // aapt resource value: 0x7f01015c
- public const int srlAccentColor = 2130772316;
+ // aapt resource value: 0x7F04011F
+ public const int srlAccentColor = 2130968863;
- // aapt resource value: 0x7f010172
- public const int srlAnimatingColor = 2130772338;
+ // aapt resource value: 0x7F040120
+ public const int srlAnimatingColor = 2130968864;
- // aapt resource value: 0x7f01015d
- public const int srlClassicsSpinnerStyle = 2130772317;
+ // aapt resource value: 0x7F040121
+ public const int srlClassicsSpinnerStyle = 2130968865;
- // aapt resource value: 0x7f010194
- public const int srlDisableContentWhenLoading = 2130772372;
+ // aapt resource value: 0x7F040122
+ public const int srlDisableContentWhenLoading = 2130968866;
- // aapt resource value: 0x7f010193
- public const int srlDisableContentWhenRefresh = 2130772371;
+ // aapt resource value: 0x7F040123
+ public const int srlDisableContentWhenRefresh = 2130968867;
- // aapt resource value: 0x7f01017b
- public const int srlDragRate = 2130772347;
+ // aapt resource value: 0x7F040124
+ public const int srlDragRate = 2130968868;
- // aapt resource value: 0x7f01015e
- public const int srlDrawableArrow = 2130772318;
+ // aapt resource value: 0x7F040125
+ public const int srlDrawableArrow = 2130968869;
- // aapt resource value: 0x7f01015f
- public const int srlDrawableArrowSize = 2130772319;
+ // aapt resource value: 0x7F040126
+ public const int srlDrawableArrowSize = 2130968870;
- // aapt resource value: 0x7f010160
- public const int srlDrawableMarginRight = 2130772320;
+ // aapt resource value: 0x7F040127
+ public const int srlDrawableMarginRight = 2130968871;
- // aapt resource value: 0x7f010161
- public const int srlDrawableProgress = 2130772321;
+ // aapt resource value: 0x7F040128
+ public const int srlDrawableProgress = 2130968872;
- // aapt resource value: 0x7f010162
- public const int srlDrawableProgressSize = 2130772322;
+ // aapt resource value: 0x7F040129
+ public const int srlDrawableProgressSize = 2130968873;
- // aapt resource value: 0x7f010163
- public const int srlDrawableSize = 2130772323;
+ // aapt resource value: 0x7F04012A
+ public const int srlDrawableSize = 2130968874;
- // aapt resource value: 0x7f010187
- public const int srlEnableAutoLoadMore = 2130772359;
+ // aapt resource value: 0x7F04012B
+ public const int srlEnableAutoLoadMore = 2130968875;
- // aapt resource value: 0x7f010191
- public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
+ // aapt resource value: 0x7F04012C
+ public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
- // aapt resource value: 0x7f010190
- public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
+ // aapt resource value: 0x7F04012D
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
- // aapt resource value: 0x7f01018e
- public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
+ // aapt resource value: 0x7F04012E
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
- // aapt resource value: 0x7f01018f
- public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
+ // aapt resource value: 0x7F04012F
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
- // aapt resource value: 0x7f010183
- public const int srlEnableFooterTranslationContent = 2130772355;
+ // aapt resource value: 0x7F040130
+ public const int srlEnableFooterTranslationContent = 2130968880;
- // aapt resource value: 0x7f010182
- public const int srlEnableHeaderTranslationContent = 2130772354;
+ // aapt resource value: 0x7F040131
+ public const int srlEnableHeaderTranslationContent = 2130968881;
- // aapt resource value: 0x7f010164
- public const int srlEnableHorizontalDrag = 2130772324;
+ // aapt resource value: 0x7F040132
+ public const int srlEnableHorizontalDrag = 2130968882;
- // aapt resource value: 0x7f010175
- public const int srlEnableLastTime = 2130772341;
+ // aapt resource value: 0x7F040133
+ public const int srlEnableLastTime = 2130968883;
- // aapt resource value: 0x7f010181
- public const int srlEnableLoadMore = 2130772353;
+ // aapt resource value: 0x7F040134
+ public const int srlEnableLoadMore = 2130968884;
- // aapt resource value: 0x7f01018d
- public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
+ // aapt resource value: 0x7F040135
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
- // aapt resource value: 0x7f01018a
- public const int srlEnableNestedScrolling = 2130772362;
+ // aapt resource value: 0x7F040136
+ public const int srlEnableNestedScrolling = 2130968886;
- // aapt resource value: 0x7f010188
- public const int srlEnableOverScrollBounce = 2130772360;
+ // aapt resource value: 0x7F040137
+ public const int srlEnableOverScrollBounce = 2130968887;
- // aapt resource value: 0x7f010192
- public const int srlEnableOverScrollDrag = 2130772370;
+ // aapt resource value: 0x7F040138
+ public const int srlEnableOverScrollDrag = 2130968888;
- // aapt resource value: 0x7f010186
- public const int srlEnablePreviewInEditMode = 2130772358;
+ // aapt resource value: 0x7F040139
+ public const int srlEnablePreviewInEditMode = 2130968889;
- // aapt resource value: 0x7f01019d
- public const int srlEnablePullToCloseTwoLevel = 2130772381;
+ // aapt resource value: 0x7F04013A
+ public const int srlEnablePullToCloseTwoLevel = 2130968890;
- // aapt resource value: 0x7f010189
- public const int srlEnablePureScrollMode = 2130772361;
+ // aapt resource value: 0x7F04013B
+ public const int srlEnablePureScrollMode = 2130968891;
- // aapt resource value: 0x7f010180
- public const int srlEnableRefresh = 2130772352;
+ // aapt resource value: 0x7F04013C
+ public const int srlEnableRefresh = 2130968892;
- // aapt resource value: 0x7f01018b
- public const int srlEnableScrollContentWhenLoaded = 2130772363;
+ // aapt resource value: 0x7F04013D
+ public const int srlEnableScrollContentWhenLoaded = 2130968893;
- // aapt resource value: 0x7f01018c
- public const int srlEnableScrollContentWhenRefreshed = 2130772364;
+ // aapt resource value: 0x7F04013E
+ public const int srlEnableScrollContentWhenRefreshed = 2130968894;
- // aapt resource value: 0x7f01019c
- public const int srlEnableTwoLevel = 2130772380;
+ // aapt resource value: 0x7F04013F
+ public const int srlEnableTwoLevel = 2130968895;
- // aapt resource value: 0x7f010165
- public const int srlFinishDuration = 2130772325;
+ // aapt resource value: 0x7F040140
+ public const int srlFinishDuration = 2130968896;
- // aapt resource value: 0x7f010196
- public const int srlFixedFooterViewId = 2130772374;
+ // aapt resource value: 0x7F040141
+ public const int srlFixedFooterViewId = 2130968897;
- // aapt resource value: 0x7f010195
- public const int srlFixedHeaderViewId = 2130772373;
+ // aapt resource value: 0x7F040142
+ public const int srlFixedHeaderViewId = 2130968898;
- // aapt resource value: 0x7f01019b
- public const int srlFloorDuration = 2130772379;
+ // aapt resource value: 0x7F040143
+ public const int srlFloorDuration = 2130968899;
- // aapt resource value: 0x7f010199
- public const int srlFloorRage = 2130772377;
+ // aapt resource value: 0x7F040144
+ public const int srlFloorRage = 2130968900;
- // aapt resource value: 0x7f010178
- public const int srlFooterHeight = 2130772344;
+ // aapt resource value: 0x7F040145
+ public const int srlFooterHeight = 2130968901;
- // aapt resource value: 0x7f01017a
- public const int srlFooterInsetStart = 2130772346;
+ // aapt resource value: 0x7F040146
+ public const int srlFooterInsetStart = 2130968902;
- // aapt resource value: 0x7f01017d
- public const int srlFooterMaxDragRate = 2130772349;
+ // aapt resource value: 0x7F040147
+ public const int srlFooterMaxDragRate = 2130968903;
- // aapt resource value: 0x7f010185
- public const int srlFooterTranslationViewId = 2130772357;
+ // aapt resource value: 0x7F040148
+ public const int srlFooterTranslationViewId = 2130968904;
- // aapt resource value: 0x7f01017f
- public const int srlFooterTriggerRate = 2130772351;
+ // aapt resource value: 0x7F040149
+ public const int srlFooterTriggerRate = 2130968905;
- // aapt resource value: 0x7f010177
- public const int srlHeaderHeight = 2130772343;
+ // aapt resource value: 0x7F04014A
+ public const int srlHeaderHeight = 2130968906;
- // aapt resource value: 0x7f010179
- public const int srlHeaderInsetStart = 2130772345;
+ // aapt resource value: 0x7F04014B
+ public const int srlHeaderInsetStart = 2130968907;
- // aapt resource value: 0x7f01017c
- public const int srlHeaderMaxDragRate = 2130772348;
+ // aapt resource value: 0x7F04014C
+ public const int srlHeaderMaxDragRate = 2130968908;
- // aapt resource value: 0x7f010184
- public const int srlHeaderTranslationViewId = 2130772356;
+ // aapt resource value: 0x7F04014D
+ public const int srlHeaderTranslationViewId = 2130968909;
- // aapt resource value: 0x7f01017e
- public const int srlHeaderTriggerRate = 2130772350;
+ // aapt resource value: 0x7F04014E
+ public const int srlHeaderTriggerRate = 2130968910;
- // aapt resource value: 0x7f010198
- public const int srlMaxRage = 2130772376;
+ // aapt resource value: 0x7F04014F
+ public const int srlMaxRage = 2130968911;
- // aapt resource value: 0x7f010173
- public const int srlNormalColor = 2130772339;
+ // aapt resource value: 0x7F040150
+ public const int srlNormalColor = 2130968912;
- // aapt resource value: 0x7f010166
- public const int srlPrimaryColor = 2130772326;
+ // aapt resource value: 0x7F040151
+ public const int srlPrimaryColor = 2130968913;
- // aapt resource value: 0x7f010176
- public const int srlReboundDuration = 2130772342;
+ // aapt resource value: 0x7F040152
+ public const int srlReboundDuration = 2130968914;
- // aapt resource value: 0x7f01019a
- public const int srlRefreshRage = 2130772378;
+ // aapt resource value: 0x7F040153
+ public const int srlRefreshRage = 2130968915;
- // aapt resource value: 0x7f010167
- public const int srlTextFailed = 2130772327;
+ // aapt resource value: 0x7F040154
+ public const int srlTextFailed = 2130968916;
- // aapt resource value: 0x7f010168
- public const int srlTextFinish = 2130772328;
+ // aapt resource value: 0x7F040155
+ public const int srlTextFinish = 2130968917;
- // aapt resource value: 0x7f010169
- public const int srlTextLoading = 2130772329;
+ // aapt resource value: 0x7F040156
+ public const int srlTextLoading = 2130968918;
- // aapt resource value: 0x7f01016a
- public const int srlTextNothing = 2130772330;
+ // aapt resource value: 0x7F040157
+ public const int srlTextNothing = 2130968919;
- // aapt resource value: 0x7f01016b
- public const int srlTextPulling = 2130772331;
+ // aapt resource value: 0x7F040158
+ public const int srlTextPulling = 2130968920;
- // aapt resource value: 0x7f01016c
- public const int srlTextRefreshing = 2130772332;
+ // aapt resource value: 0x7F040159
+ public const int srlTextRefreshing = 2130968921;
- // aapt resource value: 0x7f01016d
- public const int srlTextRelease = 2130772333;
+ // aapt resource value: 0x7F04015A
+ public const int srlTextRelease = 2130968922;
- // aapt resource value: 0x7f01016e
- public const int srlTextSecondary = 2130772334;
+ // aapt resource value: 0x7F04015B
+ public const int srlTextSecondary = 2130968923;
- // aapt resource value: 0x7f01016f
- public const int srlTextSizeTime = 2130772335;
+ // aapt resource value: 0x7F04015C
+ public const int srlTextSizeTime = 2130968924;
- // aapt resource value: 0x7f010170
- public const int srlTextSizeTitle = 2130772336;
+ // aapt resource value: 0x7F04015D
+ public const int srlTextSizeTitle = 2130968925;
- // aapt resource value: 0x7f010174
- public const int srlTextTimeMarginTop = 2130772340;
+ // aapt resource value: 0x7F04015E
+ public const int srlTextTimeMarginTop = 2130968926;
- // aapt resource value: 0x7f010171
- public const int srlTextUpdate = 2130772337;
+ // aapt resource value: 0x7F04015F
+ public const int srlTextUpdate = 2130968927;
- // aapt resource value: 0x7f010003
- public const int stackFromEnd = 2130771971;
+ // aapt resource value: 0x7F040160
+ public const int stackFromEnd = 2130968928;
- // aapt resource value: 0x7f0100ce
- public const int state_above_anchor = 2130772174;
+ // aapt resource value: 0x7F040161
+ public const int state_above_anchor = 2130968929;
- // aapt resource value: 0x7f010100
- public const int state_collapsed = 2130772224;
+ // aapt resource value: 0x7F040162
+ public const int state_collapsed = 2130968930;
- // aapt resource value: 0x7f010101
- public const int state_collapsible = 2130772225;
+ // aapt resource value: 0x7F040163
+ public const int state_collapsible = 2130968931;
- // aapt resource value: 0x7f010119
- public const int statusBarBackground = 2130772249;
+ // aapt resource value: 0x7F040164
+ public const int statusBarBackground = 2130968932;
- // aapt resource value: 0x7f01010f
- public const int statusBarScrim = 2130772239;
+ // aapt resource value: 0x7F040165
+ public const int statusBarScrim = 2130968933;
- // aapt resource value: 0x7f0100cc
- public const int subMenuArrow = 2130772172;
+ // aapt resource value: 0x7F040166
+ public const int subMenuArrow = 2130968934;
- // aapt resource value: 0x7f0100dd
- public const int submitBackground = 2130772189;
+ // aapt resource value: 0x7F040167
+ public const int submitBackground = 2130968935;
- // aapt resource value: 0x7f01000f
- public const int subtitle = 2130771983;
+ // aapt resource value: 0x7F040168
+ public const int subtitle = 2130968936;
- // aapt resource value: 0x7f0100ea
- public const int subtitleTextAppearance = 2130772202;
+ // aapt resource value: 0x7F040169
+ public const int subtitleTextAppearance = 2130968937;
- // aapt resource value: 0x7f0100f9
- public const int subtitleTextColor = 2130772217;
+ // aapt resource value: 0x7F04016A
+ public const int subtitleTextColor = 2130968938;
- // aapt resource value: 0x7f010011
- public const int subtitleTextStyle = 2130771985;
+ // aapt resource value: 0x7F04016B
+ public const int subtitleTextStyle = 2130968939;
- // aapt resource value: 0x7f0100db
- public const int suggestionRowLayout = 2130772187;
+ // aapt resource value: 0x7F04016C
+ public const int suggestionRowLayout = 2130968940;
- // aapt resource value: 0x7f0100e5
- public const int switchMinWidth = 2130772197;
+ // aapt resource value: 0x7F04016D
+ public const int switchMinWidth = 2130968941;
- // aapt resource value: 0x7f0100e6
- public const int switchPadding = 2130772198;
+ // aapt resource value: 0x7F04016E
+ public const int switchPadding = 2130968942;
- // aapt resource value: 0x7f0100ad
- public const int switchStyle = 2130772141;
+ // aapt resource value: 0x7F04016F
+ public const int switchStyle = 2130968943;
- // aapt resource value: 0x7f0100e4
- public const int switchTextAppearance = 2130772196;
+ // aapt resource value: 0x7F040170
+ public const int switchTextAppearance = 2130968944;
- // aapt resource value: 0x7f010136
- public const int tabBackground = 2130772278;
+ // aapt resource value: 0x7F040171
+ public const int tabBackground = 2130968945;
- // aapt resource value: 0x7f010135
- public const int tabContentStart = 2130772277;
+ // aapt resource value: 0x7F040172
+ public const int tabContentStart = 2130968946;
- // aapt resource value: 0x7f010138
- public const int tabGravity = 2130772280;
+ // aapt resource value: 0x7F040173
+ public const int tabGravity = 2130968947;
- // aapt resource value: 0x7f010133
- public const int tabIndicatorColor = 2130772275;
+ // aapt resource value: 0x7F040174
+ public const int tabIndicatorColor = 2130968948;
- // aapt resource value: 0x7f010134
- public const int tabIndicatorHeight = 2130772276;
+ // aapt resource value: 0x7F040175
+ public const int tabIndicatorHeight = 2130968949;
- // aapt resource value: 0x7f01013a
- public const int tabMaxWidth = 2130772282;
+ // aapt resource value: 0x7F040176
+ public const int tabMaxWidth = 2130968950;
- // aapt resource value: 0x7f010139
- public const int tabMinWidth = 2130772281;
+ // aapt resource value: 0x7F040177
+ public const int tabMinWidth = 2130968951;
- // aapt resource value: 0x7f010137
- public const int tabMode = 2130772279;
+ // aapt resource value: 0x7F040178
+ public const int tabMode = 2130968952;
- // aapt resource value: 0x7f010142
- public const int tabPadding = 2130772290;
+ // aapt resource value: 0x7F040179
+ public const int tabPadding = 2130968953;
- // aapt resource value: 0x7f010141
- public const int tabPaddingBottom = 2130772289;
+ // aapt resource value: 0x7F04017A
+ public const int tabPaddingBottom = 2130968954;
- // aapt resource value: 0x7f010140
- public const int tabPaddingEnd = 2130772288;
+ // aapt resource value: 0x7F04017B
+ public const int tabPaddingEnd = 2130968955;
- // aapt resource value: 0x7f01013e
- public const int tabPaddingStart = 2130772286;
+ // aapt resource value: 0x7F04017C
+ public const int tabPaddingStart = 2130968956;
- // aapt resource value: 0x7f01013f
- public const int tabPaddingTop = 2130772287;
+ // aapt resource value: 0x7F04017D
+ public const int tabPaddingTop = 2130968957;
- // aapt resource value: 0x7f01013d
- public const int tabSelectedTextColor = 2130772285;
+ // aapt resource value: 0x7F04017E
+ public const int tabSelectedTextColor = 2130968958;
- // aapt resource value: 0x7f01013b
- public const int tabTextAppearance = 2130772283;
+ // aapt resource value: 0x7F04017F
+ public const int tabTextAppearance = 2130968959;
- // aapt resource value: 0x7f01013c
- public const int tabTextColor = 2130772284;
+ // aapt resource value: 0x7F040180
+ public const int tabTextColor = 2130968960;
- // aapt resource value: 0x7f010036
- public const int textAllCaps = 2130772022;
+ // aapt resource value: 0x7F040181
+ public const int textAllCaps = 2130968961;
- // aapt resource value: 0x7f010063
- public const int textAppearanceLargePopupMenu = 2130772067;
+ // aapt resource value: 0x7F040182
+ public const int textAppearanceLargePopupMenu = 2130968962;
- // aapt resource value: 0x7f010088
- public const int textAppearanceListItem = 2130772104;
+ // aapt resource value: 0x7F040183
+ public const int textAppearanceListItem = 2130968963;
- // aapt resource value: 0x7f010089
- public const int textAppearanceListItemSecondary = 2130772105;
+ // aapt resource value: 0x7F040184
+ public const int textAppearanceListItemSecondary = 2130968964;
- // aapt resource value: 0x7f01008a
- public const int textAppearanceListItemSmall = 2130772106;
+ // aapt resource value: 0x7F040185
+ public const int textAppearanceListItemSmall = 2130968965;
- // aapt resource value: 0x7f010065
- public const int textAppearancePopupMenuHeader = 2130772069;
+ // aapt resource value: 0x7F040186
+ public const int textAppearancePopupMenuHeader = 2130968966;
- // aapt resource value: 0x7f01007e
- public const int textAppearanceSearchResultSubtitle = 2130772094;
+ // aapt resource value: 0x7F040187
+ public const int textAppearanceSearchResultSubtitle = 2130968967;
- // aapt resource value: 0x7f01007d
- public const int textAppearanceSearchResultTitle = 2130772093;
+ // aapt resource value: 0x7F040188
+ public const int textAppearanceSearchResultTitle = 2130968968;
- // aapt resource value: 0x7f010064
- public const int textAppearanceSmallPopupMenu = 2130772068;
+ // aapt resource value: 0x7F040189
+ public const int textAppearanceSmallPopupMenu = 2130968969;
- // aapt resource value: 0x7f01009d
- public const int textColorAlertDialogListItem = 2130772125;
+ // aapt resource value: 0x7F04018A
+ public const int textColorAlertDialogListItem = 2130968970;
- // aapt resource value: 0x7f010122
- public const int textColorError = 2130772258;
+ // aapt resource value: 0x7F04018B
+ public const int textColorError = 2130968971;
- // aapt resource value: 0x7f01007f
- public const int textColorSearchUrl = 2130772095;
+ // aapt resource value: 0x7F04018C
+ public const int textColorSearchUrl = 2130968972;
- // aapt resource value: 0x7f0100fc
- public const int theme = 2130772220;
+ // aapt resource value: 0x7F04018D
+ public const int theme = 2130968973;
- // aapt resource value: 0x7f0100bd
- public const int thickness = 2130772157;
+ // aapt resource value: 0x7F04018E
+ public const int thickness = 2130968974;
- // aapt resource value: 0x7f0100e3
- public const int thumbTextPadding = 2130772195;
+ // aapt resource value: 0x7F04018F
+ public const int thumbTextPadding = 2130968975;
- // aapt resource value: 0x7f0100de
- public const int thumbTint = 2130772190;
+ // aapt resource value: 0x7F040190
+ public const int thumbTint = 2130968976;
- // aapt resource value: 0x7f0100df
- public const int thumbTintMode = 2130772191;
+ // aapt resource value: 0x7F040191
+ public const int thumbTintMode = 2130968977;
- // aapt resource value: 0x7f010033
- public const int tickMark = 2130772019;
+ // aapt resource value: 0x7F040192
+ public const int tickMark = 2130968978;
- // aapt resource value: 0x7f010034
- public const int tickMarkTint = 2130772020;
+ // aapt resource value: 0x7F040193
+ public const int tickMarkTint = 2130968979;
- // aapt resource value: 0x7f010035
- public const int tickMarkTintMode = 2130772021;
+ // aapt resource value: 0x7F040194
+ public const int tickMarkTintMode = 2130968980;
- // aapt resource value: 0x7f010031
- public const int tint = 2130772017;
+ // aapt resource value: 0x7F040195
+ public const int tint = 2130968981;
- // aapt resource value: 0x7f010032
- public const int tintMode = 2130772018;
+ // aapt resource value: 0x7F040196
+ public const int tintMode = 2130968982;
- // aapt resource value: 0x7f01000c
- public const int title = 2130771980;
+ // aapt resource value: 0x7F040197
+ public const int title = 2130968983;
- // aapt resource value: 0x7f010115
- public const int titleEnabled = 2130772245;
+ // aapt resource value: 0x7F040198
+ public const int titleEnabled = 2130968984;
- // aapt resource value: 0x7f0100eb
- public const int titleMargin = 2130772203;
+ // aapt resource value: 0x7F040199
+ public const int titleMargin = 2130968985;
- // aapt resource value: 0x7f0100ef
- public const int titleMarginBottom = 2130772207;
+ // aapt resource value: 0x7F04019A
+ public const int titleMarginBottom = 2130968986;
- // aapt resource value: 0x7f0100ed
- public const int titleMarginEnd = 2130772205;
+ // aapt resource value: 0x7F04019B
+ public const int titleMarginEnd = 2130968987;
- // aapt resource value: 0x7f0100ec
- public const int titleMarginStart = 2130772204;
+ // aapt resource value: 0x7F04019E
+ public const int titleMargins = 2130968990;
- // aapt resource value: 0x7f0100ee
- public const int titleMarginTop = 2130772206;
+ // aapt resource value: 0x7F04019C
+ public const int titleMarginStart = 2130968988;
- // aapt resource value: 0x7f0100f0
- public const int titleMargins = 2130772208;
+ // aapt resource value: 0x7F04019D
+ public const int titleMarginTop = 2130968989;
- // aapt resource value: 0x7f0100e9
- public const int titleTextAppearance = 2130772201;
+ // aapt resource value: 0x7F04019F
+ public const int titleTextAppearance = 2130968991;
- // aapt resource value: 0x7f0100f8
- public const int titleTextColor = 2130772216;
+ // aapt resource value: 0x7F0401A0
+ public const int titleTextColor = 2130968992;
- // aapt resource value: 0x7f010010
- public const int titleTextStyle = 2130771984;
+ // aapt resource value: 0x7F0401A1
+ public const int titleTextStyle = 2130968993;
- // aapt resource value: 0x7f010110
- public const int toolbarId = 2130772240;
+ // aapt resource value: 0x7F0401A2
+ public const int toolbarId = 2130968994;
- // aapt resource value: 0x7f010077
- public const int toolbarNavigationButtonStyle = 2130772087;
+ // aapt resource value: 0x7F0401A3
+ public const int toolbarNavigationButtonStyle = 2130968995;
- // aapt resource value: 0x7f010076
- public const int toolbarStyle = 2130772086;
+ // aapt resource value: 0x7F0401A4
+ public const int toolbarStyle = 2130968996;
- // aapt resource value: 0x7f0100b0
- public const int tooltipForegroundColor = 2130772144;
+ // aapt resource value: 0x7F0401A5
+ public const int tooltipForegroundColor = 2130968997;
- // aapt resource value: 0x7f0100af
- public const int tooltipFrameBackground = 2130772143;
+ // aapt resource value: 0x7F0401A6
+ public const int tooltipFrameBackground = 2130968998;
- // aapt resource value: 0x7f0100c8
- public const int tooltipText = 2130772168;
+ // aapt resource value: 0x7F0401A7
+ public const int tooltipText = 2130968999;
- // aapt resource value: 0x7f0100e0
- public const int track = 2130772192;
+ // aapt resource value: 0x7F0401A8
+ public const int track = 2130969000;
- // aapt resource value: 0x7f0100e1
- public const int trackTint = 2130772193;
+ // aapt resource value: 0x7F0401A9
+ public const int trackTint = 2130969001;
- // aapt resource value: 0x7f0100e2
- public const int trackTintMode = 2130772194;
+ // aapt resource value: 0x7F0401AA
+ public const int trackTintMode = 2130969002;
- // aapt resource value: 0x7f010127
- public const int useCompatPadding = 2130772263;
+ // aapt resource value: 0x7F0401AB
+ public const int useCompatPadding = 2130969003;
- // aapt resource value: 0x7f0100d9
- public const int voiceIcon = 2130772185;
+ // aapt resource value: 0x7F0401AC
+ public const int voiceIcon = 2130969004;
- // aapt resource value: 0x7f0101b8
- public const int wave_bg_color = 2130772408;
+ // aapt resource value: 0x7F0401AD
+ public const int wave_bg_color = 2130969005;
- // aapt resource value: 0x7f0101b9
- public const int wave_border_color = 2130772409;
+ // aapt resource value: 0x7F0401AE
+ public const int wave_border_color = 2130969006;
- // aapt resource value: 0x7f0101b6
- public const int wave_color = 2130772406;
+ // aapt resource value: 0x7F0401AF
+ public const int wave_color = 2130969007;
- // aapt resource value: 0x7f0101bb
- public const int wave_height = 2130772411;
+ // aapt resource value: 0x7F0401B0
+ public const int wave_height = 2130969008;
- // aapt resource value: 0x7f0101ba
- public const int wave_width = 2130772410;
+ // aapt resource value: 0x7F0401B1
+ public const int wave_width = 2130969009;
- // aapt resource value: 0x7f0101c0
- public const int wheelview_dividerColor = 2130772416;
+ // aapt resource value: 0x7F0401B2
+ public const int wheelview_dividerColor = 2130969010;
- // aapt resource value: 0x7f0101bc
- public const int wheelview_gravity = 2130772412;
+ // aapt resource value: 0x7F0401B3
+ public const int wheelview_gravity = 2130969011;
- // aapt resource value: 0x7f0101c1
- public const int wheelview_lineSpacingMultiplier = 2130772417;
+ // aapt resource value: 0x7F0401B4
+ public const int wheelview_lineSpacingMultiplier = 2130969012;
- // aapt resource value: 0x7f0101bf
- public const int wheelview_textColorCenter = 2130772415;
+ // aapt resource value: 0x7F0401B5
+ public const int wheelview_textColorCenter = 2130969013;
- // aapt resource value: 0x7f0101be
- public const int wheelview_textColorOut = 2130772414;
+ // aapt resource value: 0x7F0401B6
+ public const int wheelview_textColorOut = 2130969014;
- // aapt resource value: 0x7f0101bd
- public const int wheelview_textSize = 2130772413;
+ // aapt resource value: 0x7F0401B7
+ public const int wheelview_textSize = 2130969015;
- // aapt resource value: 0x7f01003d
- public const int windowActionBar = 2130772029;
+ // aapt resource value: 0x7F0401B8
+ public const int windowActionBar = 2130969016;
- // aapt resource value: 0x7f01003f
- public const int windowActionBarOverlay = 2130772031;
+ // aapt resource value: 0x7F0401B9
+ public const int windowActionBarOverlay = 2130969017;
- // aapt resource value: 0x7f010040
- public const int windowActionModeOverlay = 2130772032;
+ // aapt resource value: 0x7F0401BA
+ public const int windowActionModeOverlay = 2130969018;
- // aapt resource value: 0x7f010044
- public const int windowFixedHeightMajor = 2130772036;
+ // aapt resource value: 0x7F0401BB
+ public const int windowFixedHeightMajor = 2130969019;
- // aapt resource value: 0x7f010042
- public const int windowFixedHeightMinor = 2130772034;
+ // aapt resource value: 0x7F0401BC
+ public const int windowFixedHeightMinor = 2130969020;
- // aapt resource value: 0x7f010041
- public const int windowFixedWidthMajor = 2130772033;
+ // aapt resource value: 0x7F0401BD
+ public const int windowFixedWidthMajor = 2130969021;
- // aapt resource value: 0x7f010043
- public const int windowFixedWidthMinor = 2130772035;
+ // aapt resource value: 0x7F0401BE
+ public const int windowFixedWidthMinor = 2130969022;
- // aapt resource value: 0x7f010045
- public const int windowMinWidthMajor = 2130772037;
+ // aapt resource value: 0x7F0401BF
+ public const int windowMinWidthMajor = 2130969023;
- // aapt resource value: 0x7f010046
- public const int windowMinWidthMinor = 2130772038;
+ // aapt resource value: 0x7F0401C0
+ public const int windowMinWidthMinor = 2130969024;
- // aapt resource value: 0x7f01003e
- public const int windowNoTitle = 2130772030;
+ // aapt resource value: 0x7F0401C1
+ public const int windowNoTitle = 2130969025;
static Attribute()
{
@@ -1667,20 +1669,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7f0c0000
- public const int abc_action_bar_embed_tabs = 2131492864;
+ // aapt resource value: 0x7F050000
+ public const int abc_action_bar_embed_tabs = 2131034112;
- // aapt resource value: 0x7f0c0001
- public const int abc_allow_stacked_button_bar = 2131492865;
+ // aapt resource value: 0x7F050001
+ public const int abc_allow_stacked_button_bar = 2131034113;
- // aapt resource value: 0x7f0c0002
- public const int abc_config_actionMenuItemAllCaps = 2131492866;
+ // aapt resource value: 0x7F050002
+ public const int abc_config_actionMenuItemAllCaps = 2131034114;
- // aapt resource value: 0x7f0c0003
- public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
+ // aapt resource value: 0x7F050003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
- // aapt resource value: 0x7f0c0004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
+ // aapt resource value: 0x7F050004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
static Boolean()
{
@@ -1695,323 +1697,323 @@
public partial class Color
{
- // aapt resource value: 0x7f0d0052
- public const int abc_background_cache_hint_selector_material_dark = 2131558482;
+ // aapt resource value: 0x7F060000
+ public const int abc_background_cache_hint_selector_material_dark = 2131099648;
- // aapt resource value: 0x7f0d0053
- public const int abc_background_cache_hint_selector_material_light = 2131558483;
+ // aapt resource value: 0x7F060001
+ public const int abc_background_cache_hint_selector_material_light = 2131099649;
- // aapt resource value: 0x7f0d0054
- public const int abc_btn_colored_borderless_text_material = 2131558484;
+ // aapt resource value: 0x7F060002
+ public const int abc_btn_colored_borderless_text_material = 2131099650;
- // aapt resource value: 0x7f0d0055
- public const int abc_btn_colored_text_material = 2131558485;
+ // aapt resource value: 0x7F060003
+ public const int abc_btn_colored_text_material = 2131099651;
- // aapt resource value: 0x7f0d0056
- public const int abc_color_highlight_material = 2131558486;
+ // aapt resource value: 0x7F060004
+ public const int abc_color_highlight_material = 2131099652;
- // aapt resource value: 0x7f0d0057
- public const int abc_hint_foreground_material_dark = 2131558487;
+ // aapt resource value: 0x7F060005
+ public const int abc_hint_foreground_material_dark = 2131099653;
- // aapt resource value: 0x7f0d0058
- public const int abc_hint_foreground_material_light = 2131558488;
+ // aapt resource value: 0x7F060006
+ public const int abc_hint_foreground_material_light = 2131099654;
- // aapt resource value: 0x7f0d0000
- public const int abc_input_method_navigation_guard = 2131558400;
+ // aapt resource value: 0x7F060007
+ public const int abc_input_method_navigation_guard = 2131099655;
- // aapt resource value: 0x7f0d0059
- public const int abc_primary_text_disable_only_material_dark = 2131558489;
+ // aapt resource value: 0x7F060008
+ public const int abc_primary_text_disable_only_material_dark = 2131099656;
- // aapt resource value: 0x7f0d005a
- public const int abc_primary_text_disable_only_material_light = 2131558490;
+ // aapt resource value: 0x7F060009
+ public const int abc_primary_text_disable_only_material_light = 2131099657;
- // aapt resource value: 0x7f0d005b
- public const int abc_primary_text_material_dark = 2131558491;
+ // aapt resource value: 0x7F06000A
+ public const int abc_primary_text_material_dark = 2131099658;
- // aapt resource value: 0x7f0d005c
- public const int abc_primary_text_material_light = 2131558492;
+ // aapt resource value: 0x7F06000B
+ public const int abc_primary_text_material_light = 2131099659;
- // aapt resource value: 0x7f0d005d
- public const int abc_search_url_text = 2131558493;
+ // aapt resource value: 0x7F06000C
+ public const int abc_search_url_text = 2131099660;
- // aapt resource value: 0x7f0d0001
- public const int abc_search_url_text_normal = 2131558401;
+ // aapt resource value: 0x7F06000D
+ public const int abc_search_url_text_normal = 2131099661;
- // aapt resource value: 0x7f0d0002
- public const int abc_search_url_text_pressed = 2131558402;
+ // aapt resource value: 0x7F06000E
+ public const int abc_search_url_text_pressed = 2131099662;
- // aapt resource value: 0x7f0d0003
- public const int abc_search_url_text_selected = 2131558403;
+ // aapt resource value: 0x7F06000F
+ public const int abc_search_url_text_selected = 2131099663;
- // aapt resource value: 0x7f0d005e
- public const int abc_secondary_text_material_dark = 2131558494;
+ // aapt resource value: 0x7F060010
+ public const int abc_secondary_text_material_dark = 2131099664;
- // aapt resource value: 0x7f0d005f
- public const int abc_secondary_text_material_light = 2131558495;
+ // aapt resource value: 0x7F060011
+ public const int abc_secondary_text_material_light = 2131099665;
- // aapt resource value: 0x7f0d0060
- public const int abc_tint_btn_checkable = 2131558496;
+ // aapt resource value: 0x7F060012
+ public const int abc_tint_btn_checkable = 2131099666;
- // aapt resource value: 0x7f0d0061
- public const int abc_tint_default = 2131558497;
+ // aapt resource value: 0x7F060013
+ public const int abc_tint_default = 2131099667;
- // aapt resource value: 0x7f0d0062
- public const int abc_tint_edittext = 2131558498;
+ // aapt resource value: 0x7F060014
+ public const int abc_tint_edittext = 2131099668;
- // aapt resource value: 0x7f0d0063
- public const int abc_tint_seek_thumb = 2131558499;
+ // aapt resource value: 0x7F060015
+ public const int abc_tint_seek_thumb = 2131099669;
- // aapt resource value: 0x7f0d0064
- public const int abc_tint_spinner = 2131558500;
+ // aapt resource value: 0x7F060016
+ public const int abc_tint_spinner = 2131099670;
- // aapt resource value: 0x7f0d0065
- public const int abc_tint_switch_track = 2131558501;
+ // aapt resource value: 0x7F060017
+ public const int abc_tint_switch_track = 2131099671;
- // aapt resource value: 0x7f0d0004
- public const int accent_material_dark = 2131558404;
+ // aapt resource value: 0x7F060018
+ public const int accent_material_dark = 2131099672;
- // aapt resource value: 0x7f0d0005
- public const int accent_material_light = 2131558405;
+ // aapt resource value: 0x7F060019
+ public const int accent_material_light = 2131099673;
- // aapt resource value: 0x7f0d0006
- public const int background_floating_material_dark = 2131558406;
+ // aapt resource value: 0x7F06001A
+ public const int background_floating_material_dark = 2131099674;
- // aapt resource value: 0x7f0d0007
- public const int background_floating_material_light = 2131558407;
+ // aapt resource value: 0x7F06001B
+ public const int background_floating_material_light = 2131099675;
- // aapt resource value: 0x7f0d0008
- public const int background_material_dark = 2131558408;
+ // aapt resource value: 0x7F06001C
+ public const int background_material_dark = 2131099676;
- // aapt resource value: 0x7f0d0009
- public const int background_material_light = 2131558409;
+ // aapt resource value: 0x7F06001D
+ public const int background_material_light = 2131099677;
- // aapt resource value: 0x7f0d000a
- public const int bright_foreground_disabled_material_dark = 2131558410;
+ // aapt resource value: 0x7F06001E
+ public const int bright_foreground_disabled_material_dark = 2131099678;
- // aapt resource value: 0x7f0d000b
- public const int bright_foreground_disabled_material_light = 2131558411;
+ // aapt resource value: 0x7F06001F
+ public const int bright_foreground_disabled_material_light = 2131099679;
- // aapt resource value: 0x7f0d000c
- public const int bright_foreground_inverse_material_dark = 2131558412;
+ // aapt resource value: 0x7F060020
+ public const int bright_foreground_inverse_material_dark = 2131099680;
- // aapt resource value: 0x7f0d000d
- public const int bright_foreground_inverse_material_light = 2131558413;
+ // aapt resource value: 0x7F060021
+ public const int bright_foreground_inverse_material_light = 2131099681;
- // aapt resource value: 0x7f0d000e
- public const int bright_foreground_material_dark = 2131558414;
+ // aapt resource value: 0x7F060022
+ public const int bright_foreground_material_dark = 2131099682;
- // aapt resource value: 0x7f0d000f
- public const int bright_foreground_material_light = 2131558415;
+ // aapt resource value: 0x7F060023
+ public const int bright_foreground_material_light = 2131099683;
- // aapt resource value: 0x7f0d0010
- public const int button_material_dark = 2131558416;
+ // aapt resource value: 0x7F060024
+ public const int button_material_dark = 2131099684;
- // aapt resource value: 0x7f0d0011
- public const int button_material_light = 2131558417;
+ // aapt resource value: 0x7F060025
+ public const int button_material_light = 2131099685;
- // aapt resource value: 0x7f0d003c
- public const int design_bottom_navigation_shadow_color = 2131558460;
+ // aapt resource value: 0x7F060026
+ public const int design_bottom_navigation_shadow_color = 2131099686;
- // aapt resource value: 0x7f0d0066
- public const int design_error = 2131558502;
+ // aapt resource value: 0x7F060027
+ public const int design_error = 2131099687;
- // aapt resource value: 0x7f0d003d
- public const int design_fab_shadow_end_color = 2131558461;
+ // aapt resource value: 0x7F060028
+ public const int design_fab_shadow_end_color = 2131099688;
- // aapt resource value: 0x7f0d003e
- public const int design_fab_shadow_mid_color = 2131558462;
+ // aapt resource value: 0x7F060029
+ public const int design_fab_shadow_mid_color = 2131099689;
- // aapt resource value: 0x7f0d003f
- public const int design_fab_shadow_start_color = 2131558463;
+ // aapt resource value: 0x7F06002A
+ public const int design_fab_shadow_start_color = 2131099690;
- // aapt resource value: 0x7f0d0040
- public const int design_fab_stroke_end_inner_color = 2131558464;
+ // aapt resource value: 0x7F06002B
+ public const int design_fab_stroke_end_inner_color = 2131099691;
- // aapt resource value: 0x7f0d0041
- public const int design_fab_stroke_end_outer_color = 2131558465;
+ // aapt resource value: 0x7F06002C
+ public const int design_fab_stroke_end_outer_color = 2131099692;
- // aapt resource value: 0x7f0d0042
- public const int design_fab_stroke_top_inner_color = 2131558466;
+ // aapt resource value: 0x7F06002D
+ public const int design_fab_stroke_top_inner_color = 2131099693;
- // aapt resource value: 0x7f0d0043
- public const int design_fab_stroke_top_outer_color = 2131558467;
+ // aapt resource value: 0x7F06002E
+ public const int design_fab_stroke_top_outer_color = 2131099694;
- // aapt resource value: 0x7f0d0044
- public const int design_snackbar_background_color = 2131558468;
+ // aapt resource value: 0x7F06002F
+ public const int design_snackbar_background_color = 2131099695;
- // aapt resource value: 0x7f0d0067
- public const int design_tint_password_toggle = 2131558503;
+ // aapt resource value: 0x7F060030
+ public const int design_tint_password_toggle = 2131099696;
- // aapt resource value: 0x7f0d0012
- public const int dim_foreground_disabled_material_dark = 2131558418;
+ // aapt resource value: 0x7F060031
+ public const int dim_foreground_disabled_material_dark = 2131099697;
- // aapt resource value: 0x7f0d0013
- public const int dim_foreground_disabled_material_light = 2131558419;
+ // aapt resource value: 0x7F060032
+ public const int dim_foreground_disabled_material_light = 2131099698;
- // aapt resource value: 0x7f0d0014
- public const int dim_foreground_material_dark = 2131558420;
+ // aapt resource value: 0x7F060033
+ public const int dim_foreground_material_dark = 2131099699;
- // aapt resource value: 0x7f0d0015
- public const int dim_foreground_material_light = 2131558421;
+ // aapt resource value: 0x7F060034
+ public const int dim_foreground_material_light = 2131099700;
- // aapt resource value: 0x7f0d0016
- public const int error_color_material = 2131558422;
+ // aapt resource value: 0x7F060035
+ public const int error_color_material = 2131099701;
- // aapt resource value: 0x7f0d0017
- public const int foreground_material_dark = 2131558423;
+ // aapt resource value: 0x7F060036
+ public const int foreground_material_dark = 2131099702;
- // aapt resource value: 0x7f0d0018
- public const int foreground_material_light = 2131558424;
+ // aapt resource value: 0x7F060037
+ public const int foreground_material_light = 2131099703;
- // aapt resource value: 0x7f0d0048
- public const int gd_top_view = 2131558472;
+ // aapt resource value: 0x7F060038
+ public const int gd_top_view = 2131099704;
- // aapt resource value: 0x7f0d0019
- public const int highlighted_text_material_dark = 2131558425;
+ // aapt resource value: 0x7F060039
+ public const int highlighted_text_material_dark = 2131099705;
- // aapt resource value: 0x7f0d001a
- public const int highlighted_text_material_light = 2131558426;
+ // aapt resource value: 0x7F06003A
+ public const int highlighted_text_material_light = 2131099706;
- // aapt resource value: 0x7f0d001b
- public const int material_blue_grey_800 = 2131558427;
+ // aapt resource value: 0x7F06003B
+ public const int material_blue_grey_800 = 2131099707;
- // aapt resource value: 0x7f0d001c
- public const int material_blue_grey_900 = 2131558428;
+ // aapt resource value: 0x7F06003C
+ public const int material_blue_grey_900 = 2131099708;
- // aapt resource value: 0x7f0d001d
- public const int material_blue_grey_950 = 2131558429;
+ // aapt resource value: 0x7F06003D
+ public const int material_blue_grey_950 = 2131099709;
- // aapt resource value: 0x7f0d001e
- public const int material_deep_teal_200 = 2131558430;
+ // aapt resource value: 0x7F06003E
+ public const int material_deep_teal_200 = 2131099710;
- // aapt resource value: 0x7f0d001f
- public const int material_deep_teal_500 = 2131558431;
+ // aapt resource value: 0x7F06003F
+ public const int material_deep_teal_500 = 2131099711;
- // aapt resource value: 0x7f0d0020
- public const int material_grey_100 = 2131558432;
+ // aapt resource value: 0x7F060040
+ public const int material_grey_100 = 2131099712;
- // aapt resource value: 0x7f0d0021
- public const int material_grey_300 = 2131558433;
+ // aapt resource value: 0x7F060041
+ public const int material_grey_300 = 2131099713;
- // aapt resource value: 0x7f0d0022
- public const int material_grey_50 = 2131558434;
+ // aapt resource value: 0x7F060042
+ public const int material_grey_50 = 2131099714;
- // aapt resource value: 0x7f0d0023
- public const int material_grey_600 = 2131558435;
+ // aapt resource value: 0x7F060043
+ public const int material_grey_600 = 2131099715;
- // aapt resource value: 0x7f0d0024
- public const int material_grey_800 = 2131558436;
+ // aapt resource value: 0x7F060044
+ public const int material_grey_800 = 2131099716;
- // aapt resource value: 0x7f0d0025
- public const int material_grey_850 = 2131558437;
+ // aapt resource value: 0x7F060045
+ public const int material_grey_850 = 2131099717;
- // aapt resource value: 0x7f0d0026
- public const int material_grey_900 = 2131558438;
+ // aapt resource value: 0x7F060046
+ public const int material_grey_900 = 2131099718;
- // aapt resource value: 0x7f0d0047
- public const int material_red_500 = 2131558471;
+ // aapt resource value: 0x7F060047
+ public const int material_red_500 = 2131099719;
- // aapt resource value: 0x7f0d0045
- public const int notification_action_color_filter = 2131558469;
+ // aapt resource value: 0x7F060048
+ public const int notification_action_color_filter = 2131099720;
- // aapt resource value: 0x7f0d0046
- public const int notification_icon_bg_color = 2131558470;
+ // aapt resource value: 0x7F060049
+ public const int notification_icon_bg_color = 2131099721;
- // aapt resource value: 0x7f0d003b
- public const int notification_material_background_media_default_color = 2131558459;
+ // aapt resource value: 0x7F06004A
+ public const int notification_material_background_media_default_color = 2131099722;
- // aapt resource value: 0x7f0d0049
- public const int pickerview_bgColor_default = 2131558473;
+ // aapt resource value: 0x7F06004B
+ public const int pickerview_bgColor_default = 2131099723;
- // aapt resource value: 0x7f0d004a
- public const int pickerview_bgColor_overlay = 2131558474;
+ // aapt resource value: 0x7F06004C
+ public const int pickerview_bgColor_overlay = 2131099724;
- // aapt resource value: 0x7f0d004b
- public const int pickerview_bg_topbar = 2131558475;
+ // aapt resource value: 0x7F06004D
+ public const int pickerview_bg_topbar = 2131099725;
- // aapt resource value: 0x7f0d004c
- public const int pickerview_timebtn_nor = 2131558476;
+ // aapt resource value: 0x7F06004E
+ public const int pickerview_timebtn_nor = 2131099726;
- // aapt resource value: 0x7f0d004d
- public const int pickerview_timebtn_pre = 2131558477;
+ // aapt resource value: 0x7F06004F
+ public const int pickerview_timebtn_pre = 2131099727;
- // aapt resource value: 0x7f0d004e
- public const int pickerview_topbar_title = 2131558478;
+ // aapt resource value: 0x7F060050
+ public const int pickerview_topbar_title = 2131099728;
- // aapt resource value: 0x7f0d004f
- public const int pickerview_wheelview_textcolor_center = 2131558479;
+ // aapt resource value: 0x7F060051
+ public const int pickerview_wheelview_textcolor_center = 2131099729;
- // aapt resource value: 0x7f0d0050
- public const int pickerview_wheelview_textcolor_divider = 2131558480;
+ // aapt resource value: 0x7F060052
+ public const int pickerview_wheelview_textcolor_divider = 2131099730;
- // aapt resource value: 0x7f0d0051
- public const int pickerview_wheelview_textcolor_out = 2131558481;
+ // aapt resource value: 0x7F060053
+ public const int pickerview_wheelview_textcolor_out = 2131099731;
- // aapt resource value: 0x7f0d0027
- public const int primary_dark_material_dark = 2131558439;
+ // aapt resource value: 0x7F060054
+ public const int primary_dark_material_dark = 2131099732;
- // aapt resource value: 0x7f0d0028
- public const int primary_dark_material_light = 2131558440;
+ // aapt resource value: 0x7F060055
+ public const int primary_dark_material_light = 2131099733;
- // aapt resource value: 0x7f0d0029
- public const int primary_material_dark = 2131558441;
+ // aapt resource value: 0x7F060056
+ public const int primary_material_dark = 2131099734;
- // aapt resource value: 0x7f0d002a
- public const int primary_material_light = 2131558442;
+ // aapt resource value: 0x7F060057
+ public const int primary_material_light = 2131099735;
- // aapt resource value: 0x7f0d002b
- public const int primary_text_default_material_dark = 2131558443;
+ // aapt resource value: 0x7F060058
+ public const int primary_text_default_material_dark = 2131099736;
- // aapt resource value: 0x7f0d002c
- public const int primary_text_default_material_light = 2131558444;
+ // aapt resource value: 0x7F060059
+ public const int primary_text_default_material_light = 2131099737;
- // aapt resource value: 0x7f0d002d
- public const int primary_text_disabled_material_dark = 2131558445;
+ // aapt resource value: 0x7F06005A
+ public const int primary_text_disabled_material_dark = 2131099738;
- // aapt resource value: 0x7f0d002e
- public const int primary_text_disabled_material_light = 2131558446;
+ // aapt resource value: 0x7F06005B
+ public const int primary_text_disabled_material_light = 2131099739;
- // aapt resource value: 0x7f0d002f
- public const int ripple_material_dark = 2131558447;
+ // aapt resource value: 0x7F06005C
+ public const int ripple_material_dark = 2131099740;
- // aapt resource value: 0x7f0d0030
- public const int ripple_material_light = 2131558448;
+ // aapt resource value: 0x7F06005D
+ public const int ripple_material_light = 2131099741;
- // aapt resource value: 0x7f0d0031
- public const int secondary_text_default_material_dark = 2131558449;
+ // aapt resource value: 0x7F06005E
+ public const int secondary_text_default_material_dark = 2131099742;
- // aapt resource value: 0x7f0d0032
- public const int secondary_text_default_material_light = 2131558450;
+ // aapt resource value: 0x7F06005F
+ public const int secondary_text_default_material_light = 2131099743;
- // aapt resource value: 0x7f0d0033
- public const int secondary_text_disabled_material_dark = 2131558451;
+ // aapt resource value: 0x7F060060
+ public const int secondary_text_disabled_material_dark = 2131099744;
- // aapt resource value: 0x7f0d0034
- public const int secondary_text_disabled_material_light = 2131558452;
+ // aapt resource value: 0x7F060061
+ public const int secondary_text_disabled_material_light = 2131099745;
- // aapt resource value: 0x7f0d0035
- public const int switch_thumb_disabled_material_dark = 2131558453;
+ // aapt resource value: 0x7F060062
+ public const int switch_thumb_disabled_material_dark = 2131099746;
- // aapt resource value: 0x7f0d0036
- public const int switch_thumb_disabled_material_light = 2131558454;
+ // aapt resource value: 0x7F060063
+ public const int switch_thumb_disabled_material_light = 2131099747;
- // aapt resource value: 0x7f0d0068
- public const int switch_thumb_material_dark = 2131558504;
+ // aapt resource value: 0x7F060064
+ public const int switch_thumb_material_dark = 2131099748;
- // aapt resource value: 0x7f0d0069
- public const int switch_thumb_material_light = 2131558505;
+ // aapt resource value: 0x7F060065
+ public const int switch_thumb_material_light = 2131099749;
- // aapt resource value: 0x7f0d0037
- public const int switch_thumb_normal_material_dark = 2131558455;
+ // aapt resource value: 0x7F060066
+ public const int switch_thumb_normal_material_dark = 2131099750;
- // aapt resource value: 0x7f0d0038
- public const int switch_thumb_normal_material_light = 2131558456;
+ // aapt resource value: 0x7F060067
+ public const int switch_thumb_normal_material_light = 2131099751;
- // aapt resource value: 0x7f0d0039
- public const int tooltip_background_dark = 2131558457;
+ // aapt resource value: 0x7F060068
+ public const int tooltip_background_dark = 2131099752;
- // aapt resource value: 0x7f0d003a
- public const int tooltip_background_light = 2131558458;
+ // aapt resource value: 0x7F060069
+ public const int tooltip_background_light = 2131099753;
static Color()
{
@@ -2026,491 +2028,491 @@
public partial class Dimension
{
- // aapt resource value: 0x7f080012
- public const int abc_action_bar_content_inset_material = 2131230738;
+ // aapt resource value: 0x7F070000
+ public const int abc_action_bar_content_inset_material = 2131165184;
- // aapt resource value: 0x7f080013
- public const int abc_action_bar_content_inset_with_nav = 2131230739;
+ // aapt resource value: 0x7F070001
+ public const int abc_action_bar_content_inset_with_nav = 2131165185;
- // aapt resource value: 0x7f080007
- public const int abc_action_bar_default_height_material = 2131230727;
+ // aapt resource value: 0x7F070002
+ public const int abc_action_bar_default_height_material = 2131165186;
- // aapt resource value: 0x7f080014
- public const int abc_action_bar_default_padding_end_material = 2131230740;
+ // aapt resource value: 0x7F070003
+ public const int abc_action_bar_default_padding_end_material = 2131165187;
- // aapt resource value: 0x7f080015
- public const int abc_action_bar_default_padding_start_material = 2131230741;
+ // aapt resource value: 0x7F070004
+ public const int abc_action_bar_default_padding_start_material = 2131165188;
- // aapt resource value: 0x7f080017
- public const int abc_action_bar_elevation_material = 2131230743;
+ // aapt resource value: 0x7F070005
+ public const int abc_action_bar_elevation_material = 2131165189;
- // aapt resource value: 0x7f080018
- public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
+ // aapt resource value: 0x7F070006
+ public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
- // aapt resource value: 0x7f080019
- public const int abc_action_bar_overflow_padding_end_material = 2131230745;
+ // aapt resource value: 0x7F070007
+ public const int abc_action_bar_overflow_padding_end_material = 2131165191;
- // aapt resource value: 0x7f08001a
- public const int abc_action_bar_overflow_padding_start_material = 2131230746;
+ // aapt resource value: 0x7F070008
+ public const int abc_action_bar_overflow_padding_start_material = 2131165192;
- // aapt resource value: 0x7f080008
- public const int abc_action_bar_progress_bar_size = 2131230728;
+ // aapt resource value: 0x7F070009
+ public const int abc_action_bar_progress_bar_size = 2131165193;
- // aapt resource value: 0x7f08001b
- public const int abc_action_bar_stacked_max_height = 2131230747;
+ // aapt resource value: 0x7F07000A
+ public const int abc_action_bar_stacked_max_height = 2131165194;
- // aapt resource value: 0x7f08001c
- public const int abc_action_bar_stacked_tab_max_width = 2131230748;
+ // aapt resource value: 0x7F07000B
+ public const int abc_action_bar_stacked_tab_max_width = 2131165195;
- // aapt resource value: 0x7f08001d
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
+ // aapt resource value: 0x7F07000C
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
- // aapt resource value: 0x7f08001e
- public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
+ // aapt resource value: 0x7F07000D
+ public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
- // aapt resource value: 0x7f08001f
- public const int abc_action_button_min_height_material = 2131230751;
+ // aapt resource value: 0x7F07000E
+ public const int abc_action_button_min_height_material = 2131165198;
- // aapt resource value: 0x7f080020
- public const int abc_action_button_min_width_material = 2131230752;
+ // aapt resource value: 0x7F07000F
+ public const int abc_action_button_min_width_material = 2131165199;
- // aapt resource value: 0x7f080021
- public const int abc_action_button_min_width_overflow_material = 2131230753;
+ // aapt resource value: 0x7F070010
+ public const int abc_action_button_min_width_overflow_material = 2131165200;
- // aapt resource value: 0x7f080006
- public const int abc_alert_dialog_button_bar_height = 2131230726;
+ // aapt resource value: 0x7F070011
+ public const int abc_alert_dialog_button_bar_height = 2131165201;
- // aapt resource value: 0x7f080022
- public const int abc_button_inset_horizontal_material = 2131230754;
+ // aapt resource value: 0x7F070012
+ public const int abc_button_inset_horizontal_material = 2131165202;
- // aapt resource value: 0x7f080023
- public const int abc_button_inset_vertical_material = 2131230755;
+ // aapt resource value: 0x7F070013
+ public const int abc_button_inset_vertical_material = 2131165203;
- // aapt resource value: 0x7f080024
- public const int abc_button_padding_horizontal_material = 2131230756;
+ // aapt resource value: 0x7F070014
+ public const int abc_button_padding_horizontal_material = 2131165204;
- // aapt resource value: 0x7f080025
- public const int abc_button_padding_vertical_material = 2131230757;
+ // aapt resource value: 0x7F070015
+ public const int abc_button_padding_vertical_material = 2131165205;
- // aapt resource value: 0x7f080026
- public const int abc_cascading_menus_min_smallest_width = 2131230758;
+ // aapt resource value: 0x7F070016
+ public const int abc_cascading_menus_min_smallest_width = 2131165206;
- // aapt resource value: 0x7f08000b
- public const int abc_config_prefDialogWidth = 2131230731;
+ // aapt resource value: 0x7F070017
+ public const int abc_config_prefDialogWidth = 2131165207;
- // aapt resource value: 0x7f080027
- public const int abc_control_corner_material = 2131230759;
+ // aapt resource value: 0x7F070018
+ public const int abc_control_corner_material = 2131165208;
- // aapt resource value: 0x7f080028
- public const int abc_control_inset_material = 2131230760;
+ // aapt resource value: 0x7F070019
+ public const int abc_control_inset_material = 2131165209;
- // aapt resource value: 0x7f080029
- public const int abc_control_padding_material = 2131230761;
+ // aapt resource value: 0x7F07001A
+ public const int abc_control_padding_material = 2131165210;
- // aapt resource value: 0x7f08000c
- public const int abc_dialog_fixed_height_major = 2131230732;
+ // aapt resource value: 0x7F07001B
+ public const int abc_dialog_fixed_height_major = 2131165211;
- // aapt resource value: 0x7f08000d
- public const int abc_dialog_fixed_height_minor = 2131230733;
+ // aapt resource value: 0x7F07001C
+ public const int abc_dialog_fixed_height_minor = 2131165212;
- // aapt resource value: 0x7f08000e
- public const int abc_dialog_fixed_width_major = 2131230734;
+ // aapt resource value: 0x7F07001D
+ public const int abc_dialog_fixed_width_major = 2131165213;
- // aapt resource value: 0x7f08000f
- public const int abc_dialog_fixed_width_minor = 2131230735;
+ // aapt resource value: 0x7F07001E
+ public const int abc_dialog_fixed_width_minor = 2131165214;
- // aapt resource value: 0x7f08002a
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
+ // aapt resource value: 0x7F07001F
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
- // aapt resource value: 0x7f08002b
- public const int abc_dialog_list_padding_top_no_title = 2131230763;
+ // aapt resource value: 0x7F070020
+ public const int abc_dialog_list_padding_top_no_title = 2131165216;
- // aapt resource value: 0x7f080010
- public const int abc_dialog_min_width_major = 2131230736;
+ // aapt resource value: 0x7F070021
+ public const int abc_dialog_min_width_major = 2131165217;
- // aapt resource value: 0x7f080011
- public const int abc_dialog_min_width_minor = 2131230737;
+ // aapt resource value: 0x7F070022
+ public const int abc_dialog_min_width_minor = 2131165218;
- // aapt resource value: 0x7f08002c
- public const int abc_dialog_padding_material = 2131230764;
+ // aapt resource value: 0x7F070023
+ public const int abc_dialog_padding_material = 2131165219;
- // aapt resource value: 0x7f08002d
- public const int abc_dialog_padding_top_material = 2131230765;
+ // aapt resource value: 0x7F070024
+ public const int abc_dialog_padding_top_material = 2131165220;
- // aapt resource value: 0x7f08002e
- public const int abc_dialog_title_divider_material = 2131230766;
+ // aapt resource value: 0x7F070025
+ public const int abc_dialog_title_divider_material = 2131165221;
- // aapt resource value: 0x7f08002f
- public const int abc_disabled_alpha_material_dark = 2131230767;
+ // aapt resource value: 0x7F070026
+ public const int abc_disabled_alpha_material_dark = 2131165222;
- // aapt resource value: 0x7f080030
- public const int abc_disabled_alpha_material_light = 2131230768;
+ // aapt resource value: 0x7F070027
+ public const int abc_disabled_alpha_material_light = 2131165223;
- // aapt resource value: 0x7f080031
- public const int abc_dropdownitem_icon_width = 2131230769;
+ // aapt resource value: 0x7F070028
+ public const int abc_dropdownitem_icon_width = 2131165224;
- // aapt resource value: 0x7f080032
- public const int abc_dropdownitem_text_padding_left = 2131230770;
+ // aapt resource value: 0x7F070029
+ public const int abc_dropdownitem_text_padding_left = 2131165225;
- // aapt resource value: 0x7f080033
- public const int abc_dropdownitem_text_padding_right = 2131230771;
+ // aapt resource value: 0x7F07002A
+ public const int abc_dropdownitem_text_padding_right = 2131165226;
- // aapt resource value: 0x7f080034
- public const int abc_edit_text_inset_bottom_material = 2131230772;
+ // aapt resource value: 0x7F07002B
+ public const int abc_edit_text_inset_bottom_material = 2131165227;
- // aapt resource value: 0x7f080035
- public const int abc_edit_text_inset_horizontal_material = 2131230773;
+ // aapt resource value: 0x7F07002C
+ public const int abc_edit_text_inset_horizontal_material = 2131165228;
- // aapt resource value: 0x7f080036
- public const int abc_edit_text_inset_top_material = 2131230774;
+ // aapt resource value: 0x7F07002D
+ public const int abc_edit_text_inset_top_material = 2131165229;
- // aapt resource value: 0x7f080037
- public const int abc_floating_window_z = 2131230775;
+ // aapt resource value: 0x7F07002E
+ public const int abc_floating_window_z = 2131165230;
- // aapt resource value: 0x7f080038
- public const int abc_list_item_padding_horizontal_material = 2131230776;
+ // aapt resource value: 0x7F07002F
+ public const int abc_list_item_padding_horizontal_material = 2131165231;
- // aapt resource value: 0x7f080039
- public const int abc_panel_menu_list_width = 2131230777;
+ // aapt resource value: 0x7F070030
+ public const int abc_panel_menu_list_width = 2131165232;
- // aapt resource value: 0x7f08003a
- public const int abc_progress_bar_height_material = 2131230778;
+ // aapt resource value: 0x7F070031
+ public const int abc_progress_bar_height_material = 2131165233;
- // aapt resource value: 0x7f08003b
- public const int abc_search_view_preferred_height = 2131230779;
+ // aapt resource value: 0x7F070032
+ public const int abc_search_view_preferred_height = 2131165234;
- // aapt resource value: 0x7f08003c
- public const int abc_search_view_preferred_width = 2131230780;
+ // aapt resource value: 0x7F070033
+ public const int abc_search_view_preferred_width = 2131165235;
- // aapt resource value: 0x7f08003d
- public const int abc_seekbar_track_background_height_material = 2131230781;
+ // aapt resource value: 0x7F070034
+ public const int abc_seekbar_track_background_height_material = 2131165236;
- // aapt resource value: 0x7f08003e
- public const int abc_seekbar_track_progress_height_material = 2131230782;
+ // aapt resource value: 0x7F070035
+ public const int abc_seekbar_track_progress_height_material = 2131165237;
- // aapt resource value: 0x7f08003f
- public const int abc_select_dialog_padding_start_material = 2131230783;
+ // aapt resource value: 0x7F070036
+ public const int abc_select_dialog_padding_start_material = 2131165238;
- // aapt resource value: 0x7f080016
- public const int abc_switch_padding = 2131230742;
+ // aapt resource value: 0x7F070037
+ public const int abc_switch_padding = 2131165239;
- // aapt resource value: 0x7f080040
- public const int abc_text_size_body_1_material = 2131230784;
+ // aapt resource value: 0x7F070038
+ public const int abc_text_size_body_1_material = 2131165240;
- // aapt resource value: 0x7f080041
- public const int abc_text_size_body_2_material = 2131230785;
+ // aapt resource value: 0x7F070039
+ public const int abc_text_size_body_2_material = 2131165241;
- // aapt resource value: 0x7f080042
- public const int abc_text_size_button_material = 2131230786;
+ // aapt resource value: 0x7F07003A
+ public const int abc_text_size_button_material = 2131165242;
- // aapt resource value: 0x7f080043
- public const int abc_text_size_caption_material = 2131230787;
+ // aapt resource value: 0x7F07003B
+ public const int abc_text_size_caption_material = 2131165243;
- // aapt resource value: 0x7f080044
- public const int abc_text_size_display_1_material = 2131230788;
+ // aapt resource value: 0x7F07003C
+ public const int abc_text_size_display_1_material = 2131165244;
- // aapt resource value: 0x7f080045
- public const int abc_text_size_display_2_material = 2131230789;
+ // aapt resource value: 0x7F07003D
+ public const int abc_text_size_display_2_material = 2131165245;
- // aapt resource value: 0x7f080046
- public const int abc_text_size_display_3_material = 2131230790;
+ // aapt resource value: 0x7F07003E
+ public const int abc_text_size_display_3_material = 2131165246;
- // aapt resource value: 0x7f080047
- public const int abc_text_size_display_4_material = 2131230791;
+ // aapt resource value: 0x7F07003F
+ public const int abc_text_size_display_4_material = 2131165247;
- // aapt resource value: 0x7f080048
- public const int abc_text_size_headline_material = 2131230792;
+ // aapt resource value: 0x7F070040
+ public const int abc_text_size_headline_material = 2131165248;
- // aapt resource value: 0x7f080049
- public const int abc_text_size_large_material = 2131230793;
+ // aapt resource value: 0x7F070041
+ public const int abc_text_size_large_material = 2131165249;
- // aapt resource value: 0x7f08004a
- public const int abc_text_size_medium_material = 2131230794;
+ // aapt resource value: 0x7F070042
+ public const int abc_text_size_medium_material = 2131165250;
- // aapt resource value: 0x7f08004b
- public const int abc_text_size_menu_header_material = 2131230795;
+ // aapt resource value: 0x7F070043
+ public const int abc_text_size_menu_header_material = 2131165251;
- // aapt resource value: 0x7f08004c
- public const int abc_text_size_menu_material = 2131230796;
+ // aapt resource value: 0x7F070044
+ public const int abc_text_size_menu_material = 2131165252;
- // aapt resource value: 0x7f08004d
- public const int abc_text_size_small_material = 2131230797;
+ // aapt resource value: 0x7F070045
+ public const int abc_text_size_small_material = 2131165253;
- // aapt resource value: 0x7f08004e
- public const int abc_text_size_subhead_material = 2131230798;
+ // aapt resource value: 0x7F070046
+ public const int abc_text_size_subhead_material = 2131165254;
- // aapt resource value: 0x7f080009
- public const int abc_text_size_subtitle_material_toolbar = 2131230729;
+ // aapt resource value: 0x7F070047
+ public const int abc_text_size_subtitle_material_toolbar = 2131165255;
- // aapt resource value: 0x7f08004f
- public const int abc_text_size_title_material = 2131230799;
+ // aapt resource value: 0x7F070048
+ public const int abc_text_size_title_material = 2131165256;
- // aapt resource value: 0x7f08000a
- public const int abc_text_size_title_material_toolbar = 2131230730;
+ // aapt resource value: 0x7F070049
+ public const int abc_text_size_title_material_toolbar = 2131165257;
- // aapt resource value: 0x7f08008b
- public const int compat_button_inset_horizontal_material = 2131230859;
+ // aapt resource value: 0x7F07004A
+ public const int compat_button_inset_horizontal_material = 2131165258;
- // aapt resource value: 0x7f08008c
- public const int compat_button_inset_vertical_material = 2131230860;
+ // aapt resource value: 0x7F07004B
+ public const int compat_button_inset_vertical_material = 2131165259;
- // aapt resource value: 0x7f08008d
- public const int compat_button_padding_horizontal_material = 2131230861;
+ // aapt resource value: 0x7F07004C
+ public const int compat_button_padding_horizontal_material = 2131165260;
- // aapt resource value: 0x7f08008e
- public const int compat_button_padding_vertical_material = 2131230862;
+ // aapt resource value: 0x7F07004D
+ public const int compat_button_padding_vertical_material = 2131165261;
- // aapt resource value: 0x7f08008f
- public const int compat_control_corner_material = 2131230863;
+ // aapt resource value: 0x7F07004E
+ public const int compat_control_corner_material = 2131165262;
- // aapt resource value: 0x7f080069
- public const int design_appbar_elevation = 2131230825;
+ // aapt resource value: 0x7F07004F
+ public const int design_appbar_elevation = 2131165263;
- // aapt resource value: 0x7f08006a
- public const int design_bottom_navigation_active_item_max_width = 2131230826;
+ // aapt resource value: 0x7F070050
+ public const int design_bottom_navigation_active_item_max_width = 2131165264;
- // aapt resource value: 0x7f08006b
- public const int design_bottom_navigation_active_text_size = 2131230827;
+ // aapt resource value: 0x7F070051
+ public const int design_bottom_navigation_active_text_size = 2131165265;
- // aapt resource value: 0x7f08006c
- public const int design_bottom_navigation_elevation = 2131230828;
+ // aapt resource value: 0x7F070052
+ public const int design_bottom_navigation_elevation = 2131165266;
- // aapt resource value: 0x7f08006d
- public const int design_bottom_navigation_height = 2131230829;
+ // aapt resource value: 0x7F070053
+ public const int design_bottom_navigation_height = 2131165267;
- // aapt resource value: 0x7f08006e
- public const int design_bottom_navigation_item_max_width = 2131230830;
+ // aapt resource value: 0x7F070054
+ public const int design_bottom_navigation_item_max_width = 2131165268;
- // aapt resource value: 0x7f08006f
- public const int design_bottom_navigation_item_min_width = 2131230831;
+ // aapt resource value: 0x7F070055
+ public const int design_bottom_navigation_item_min_width = 2131165269;
- // aapt resource value: 0x7f080070
- public const int design_bottom_navigation_margin = 2131230832;
+ // aapt resource value: 0x7F070056
+ public const int design_bottom_navigation_margin = 2131165270;
- // aapt resource value: 0x7f080071
- public const int design_bottom_navigation_shadow_height = 2131230833;
+ // aapt resource value: 0x7F070057
+ public const int design_bottom_navigation_shadow_height = 2131165271;
- // aapt resource value: 0x7f080072
- public const int design_bottom_navigation_text_size = 2131230834;
+ // aapt resource value: 0x7F070058
+ public const int design_bottom_navigation_text_size = 2131165272;
- // aapt resource value: 0x7f080073
- public const int design_bottom_sheet_modal_elevation = 2131230835;
+ // aapt resource value: 0x7F070059
+ public const int design_bottom_sheet_modal_elevation = 2131165273;
- // aapt resource value: 0x7f080074
- public const int design_bottom_sheet_peek_height_min = 2131230836;
+ // aapt resource value: 0x7F07005A
+ public const int design_bottom_sheet_peek_height_min = 2131165274;
- // aapt resource value: 0x7f080075
- public const int design_fab_border_width = 2131230837;
+ // aapt resource value: 0x7F07005B
+ public const int design_fab_border_width = 2131165275;
- // aapt resource value: 0x7f080076
- public const int design_fab_elevation = 2131230838;
+ // aapt resource value: 0x7F07005C
+ public const int design_fab_elevation = 2131165276;
- // aapt resource value: 0x7f080077
- public const int design_fab_image_size = 2131230839;
+ // aapt resource value: 0x7F07005D
+ public const int design_fab_image_size = 2131165277;
- // aapt resource value: 0x7f080078
- public const int design_fab_size_mini = 2131230840;
+ // aapt resource value: 0x7F07005E
+ public const int design_fab_size_mini = 2131165278;
- // aapt resource value: 0x7f080079
- public const int design_fab_size_normal = 2131230841;
+ // aapt resource value: 0x7F07005F
+ public const int design_fab_size_normal = 2131165279;
- // aapt resource value: 0x7f08007a
- public const int design_fab_translation_z_pressed = 2131230842;
+ // aapt resource value: 0x7F070060
+ public const int design_fab_translation_z_pressed = 2131165280;
- // aapt resource value: 0x7f08007b
- public const int design_navigation_elevation = 2131230843;
+ // aapt resource value: 0x7F070061
+ public const int design_navigation_elevation = 2131165281;
- // aapt resource value: 0x7f08007c
- public const int design_navigation_icon_padding = 2131230844;
+ // aapt resource value: 0x7F070062
+ public const int design_navigation_icon_padding = 2131165282;
- // aapt resource value: 0x7f08007d
- public const int design_navigation_icon_size = 2131230845;
+ // aapt resource value: 0x7F070063
+ public const int design_navigation_icon_size = 2131165283;
- // aapt resource value: 0x7f080061
- public const int design_navigation_max_width = 2131230817;
+ // aapt resource value: 0x7F070064
+ public const int design_navigation_max_width = 2131165284;
- // aapt resource value: 0x7f08007e
- public const int design_navigation_padding_bottom = 2131230846;
+ // aapt resource value: 0x7F070065
+ public const int design_navigation_padding_bottom = 2131165285;
- // aapt resource value: 0x7f08007f
- public const int design_navigation_separator_vertical_padding = 2131230847;
+ // aapt resource value: 0x7F070066
+ public const int design_navigation_separator_vertical_padding = 2131165286;
- // aapt resource value: 0x7f080062
- public const int design_snackbar_action_inline_max_width = 2131230818;
+ // aapt resource value: 0x7F070067
+ public const int design_snackbar_action_inline_max_width = 2131165287;
- // aapt resource value: 0x7f080063
- public const int design_snackbar_background_corner_radius = 2131230819;
+ // aapt resource value: 0x7F070068
+ public const int design_snackbar_background_corner_radius = 2131165288;
- // aapt resource value: 0x7f080080
- public const int design_snackbar_elevation = 2131230848;
+ // aapt resource value: 0x7F070069
+ public const int design_snackbar_elevation = 2131165289;
- // aapt resource value: 0x7f080064
- public const int design_snackbar_extra_spacing_horizontal = 2131230820;
+ // aapt resource value: 0x7F07006A
+ public const int design_snackbar_extra_spacing_horizontal = 2131165290;
- // aapt resource value: 0x7f080065
- public const int design_snackbar_max_width = 2131230821;
+ // aapt resource value: 0x7F07006B
+ public const int design_snackbar_max_width = 2131165291;
- // aapt resource value: 0x7f080066
- public const int design_snackbar_min_width = 2131230822;
+ // aapt resource value: 0x7F07006C
+ public const int design_snackbar_min_width = 2131165292;
- // aapt resource value: 0x7f080081
- public const int design_snackbar_padding_horizontal = 2131230849;
+ // aapt resource value: 0x7F07006D
+ public const int design_snackbar_padding_horizontal = 2131165293;
- // aapt resource value: 0x7f080082
- public const int design_snackbar_padding_vertical = 2131230850;
+ // aapt resource value: 0x7F07006E
+ public const int design_snackbar_padding_vertical = 2131165294;
- // aapt resource value: 0x7f080067
- public const int design_snackbar_padding_vertical_2lines = 2131230823;
+ // aapt resource value: 0x7F07006F
+ public const int design_snackbar_padding_vertical_2lines = 2131165295;
- // aapt resource value: 0x7f080083
- public const int design_snackbar_text_size = 2131230851;
+ // aapt resource value: 0x7F070070
+ public const int design_snackbar_text_size = 2131165296;
- // aapt resource value: 0x7f080084
- public const int design_tab_max_width = 2131230852;
+ // aapt resource value: 0x7F070071
+ public const int design_tab_max_width = 2131165297;
- // aapt resource value: 0x7f080068
- public const int design_tab_scrollable_min_width = 2131230824;
+ // aapt resource value: 0x7F070072
+ public const int design_tab_scrollable_min_width = 2131165298;
- // aapt resource value: 0x7f080085
- public const int design_tab_text_size = 2131230853;
+ // aapt resource value: 0x7F070073
+ public const int design_tab_text_size = 2131165299;
- // aapt resource value: 0x7f080086
- public const int design_tab_text_size_2line = 2131230854;
+ // aapt resource value: 0x7F070074
+ public const int design_tab_text_size_2line = 2131165300;
- // aapt resource value: 0x7f080050
- public const int disabled_alpha_material_dark = 2131230800;
+ // aapt resource value: 0x7F070075
+ public const int disabled_alpha_material_dark = 2131165301;
- // aapt resource value: 0x7f080051
- public const int disabled_alpha_material_light = 2131230801;
+ // aapt resource value: 0x7F070076
+ public const int disabled_alpha_material_light = 2131165302;
- // aapt resource value: 0x7f080000
- public const int fastscroll_default_thickness = 2131230720;
+ // aapt resource value: 0x7F070077
+ public const int fastscroll_default_thickness = 2131165303;
- // aapt resource value: 0x7f080001
- public const int fastscroll_margin = 2131230721;
+ // aapt resource value: 0x7F070078
+ public const int fastscroll_margin = 2131165304;
- // aapt resource value: 0x7f080002
- public const int fastscroll_minimum_range = 2131230722;
+ // aapt resource value: 0x7F070079
+ public const int fastscroll_minimum_range = 2131165305;
- // aapt resource value: 0x7f08009c
- public const int fingerprint_icon_size = 2131230876;
+ // aapt resource value: 0x7F07007A
+ public const int fingerprint_icon_size = 2131165306;
- // aapt resource value: 0x7f08009b
- public const int fingerprint_status_layout_margin_vertical = 2131230875;
+ // aapt resource value: 0x7F07007B
+ public const int fingerprint_status_layout_margin_vertical = 2131165307;
- // aapt resource value: 0x7f080052
- public const int highlight_alpha_material_colored = 2131230802;
+ // aapt resource value: 0x7F07007C
+ public const int highlight_alpha_material_colored = 2131165308;
- // aapt resource value: 0x7f080053
- public const int highlight_alpha_material_dark = 2131230803;
+ // aapt resource value: 0x7F07007D
+ public const int highlight_alpha_material_dark = 2131165309;
- // aapt resource value: 0x7f080054
- public const int highlight_alpha_material_light = 2131230804;
+ // aapt resource value: 0x7F07007E
+ public const int highlight_alpha_material_light = 2131165310;
- // aapt resource value: 0x7f080055
- public const int hint_alpha_material_dark = 2131230805;
+ // aapt resource value: 0x7F07007F
+ public const int hint_alpha_material_dark = 2131165311;
- // aapt resource value: 0x7f080056
- public const int hint_alpha_material_light = 2131230806;
+ // aapt resource value: 0x7F070080
+ public const int hint_alpha_material_light = 2131165312;
- // aapt resource value: 0x7f080057
- public const int hint_pressed_alpha_material_dark = 2131230807;
+ // aapt resource value: 0x7F070081
+ public const int hint_pressed_alpha_material_dark = 2131165313;
- // aapt resource value: 0x7f080058
- public const int hint_pressed_alpha_material_light = 2131230808;
+ // aapt resource value: 0x7F070082
+ public const int hint_pressed_alpha_material_light = 2131165314;
- // aapt resource value: 0x7f080003
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
+ // aapt resource value: 0x7F070083
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
- // aapt resource value: 0x7f080004
- public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
+ // aapt resource value: 0x7F070084
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
- // aapt resource value: 0x7f080005
- public const int item_touch_helper_swipe_escape_velocity = 2131230725;
+ // aapt resource value: 0x7F070085
+ public const int item_touch_helper_swipe_escape_velocity = 2131165317;
- // aapt resource value: 0x7f080090
- public const int notification_action_icon_size = 2131230864;
+ // aapt resource value: 0x7F070086
+ public const int notification_action_icon_size = 2131165318;
- // aapt resource value: 0x7f080091
- public const int notification_action_text_size = 2131230865;
+ // aapt resource value: 0x7F070087
+ public const int notification_action_text_size = 2131165319;
- // aapt resource value: 0x7f080092
- public const int notification_big_circle_margin = 2131230866;
+ // aapt resource value: 0x7F070088
+ public const int notification_big_circle_margin = 2131165320;
- // aapt resource value: 0x7f080088
- public const int notification_content_margin_start = 2131230856;
+ // aapt resource value: 0x7F070089
+ public const int notification_content_margin_start = 2131165321;
- // aapt resource value: 0x7f080093
- public const int notification_large_icon_height = 2131230867;
+ // aapt resource value: 0x7F07008A
+ public const int notification_large_icon_height = 2131165322;
- // aapt resource value: 0x7f080094
- public const int notification_large_icon_width = 2131230868;
+ // aapt resource value: 0x7F07008B
+ public const int notification_large_icon_width = 2131165323;
- // aapt resource value: 0x7f080089
- public const int notification_main_column_padding_top = 2131230857;
+ // aapt resource value: 0x7F07008C
+ public const int notification_main_column_padding_top = 2131165324;
- // aapt resource value: 0x7f08008a
- public const int notification_media_narrow_margin = 2131230858;
+ // aapt resource value: 0x7F07008D
+ public const int notification_media_narrow_margin = 2131165325;
- // aapt resource value: 0x7f080095
- public const int notification_right_icon_size = 2131230869;
+ // aapt resource value: 0x7F07008E
+ public const int notification_right_icon_size = 2131165326;
- // aapt resource value: 0x7f080087
- public const int notification_right_side_padding_top = 2131230855;
+ // aapt resource value: 0x7F07008F
+ public const int notification_right_side_padding_top = 2131165327;
- // aapt resource value: 0x7f080096
- public const int notification_small_icon_background_padding = 2131230870;
+ // aapt resource value: 0x7F070090
+ public const int notification_small_icon_background_padding = 2131165328;
- // aapt resource value: 0x7f080097
- public const int notification_small_icon_size_as_large = 2131230871;
+ // aapt resource value: 0x7F070091
+ public const int notification_small_icon_size_as_large = 2131165329;
- // aapt resource value: 0x7f080098
- public const int notification_subtext_size = 2131230872;
+ // aapt resource value: 0x7F070092
+ public const int notification_subtext_size = 2131165330;
- // aapt resource value: 0x7f080099
- public const int notification_top_pad = 2131230873;
+ // aapt resource value: 0x7F070093
+ public const int notification_top_pad = 2131165331;
- // aapt resource value: 0x7f08009a
- public const int notification_top_pad_large_text = 2131230874;
+ // aapt resource value: 0x7F070094
+ public const int notification_top_pad_large_text = 2131165332;
- // aapt resource value: 0x7f08009d
- public const int pickerview_textsize = 2131230877;
+ // aapt resource value: 0x7F070095
+ public const int pickerview_textsize = 2131165333;
- // aapt resource value: 0x7f08009e
- public const int pickerview_topbar_btn_textsize = 2131230878;
+ // aapt resource value: 0x7F070096
+ public const int pickerview_topbar_btn_textsize = 2131165334;
- // aapt resource value: 0x7f08009f
- public const int pickerview_topbar_height = 2131230879;
+ // aapt resource value: 0x7F070097
+ public const int pickerview_topbar_height = 2131165335;
- // aapt resource value: 0x7f0800a0
- public const int pickerview_topbar_padding = 2131230880;
+ // aapt resource value: 0x7F070098
+ public const int pickerview_topbar_padding = 2131165336;
- // aapt resource value: 0x7f0800a1
- public const int pickerview_topbar_title_textsize = 2131230881;
+ // aapt resource value: 0x7F070099
+ public const int pickerview_topbar_title_textsize = 2131165337;
- // aapt resource value: 0x7f080059
- public const int tooltip_corner_radius = 2131230809;
+ // aapt resource value: 0x7F07009A
+ public const int tooltip_corner_radius = 2131165338;
- // aapt resource value: 0x7f08005a
- public const int tooltip_horizontal_padding = 2131230810;
+ // aapt resource value: 0x7F07009B
+ public const int tooltip_horizontal_padding = 2131165339;
- // aapt resource value: 0x7f08005b
- public const int tooltip_margin = 2131230811;
+ // aapt resource value: 0x7F07009C
+ public const int tooltip_margin = 2131165340;
- // aapt resource value: 0x7f08005c
- public const int tooltip_precise_anchor_extra_offset = 2131230812;
+ // aapt resource value: 0x7F07009D
+ public const int tooltip_precise_anchor_extra_offset = 2131165341;
- // aapt resource value: 0x7f08005d
- public const int tooltip_precise_anchor_threshold = 2131230813;
+ // aapt resource value: 0x7F07009E
+ public const int tooltip_precise_anchor_threshold = 2131165342;
- // aapt resource value: 0x7f08005e
- public const int tooltip_vertical_padding = 2131230814;
+ // aapt resource value: 0x7F07009F
+ public const int tooltip_vertical_padding = 2131165343;
- // aapt resource value: 0x7f08005f
- public const int tooltip_y_offset_non_touch = 2131230815;
+ // aapt resource value: 0x7F0700A0
+ public const int tooltip_y_offset_non_touch = 2131165344;
- // aapt resource value: 0x7f080060
- public const int tooltip_y_offset_touch = 2131230816;
+ // aapt resource value: 0x7F0700A1
+ public const int tooltip_y_offset_touch = 2131165345;
static Dimension()
{
@@ -2525,497 +2527,479 @@
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+ // aapt resource value: 0x7F080006
+ public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
- // aapt resource value: 0x7f020001
- public const int abc_action_bar_item_background_material = 2130837505;
+ // aapt resource value: 0x7F080007
+ public const int abc_action_bar_item_background_material = 2131230727;
- // aapt resource value: 0x7f020002
- public const int abc_btn_borderless_material = 2130837506;
+ // aapt resource value: 0x7F080008
+ public const int abc_btn_borderless_material = 2131230728;
- // aapt resource value: 0x7f020003
- public const int abc_btn_check_material = 2130837507;
+ // aapt resource value: 0x7F080009
+ public const int abc_btn_check_material = 2131230729;
- // aapt resource value: 0x7f020004
- public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+ // aapt resource value: 0x7F08000A
+ public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
- // aapt resource value: 0x7f020005
- public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+ // aapt resource value: 0x7F08000B
+ public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
- // aapt resource value: 0x7f020006
- public const int abc_btn_colored_material = 2130837510;
+ // aapt resource value: 0x7F08000C
+ public const int abc_btn_colored_material = 2131230732;
- // aapt resource value: 0x7f020007
- public const int abc_btn_default_mtrl_shape = 2130837511;
+ // aapt resource value: 0x7F08000D
+ public const int abc_btn_default_mtrl_shape = 2131230733;
- // aapt resource value: 0x7f020008
- public const int abc_btn_radio_material = 2130837512;
+ // aapt resource value: 0x7F08000E
+ public const int abc_btn_radio_material = 2131230734;
- // aapt resource value: 0x7f020009
- public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+ // aapt resource value: 0x7F08000F
+ public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
- // aapt resource value: 0x7f02000a
- public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+ // aapt resource value: 0x7F080010
+ public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
- // aapt resource value: 0x7f02000b
- public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+ // aapt resource value: 0x7F080011
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
- // aapt resource value: 0x7f02000c
- public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+ // aapt resource value: 0x7F080012
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
- // aapt resource value: 0x7f02000d
- public const int abc_cab_background_internal_bg = 2130837517;
+ // aapt resource value: 0x7F080013
+ public const int abc_cab_background_internal_bg = 2131230739;
- // aapt resource value: 0x7f02000e
- public const int abc_cab_background_top_material = 2130837518;
+ // aapt resource value: 0x7F080014
+ public const int abc_cab_background_top_material = 2131230740;
- // aapt resource value: 0x7f02000f
- public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+ // aapt resource value: 0x7F080015
+ public const int abc_cab_background_top_mtrl_alpha = 2131230741;
- // aapt resource value: 0x7f020010
- public const int abc_control_background_material = 2130837520;
+ // aapt resource value: 0x7F080016
+ public const int abc_control_background_material = 2131230742;
- // aapt resource value: 0x7f020011
- public const int abc_dialog_material_background = 2130837521;
+ // aapt resource value: 0x7F080017
+ public const int abc_dialog_material_background = 2131230743;
- // aapt resource value: 0x7f020012
- public const int abc_edit_text_material = 2130837522;
+ // aapt resource value: 0x7F080018
+ public const int abc_edit_text_material = 2131230744;
- // aapt resource value: 0x7f020013
- public const int abc_ic_ab_back_material = 2130837523;
+ // aapt resource value: 0x7F080019
+ public const int abc_ic_ab_back_material = 2131230745;
- // aapt resource value: 0x7f020014
- public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+ // aapt resource value: 0x7F08001A
+ public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
- // aapt resource value: 0x7f020015
- public const int abc_ic_clear_material = 2130837525;
+ // aapt resource value: 0x7F08001B
+ public const int abc_ic_clear_material = 2131230747;
- // aapt resource value: 0x7f020016
- public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+ // aapt resource value: 0x7F08001C
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
- // aapt resource value: 0x7f020017
- public const int abc_ic_go_search_api_material = 2130837527;
+ // aapt resource value: 0x7F08001D
+ public const int abc_ic_go_search_api_material = 2131230749;
- // aapt resource value: 0x7f020018
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+ // aapt resource value: 0x7F08001E
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
- // aapt resource value: 0x7f020019
- public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+ // aapt resource value: 0x7F08001F
+ public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
- // aapt resource value: 0x7f02001a
- public const int abc_ic_menu_overflow_material = 2130837530;
+ // aapt resource value: 0x7F080020
+ public const int abc_ic_menu_overflow_material = 2131230752;
- // aapt resource value: 0x7f02001b
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+ // aapt resource value: 0x7F080021
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
- // aapt resource value: 0x7f02001c
- public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+ // aapt resource value: 0x7F080022
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
- // aapt resource value: 0x7f02001d
- public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+ // aapt resource value: 0x7F080023
+ public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
- // aapt resource value: 0x7f02001e
- public const int abc_ic_search_api_material = 2130837534;
+ // aapt resource value: 0x7F080024
+ public const int abc_ic_search_api_material = 2131230756;
- // aapt resource value: 0x7f02001f
- public const int abc_ic_star_black_16dp = 2130837535;
+ // aapt resource value: 0x7F080025
+ public const int abc_ic_star_black_16dp = 2131230757;
- // aapt resource value: 0x7f020020
- public const int abc_ic_star_black_36dp = 2130837536;
+ // aapt resource value: 0x7F080026
+ public const int abc_ic_star_black_36dp = 2131230758;
- // aapt resource value: 0x7f020021
- public const int abc_ic_star_black_48dp = 2130837537;
+ // aapt resource value: 0x7F080027
+ public const int abc_ic_star_black_48dp = 2131230759;
- // aapt resource value: 0x7f020022
- public const int abc_ic_star_half_black_16dp = 2130837538;
+ // aapt resource value: 0x7F080028
+ public const int abc_ic_star_half_black_16dp = 2131230760;
- // aapt resource value: 0x7f020023
- public const int abc_ic_star_half_black_36dp = 2130837539;
+ // aapt resource value: 0x7F080029
+ public const int abc_ic_star_half_black_36dp = 2131230761;
- // aapt resource value: 0x7f020024
- public const int abc_ic_star_half_black_48dp = 2130837540;
+ // aapt resource value: 0x7F08002A
+ public const int abc_ic_star_half_black_48dp = 2131230762;
- // aapt resource value: 0x7f020025
- public const int abc_ic_voice_search_api_material = 2130837541;
+ // aapt resource value: 0x7F08002B
+ public const int abc_ic_voice_search_api_material = 2131230763;
- // aapt resource value: 0x7f020026
- public const int abc_item_background_holo_dark = 2130837542;
+ // aapt resource value: 0x7F08002C
+ public const int abc_item_background_holo_dark = 2131230764;
- // aapt resource value: 0x7f020027
- public const int abc_item_background_holo_light = 2130837543;
+ // aapt resource value: 0x7F08002D
+ public const int abc_item_background_holo_light = 2131230765;
- // aapt resource value: 0x7f020028
- public const int abc_list_divider_mtrl_alpha = 2130837544;
+ // aapt resource value: 0x7F08002E
+ public const int abc_list_divider_mtrl_alpha = 2131230766;
- // aapt resource value: 0x7f020029
- public const int abc_list_focused_holo = 2130837545;
+ // aapt resource value: 0x7F08002F
+ public const int abc_list_focused_holo = 2131230767;
- // aapt resource value: 0x7f02002a
- public const int abc_list_longpressed_holo = 2130837546;
+ // aapt resource value: 0x7F080030
+ public const int abc_list_longpressed_holo = 2131230768;
- // aapt resource value: 0x7f02002b
- public const int abc_list_pressed_holo_dark = 2130837547;
+ // aapt resource value: 0x7F080031
+ public const int abc_list_pressed_holo_dark = 2131230769;
- // aapt resource value: 0x7f02002c
- public const int abc_list_pressed_holo_light = 2130837548;
+ // aapt resource value: 0x7F080032
+ public const int abc_list_pressed_holo_light = 2131230770;
- // aapt resource value: 0x7f02002d
- public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+ // aapt resource value: 0x7F080033
+ public const int abc_list_selector_background_transition_holo_dark = 2131230771;
- // aapt resource value: 0x7f02002e
- public const int abc_list_selector_background_transition_holo_light = 2130837550;
+ // aapt resource value: 0x7F080034
+ public const int abc_list_selector_background_transition_holo_light = 2131230772;
- // aapt resource value: 0x7f02002f
- public const int abc_list_selector_disabled_holo_dark = 2130837551;
+ // aapt resource value: 0x7F080035
+ public const int abc_list_selector_disabled_holo_dark = 2131230773;
- // aapt resource value: 0x7f020030
- public const int abc_list_selector_disabled_holo_light = 2130837552;
+ // aapt resource value: 0x7F080036
+ public const int abc_list_selector_disabled_holo_light = 2131230774;
- // aapt resource value: 0x7f020031
- public const int abc_list_selector_holo_dark = 2130837553;
+ // aapt resource value: 0x7F080037
+ public const int abc_list_selector_holo_dark = 2131230775;
- // aapt resource value: 0x7f020032
- public const int abc_list_selector_holo_light = 2130837554;
+ // aapt resource value: 0x7F080038
+ public const int abc_list_selector_holo_light = 2131230776;
- // aapt resource value: 0x7f020033
- public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+ // aapt resource value: 0x7F080039
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
- // aapt resource value: 0x7f020034
- public const int abc_popup_background_mtrl_mult = 2130837556;
+ // aapt resource value: 0x7F08003A
+ public const int abc_popup_background_mtrl_mult = 2131230778;
- // aapt resource value: 0x7f020035
- public const int abc_ratingbar_indicator_material = 2130837557;
+ // aapt resource value: 0x7F08003B
+ public const int abc_ratingbar_indicator_material = 2131230779;
- // aapt resource value: 0x7f020036
- public const int abc_ratingbar_material = 2130837558;
+ // aapt resource value: 0x7F08003C
+ public const int abc_ratingbar_material = 2131230780;
- // aapt resource value: 0x7f020037
- public const int abc_ratingbar_small_material = 2130837559;
+ // aapt resource value: 0x7F08003D
+ public const int abc_ratingbar_small_material = 2131230781;
- // aapt resource value: 0x7f020038
- public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+ // aapt resource value: 0x7F08003E
+ public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
- // aapt resource value: 0x7f020039
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+ // aapt resource value: 0x7F08003F
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
- // aapt resource value: 0x7f02003a
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+ // aapt resource value: 0x7F080040
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
- // aapt resource value: 0x7f02003b
- public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+ // aapt resource value: 0x7F080041
+ public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
- // aapt resource value: 0x7f02003c
- public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+ // aapt resource value: 0x7F080042
+ public const int abc_scrubber_track_mtrl_alpha = 2131230786;
- // aapt resource value: 0x7f02003d
- public const int abc_seekbar_thumb_material = 2130837565;
+ // aapt resource value: 0x7F080043
+ public const int abc_seekbar_thumb_material = 2131230787;
- // aapt resource value: 0x7f02003e
- public const int abc_seekbar_tick_mark_material = 2130837566;
+ // aapt resource value: 0x7F080044
+ public const int abc_seekbar_tick_mark_material = 2131230788;
- // aapt resource value: 0x7f02003f
- public const int abc_seekbar_track_material = 2130837567;
+ // aapt resource value: 0x7F080045
+ public const int abc_seekbar_track_material = 2131230789;
- // aapt resource value: 0x7f020040
- public const int abc_spinner_mtrl_am_alpha = 2130837568;
+ // aapt resource value: 0x7F080046
+ public const int abc_spinner_mtrl_am_alpha = 2131230790;
- // aapt resource value: 0x7f020041
- public const int abc_spinner_textfield_background_material = 2130837569;
+ // aapt resource value: 0x7F080047
+ public const int abc_spinner_textfield_background_material = 2131230791;
- // aapt resource value: 0x7f020042
- public const int abc_switch_thumb_material = 2130837570;
+ // aapt resource value: 0x7F080048
+ public const int abc_switch_thumb_material = 2131230792;
- // aapt resource value: 0x7f020043
- public const int abc_switch_track_mtrl_alpha = 2130837571;
+ // aapt resource value: 0x7F080049
+ public const int abc_switch_track_mtrl_alpha = 2131230793;
- // aapt resource value: 0x7f020044
- public const int abc_tab_indicator_material = 2130837572;
+ // aapt resource value: 0x7F08004A
+ public const int abc_tab_indicator_material = 2131230794;
- // aapt resource value: 0x7f020045
- public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+ // aapt resource value: 0x7F08004B
+ public const int abc_tab_indicator_mtrl_alpha = 2131230795;
- // aapt resource value: 0x7f020046
- public const int abc_text_cursor_material = 2130837574;
+ // aapt resource value: 0x7F080053
+ public const int abc_textfield_activated_mtrl_alpha = 2131230803;
- // aapt resource value: 0x7f020047
- public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+ // aapt resource value: 0x7F080054
+ public const int abc_textfield_default_mtrl_alpha = 2131230804;
- // aapt resource value: 0x7f020048
- public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+ // aapt resource value: 0x7F080055
+ public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
- // aapt resource value: 0x7f020049
- public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+ // aapt resource value: 0x7F080056
+ public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
- // aapt resource value: 0x7f02004a
- public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+ // aapt resource value: 0x7F080057
+ public const int abc_textfield_search_material = 2131230807;
- // aapt resource value: 0x7f02004b
- public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
+ // aapt resource value: 0x7F08004C
+ public const int abc_text_cursor_material = 2131230796;
- // aapt resource value: 0x7f02004c
- public const int abc_text_select_handle_right_mtrl_light = 2130837580;
+ // aapt resource value: 0x7F08004D
+ public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
- // aapt resource value: 0x7f02004d
- public const int abc_textfield_activated_mtrl_alpha = 2130837581;
+ // aapt resource value: 0x7F08004E
+ public const int abc_text_select_handle_left_mtrl_light = 2131230798;
- // aapt resource value: 0x7f02004e
- public const int abc_textfield_default_mtrl_alpha = 2130837582;
+ // aapt resource value: 0x7F08004F
+ public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
- // aapt resource value: 0x7f02004f
- public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
+ // aapt resource value: 0x7F080050
+ public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
- // aapt resource value: 0x7f020050
- public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
+ // aapt resource value: 0x7F080051
+ public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
- // aapt resource value: 0x7f020051
- public const int abc_textfield_search_material = 2130837585;
-
- // aapt resource value: 0x7f020052
- public const int abc_vector_test = 2130837586;
-
- // aapt resource value: 0x7f020053
- public const int avd_hide_password = 2130837587;
-
- // aapt resource value: 0x7f02009e
- public const int avd_hide_password_1 = 2130837662;
-
- // aapt resource value: 0x7f02009f
- public const int avd_hide_password_2 = 2130837663;
-
- // aapt resource value: 0x7f0200a0
- public const int avd_hide_password_3 = 2130837664;
-
- // aapt resource value: 0x7f020054
- public const int avd_show_password = 2130837588;
+ // aapt resource value: 0x7F080052
+ public const int abc_text_select_handle_right_mtrl_light = 2131230802;
- // aapt resource value: 0x7f0200a1
- public const int avd_show_password_1 = 2130837665;
+ // aapt resource value: 0x7F080058
+ public const int abc_vector_test = 2131230808;
- // aapt resource value: 0x7f0200a2
- public const int avd_show_password_2 = 2130837666;
+ // aapt resource value: 0x7F080059
+ public const int avd_hide_password = 2131230809;
- // aapt resource value: 0x7f0200a3
- public const int avd_show_password_3 = 2130837667;
+ // aapt resource value: 0x7F08005A
+ public const int avd_show_password = 2131230810;
- // aapt resource value: 0x7f020055
- public const int design_bottom_navigation_item_background = 2130837589;
+ // aapt resource value: 0x7F08005B
+ public const int design_bottom_navigation_item_background = 2131230811;
- // aapt resource value: 0x7f020056
- public const int design_fab_background = 2130837590;
+ // aapt resource value: 0x7F08005C
+ public const int design_fab_background = 2131230812;
- // aapt resource value: 0x7f020057
- public const int design_ic_visibility = 2130837591;
+ // aapt resource value: 0x7F08005D
+ public const int design_ic_visibility = 2131230813;
- // aapt resource value: 0x7f020058
- public const int design_ic_visibility_off = 2130837592;
+ // aapt resource value: 0x7F08005E
+ public const int design_ic_visibility_off = 2131230814;
- // aapt resource value: 0x7f020059
- public const int design_password_eye = 2130837593;
+ // aapt resource value: 0x7F08005F
+ public const int design_password_eye = 2131230815;
- // aapt resource value: 0x7f02005a
- public const int design_snackbar_background = 2130837594;
+ // aapt resource value: 0x7F080060
+ public const int design_snackbar_background = 2131230816;
- // aapt resource value: 0x7f02005b
- public const int fingerprint_draw_off = 2130837595;
+ // aapt resource value: 0x7F080061
+ public const int fingerprint_draw_off = 2131230817;
- // aapt resource value: 0x7f02005c
- public const int fingerprint_draw_off_animation = 2130837596;
+ // aapt resource value: 0x7F080062
+ public const int fingerprint_draw_off_animation = 2131230818;
- // aapt resource value: 0x7f02005d
- public const int fingerprint_draw_on = 2130837597;
+ // aapt resource value: 0x7F080063
+ public const int fingerprint_draw_on = 2131230819;
- // aapt resource value: 0x7f02005e
- public const int fingerprint_draw_on_animation = 2130837598;
+ // aapt resource value: 0x7F080064
+ public const int fingerprint_draw_on_animation = 2131230820;
- // aapt resource value: 0x7f02005f
- public const int fingerprint_error = 2130837599;
+ // aapt resource value: 0x7F080065
+ public const int fingerprint_error = 2131230821;
- // aapt resource value: 0x7f020060
- public const int fingerprint_error_off = 2130837600;
+ // aapt resource value: 0x7F080066
+ public const int fingerprint_error_off = 2131230822;
- // aapt resource value: 0x7f020061
- public const int fingerprint_error_off_animation = 2130837601;
+ // aapt resource value: 0x7F080067
+ public const int fingerprint_error_off_animation = 2131230823;
- // aapt resource value: 0x7f020062
- public const int fingerprint_error_on = 2130837602;
+ // aapt resource value: 0x7F080068
+ public const int fingerprint_error_on = 2131230824;
- // aapt resource value: 0x7f020063
- public const int fingerprint_error_on_animation = 2130837603;
+ // aapt resource value: 0x7F080069
+ public const int fingerprint_error_on_animation = 2131230825;
- // aapt resource value: 0x7f020064
- public const int fingerprint_error_state_to_fp = 2130837604;
+ // aapt resource value: 0x7F08006A
+ public const int fingerprint_error_state_to_fp = 2131230826;
- // aapt resource value: 0x7f020065
- public const int fingerprint_error_state_to_fp_animation = 2130837605;
+ // aapt resource value: 0x7F08006B
+ public const int fingerprint_error_state_to_fp_animation = 2131230827;
- // aapt resource value: 0x7f020066
- public const int fingerprint_fingerprint = 2130837606;
+ // aapt resource value: 0x7F08006C
+ public const int fingerprint_fingerprint = 2131230828;
- // aapt resource value: 0x7f020067
- public const int fingerprint_fp_to_error_state = 2130837607;
+ // aapt resource value: 0x7F08006D
+ public const int fingerprint_fp_to_error_state = 2131230829;
- // aapt resource value: 0x7f020068
- public const int fingerprint_fp_to_error_state_animation = 2130837608;
+ // aapt resource value: 0x7F08006E
+ public const int fingerprint_fp_to_error_state_animation = 2131230830;
- // aapt resource value: 0x7f020069
- public const int gd_btn_shape_app_b = 2130837609;
+ // aapt resource value: 0x7F08006F
+ public const int gd_btn_shape_app_b = 2131230831;
- // aapt resource value: 0x7f02006a
- public const int gd_btn_shape_app_g = 2130837610;
+ // aapt resource value: 0x7F080070
+ public const int gd_btn_shape_app_g = 2131230832;
- // aapt resource value: 0x7f02006b
- public const int gd_btn_shape_app_w = 2130837611;
+ // aapt resource value: 0x7F080071
+ public const int gd_btn_shape_app_w = 2131230833;
- // aapt resource value: 0x7f02006c
- public const int gd_btn_shape_shadow_w = 2130837612;
+ // aapt resource value: 0x7F080072
+ public const int gd_btn_shape_shadow_w = 2131230834;
- // aapt resource value: 0x7f02006d
- public const int gd_click_effect_select = 2130837613;
+ // aapt resource value: 0x7F080073
+ public const int gd_click_effect_select = 2131230835;
- // aapt resource value: 0x7f02006e
- public const int ic_gdmap_add = 2130837614;
+ // aapt resource value: 0x7F080092
+ public const int Icon = 2131230866;
- // aapt resource value: 0x7f02006f
- public const int ic_gdmap_back = 2130837615;
+ // aapt resource value: 0x7F080074
+ public const int ic_gdmap_add = 2131230836;
- // aapt resource value: 0x7f020070
- public const int ic_gdmap_delete = 2130837616;
+ // aapt resource value: 0x7F080075
+ public const int ic_gdmap_back = 2131230837;
- // aapt resource value: 0x7f020071
- public const int ic_gdmap_home = 2130837617;
+ // aapt resource value: 0x7F080076
+ public const int ic_gdmap_delete = 2131230838;
- // aapt resource value: 0x7f020072
- public const int ic_gdmap_mylocation = 2130837618;
+ // aapt resource value: 0x7F080077
+ public const int ic_gdmap_home = 2131230839;
- // aapt resource value: 0x7f020073
- public const int ic_gdmap_now = 2130837619;
+ // aapt resource value: 0x7F080078
+ public const int ic_gdmap_mylocation = 2131230840;
- // aapt resource value: 0x7f020074
- public const int ic_gdmap_search = 2130837620;
+ // aapt resource value: 0x7F080079
+ public const int ic_gdmap_now = 2131230841;
- // aapt resource value: 0x7f020075
- public const int ic_gdmap_zoom_out = 2130837621;
+ // aapt resource value: 0x7F08007A
+ public const int ic_gdmap_search = 2131230842;
- // aapt resource value: 0x7f020076
- public const int ic_gps_point = 2130837622;
+ // aapt resource value: 0x7F08007B
+ public const int ic_gdmap_zoom_out = 2131230843;
- // aapt resource value: 0x7f020077
- public const int ic_wd_arc_scale_bg = 2130837623;
+ // aapt resource value: 0x7F08007C
+ public const int ic_gps_point = 2131230844;
- // aapt resource value: 0x7f020078
- public const int ic_wd_curtain_bg_top = 2130837624;
+ // aapt resource value: 0x7F08007D
+ public const int ic_wd_arc_scale_bg = 2131230845;
- // aapt resource value: 0x7f020079
- public const int ic_wd_curtain_h_bg = 2130837625;
+ // aapt resource value: 0x7F08007E
+ public const int ic_wd_curtain_bg_top = 2131230846;
- // aapt resource value: 0x7f02007a
- public const int ic_wd_curtain_h_open = 2130837626;
+ // aapt resource value: 0x7F08007F
+ public const int ic_wd_curtain_h_bg = 2131230847;
- // aapt resource value: 0x7f02007b
- public const int ic_wd_curtain_h_progress = 2130837627;
+ // aapt resource value: 0x7F080080
+ public const int ic_wd_curtain_h_open = 2131230848;
- // aapt resource value: 0x7f02007c
- public const int ic_wd_curtain_h_top = 2130837628;
+ // aapt resource value: 0x7F080081
+ public const int ic_wd_curtain_h_progress = 2131230849;
- // aapt resource value: 0x7f02007d
- public const int ic_wd_curtain_open = 2130837629;
+ // aapt resource value: 0x7F080082
+ public const int ic_wd_curtain_h_top = 2131230850;
- // aapt resource value: 0x7f02007e
- public const int ic_wd_curtain_roll_bg = 2130837630;
+ // aapt resource value: 0x7F080083
+ public const int ic_wd_curtain_open = 2131230851;
- // aapt resource value: 0x7f02007f
- public const int ic_wd_curtain_roll_progress = 2130837631;
+ // aapt resource value: 0x7F080084
+ public const int ic_wd_curtain_roll_bg = 2131230852;
- // aapt resource value: 0x7f020080
- public const int ic_wd_on_curtain_blinds_progress = 2130837632;
+ // aapt resource value: 0x7F080085
+ public const int ic_wd_curtain_roll_progress = 2131230853;
- // aapt resource value: 0x7f020081
- public const int ic_wd_on_curtain_blinds_progress2 = 2130837633;
+ // aapt resource value: 0x7F080086
+ public const int ic_wd_on_curtain_blinds_progress = 2131230854;
- // aapt resource value: 0x7f020082
- public const int ic_wd_on_curtain_blinds_progress_close = 2130837634;
+ // aapt resource value: 0x7F080087
+ public const int ic_wd_on_curtain_blinds_progress2 = 2131230855;
- // aapt resource value: 0x7f020083
- public const int ic_wd_on_curtain_blinds_progress_close2 = 2130837635;
+ // aapt resource value: 0x7F080088
+ public const int ic_wd_on_curtain_blinds_progress_close = 2131230856;
- // aapt resource value: 0x7f020084
- public const int ic_wd_on_curtain_h_bg = 2130837636;
+ // aapt resource value: 0x7F080089
+ public const int ic_wd_on_curtain_blinds_progress_close2 = 2131230857;
- // aapt resource value: 0x7f020085
- public const int ic_wd_on_curtain_h_open = 2130837637;
+ // aapt resource value: 0x7F08008A
+ public const int ic_wd_on_curtain_h_bg = 2131230858;
- // aapt resource value: 0x7f020086
- public const int ic_wd_on_curtain_h_progress = 2130837638;
+ // aapt resource value: 0x7F08008B
+ public const int ic_wd_on_curtain_h_open = 2131230859;
- // aapt resource value: 0x7f020087
- public const int ic_wd_on_curtain_h_progress_close = 2130837639;
+ // aapt resource value: 0x7F08008C
+ public const int ic_wd_on_curtain_h_progress = 2131230860;
- // aapt resource value: 0x7f020088
- public const int ic_wd_on_curtain_open = 2130837640;
+ // aapt resource value: 0x7F08008D
+ public const int ic_wd_on_curtain_h_progress_close = 2131230861;
- // aapt resource value: 0x7f020089
- public const int ic_wd_on_curtain_roll_bg = 2130837641;
+ // aapt resource value: 0x7F08008E
+ public const int ic_wd_on_curtain_open = 2131230862;
- // aapt resource value: 0x7f02008a
- public const int ic_wd_on_curtain_roll_progress = 2130837642;
+ // aapt resource value: 0x7F08008F
+ public const int ic_wd_on_curtain_roll_bg = 2131230863;
- // aapt resource value: 0x7f02008b
- public const int ic_wd_on_curtain_roll_progress_close = 2130837643;
+ // aapt resource value: 0x7F080090
+ public const int ic_wd_on_curtain_roll_progress = 2131230864;
- // aapt resource value: 0x7f02008c
- public const int Icon = 2130837644;
+ // aapt resource value: 0x7F080091
+ public const int ic_wd_on_curtain_roll_progress_close = 2131230865;
- // aapt resource value: 0x7f02008d
- public const int Loading = 2130837645;
+ // aapt resource value: 0x7F080093
+ public const int Loading = 2131230867;
- // aapt resource value: 0x7f02008e
- public const int navigation_empty_icon = 2130837646;
+ // aapt resource value: 0x7F080094
+ public const int navigation_empty_icon = 2131230868;
- // aapt resource value: 0x7f02008f
- public const int notification_action_background = 2130837647;
+ // aapt resource value: 0x7F080095
+ public const int notification_action_background = 2131230869;
- // aapt resource value: 0x7f020090
- public const int notification_bg = 2130837648;
+ // aapt resource value: 0x7F080096
+ public const int notification_bg = 2131230870;
- // aapt resource value: 0x7f020091
- public const int notification_bg_low = 2130837649;
+ // aapt resource value: 0x7F080097
+ public const int notification_bg_low = 2131230871;
- // aapt resource value: 0x7f020092
- public const int notification_bg_low_normal = 2130837650;
+ // aapt resource value: 0x7F080098
+ public const int notification_bg_low_normal = 2131230872;
- // aapt resource value: 0x7f020093
- public const int notification_bg_low_pressed = 2130837651;
+ // aapt resource value: 0x7F080099
+ public const int notification_bg_low_pressed = 2131230873;
- // aapt resource value: 0x7f020094
- public const int notification_bg_normal = 2130837652;
+ // aapt resource value: 0x7F08009A
+ public const int notification_bg_normal = 2131230874;
- // aapt resource value: 0x7f020095
- public const int notification_bg_normal_pressed = 2130837653;
+ // aapt resource value: 0x7F08009B
+ public const int notification_bg_normal_pressed = 2131230875;
- // aapt resource value: 0x7f020096
- public const int notification_icon_background = 2130837654;
+ // aapt resource value: 0x7F08009C
+ public const int notification_icon_background = 2131230876;
- // aapt resource value: 0x7f02009c
- public const int notification_template_icon_bg = 2130837660;
+ // aapt resource value: 0x7F08009D
+ public const int notification_template_icon_bg = 2131230877;
- // aapt resource value: 0x7f02009d
- public const int notification_template_icon_low_bg = 2130837661;
+ // aapt resource value: 0x7F08009E
+ public const int notification_template_icon_low_bg = 2131230878;
- // aapt resource value: 0x7f020097
- public const int notification_tile_bg = 2130837655;
+ // aapt resource value: 0x7F08009F
+ public const int notification_tile_bg = 2131230879;
- // aapt resource value: 0x7f020098
- public const int notify_panel_notification_icon_bg = 2130837656;
+ // aapt resource value: 0x7F0800A0
+ public const int notify_panel_notification_icon_bg = 2131230880;
- // aapt resource value: 0x7f020099
- public const int selector_pickerview_btn = 2130837657;
+ // aapt resource value: 0x7F0800A1
+ public const int selector_pickerview_btn = 2131230881;
- // aapt resource value: 0x7f02009a
- public const int tooltip_frame_dark = 2130837658;
+ // aapt resource value: 0x7F0800A2
+ public const int tooltip_frame_dark = 2131230882;
- // aapt resource value: 0x7f02009b
- public const int tooltip_frame_light = 2130837659;
+ // aapt resource value: 0x7F0800A3
+ public const int tooltip_frame_light = 2131230883;
static Drawable()
{
@@ -3030,662 +3014,698 @@
public partial class Id
{
- // aapt resource value: 0x7f090027
- public const int ALT = 2131296295;
+ // aapt resource value: 0x7F090015
+ public const int action0 = 2131296277;
- // aapt resource value: 0x7f090028
- public const int CTRL = 2131296296;
+ // aapt resource value: 0x7F090027
+ public const int actions = 2131296295;
- // aapt resource value: 0x7f090054
- public const int FILL = 2131296340;
+ // aapt resource value: 0x7F090016
+ public const int action_bar = 2131296278;
- // aapt resource value: 0x7f090055
- public const int FILL_STROKE = 2131296341;
+ // aapt resource value: 0x7F090017
+ public const int action_bar_activity_content = 2131296279;
- // aapt resource value: 0x7f090029
- public const int FUNCTION = 2131296297;
+ // aapt resource value: 0x7F090018
+ public const int action_bar_container = 2131296280;
- // aapt resource value: 0x7f09004f
- public const int FixedBehind = 2131296335;
+ // aapt resource value: 0x7F090019
+ public const int action_bar_root = 2131296281;
- // aapt resource value: 0x7f090050
- public const int FixedFront = 2131296336;
+ // aapt resource value: 0x7F09001A
+ public const int action_bar_spinner = 2131296282;
- // aapt resource value: 0x7f09002a
- public const int META = 2131296298;
+ // aapt resource value: 0x7F09001B
+ public const int action_bar_subtitle = 2131296283;
- // aapt resource value: 0x7f090051
- public const int MatchLayout = 2131296337;
+ // aapt resource value: 0x7F09001C
+ public const int action_bar_title = 2131296284;
- // aapt resource value: 0x7f09002b
- public const int SHIFT = 2131296299;
+ // aapt resource value: 0x7F09001D
+ public const int action_container = 2131296285;
- // aapt resource value: 0x7f090056
- public const int STROKE = 2131296342;
+ // aapt resource value: 0x7F09001E
+ public const int action_context_bar = 2131296286;
- // aapt resource value: 0x7f09002c
- public const int SYM = 2131296300;
+ // aapt resource value: 0x7F09001F
+ public const int action_divider = 2131296287;
- // aapt resource value: 0x7f090052
- public const int Scale = 2131296338;
+ // aapt resource value: 0x7F090020
+ public const int action_image = 2131296288;
- // aapt resource value: 0x7f090053
- public const int Translate = 2131296339;
+ // aapt resource value: 0x7F090021
+ public const int action_menu_divider = 2131296289;
- // aapt resource value: 0x7f0900c0
- public const int action0 = 2131296448;
+ // aapt resource value: 0x7F090022
+ public const int action_menu_presenter = 2131296290;
- // aapt resource value: 0x7f090079
- public const int action_bar = 2131296377;
+ // aapt resource value: 0x7F090023
+ public const int action_mode_bar = 2131296291;
- // aapt resource value: 0x7f090001
- public const int action_bar_activity_content = 2131296257;
+ // aapt resource value: 0x7F090024
+ public const int action_mode_bar_stub = 2131296292;
- // aapt resource value: 0x7f090078
- public const int action_bar_container = 2131296376;
+ // aapt resource value: 0x7F090025
+ public const int action_mode_close_button = 2131296293;
- // aapt resource value: 0x7f090074
- public const int action_bar_root = 2131296372;
+ // aapt resource value: 0x7F090026
+ public const int action_text = 2131296294;
- // aapt resource value: 0x7f090002
- public const int action_bar_spinner = 2131296258;
+ // aapt resource value: 0x7F090028
+ public const int activity_chooser_view_content = 2131296296;
- // aapt resource value: 0x7f090058
- public const int action_bar_subtitle = 2131296344;
+ // aapt resource value: 0x7F090029
+ public const int add = 2131296297;
- // aapt resource value: 0x7f090057
- public const int action_bar_title = 2131296343;
+ // aapt resource value: 0x7F09002A
+ public const int alertTitle = 2131296298;
- // aapt resource value: 0x7f0900bd
- public const int action_container = 2131296445;
+ // aapt resource value: 0x7F09002B
+ public const int all = 2131296299;
- // aapt resource value: 0x7f09007a
- public const int action_context_bar = 2131296378;
+ // aapt resource value: 0x7F090000
+ public const int ALT = 2131296256;
- // aapt resource value: 0x7f0900c4
- public const int action_divider = 2131296452;
+ // aapt resource value: 0x7F09002C
+ public const int always = 2131296300;
- // aapt resource value: 0x7f0900be
- public const int action_image = 2131296446;
+ // aapt resource value: 0x7F09002D
+ public const int async = 2131296301;
- // aapt resource value: 0x7f090003
- public const int action_menu_divider = 2131296259;
+ // aapt resource value: 0x7F09002E
+ public const int auto = 2131296302;
- // aapt resource value: 0x7f090004
- public const int action_menu_presenter = 2131296260;
+ // aapt resource value: 0x7F09002F
+ public const int beginning = 2131296303;
- // aapt resource value: 0x7f090076
- public const int action_mode_bar = 2131296374;
+ // aapt resource value: 0x7F090030
+ public const int blocking = 2131296304;
- // aapt resource value: 0x7f090075
- public const int action_mode_bar_stub = 2131296373;
+ // aapt resource value: 0x7F090031
+ public const int bottom = 2131296305;
- // aapt resource value: 0x7f090059
- public const int action_mode_close_button = 2131296345;
+ // aapt resource value: 0x7F090032
+ public const int btnCancel = 2131296306;
- // aapt resource value: 0x7f0900bf
- public const int action_text = 2131296447;
+ // aapt resource value: 0x7F090033
+ public const int btnSubmit = 2131296307;
- // aapt resource value: 0x7f0900cd
- public const int actions = 2131296461;
+ // aapt resource value: 0x7F090034
+ public const int buttonPanel = 2131296308;
- // aapt resource value: 0x7f09005a
- public const int activity_chooser_view_content = 2131296346;
+ // aapt resource value: 0x7F090035
+ public const int cancel_action = 2131296309;
- // aapt resource value: 0x7f090021
- public const int add = 2131296289;
+ // aapt resource value: 0x7F090036
+ public const int center = 2131296310;
- // aapt resource value: 0x7f09006d
- public const int alertTitle = 2131296365;
+ // aapt resource value: 0x7F090037
+ public const int center_horizontal = 2131296311;
- // aapt resource value: 0x7f090047
- public const int all = 2131296327;
+ // aapt resource value: 0x7F090038
+ public const int center_vertical = 2131296312;
- // aapt resource value: 0x7f09002d
- public const int always = 2131296301;
+ // aapt resource value: 0x7F090039
+ public const int checkbox = 2131296313;
- // aapt resource value: 0x7f09004b
- public const int async = 2131296331;
+ // aapt resource value: 0x7F09003A
+ public const int chronometer = 2131296314;
- // aapt resource value: 0x7f090039
- public const int auto = 2131296313;
+ // aapt resource value: 0x7F09003B
+ public const int clip_horizontal = 2131296315;
- // aapt resource value: 0x7f090024
- public const int beginning = 2131296292;
+ // aapt resource value: 0x7F09003C
+ public const int clip_vertical = 2131296316;
- // aapt resource value: 0x7f09004c
- public const int blocking = 2131296332;
+ // aapt resource value: 0x7F09003D
+ public const int collapseActionView = 2131296317;
- // aapt resource value: 0x7f090032
- public const int bottom = 2131296306;
+ // aapt resource value: 0x7F09003E
+ public const int container = 2131296318;
- // aapt resource value: 0x7f0900a8
- public const int btnCancel = 2131296424;
+ // aapt resource value: 0x7F09003F
+ public const int contentFrame = 2131296319;
- // aapt resource value: 0x7f0900aa
- public const int btnSubmit = 2131296426;
+ // aapt resource value: 0x7F090040
+ public const int contentPanel = 2131296320;
- // aapt resource value: 0x7f090060
- public const int buttonPanel = 2131296352;
+ // aapt resource value: 0x7F090041
+ public const int content_container = 2131296321;
- // aapt resource value: 0x7f0900c1
- public const int cancel_action = 2131296449;
+ // aapt resource value: 0x7F090042
+ public const int coordinator = 2131296322;
- // aapt resource value: 0x7f09003a
- public const int center = 2131296314;
+ // aapt resource value: 0x7F090001
+ public const int CTRL = 2131296257;
- // aapt resource value: 0x7f09003b
- public const int center_horizontal = 2131296315;
+ // aapt resource value: 0x7F090002
+ public const int Custom = 2131296258;
- // aapt resource value: 0x7f09003c
- public const int center_vertical = 2131296316;
+ // aapt resource value: 0x7F090043
+ public const int custom = 2131296323;
- // aapt resource value: 0x7f090070
- public const int checkbox = 2131296368;
+ // aapt resource value: 0x7F090003
+ public const int CustomLabel = 2131296259;
- // aapt resource value: 0x7f0900c9
- public const int chronometer = 2131296457;
+ // aapt resource value: 0x7F090044
+ public const int customPanel = 2131296324;
- // aapt resource value: 0x7f090043
- public const int clip_horizontal = 2131296323;
+ // aapt resource value: 0x7F090045
+ public const int day = 2131296325;
- // aapt resource value: 0x7f090044
- public const int clip_vertical = 2131296324;
+ // aapt resource value: 0x7F090046
+ public const int decor_content_parent = 2131296326;
- // aapt resource value: 0x7f09002e
- public const int collapseActionView = 2131296302;
+ // aapt resource value: 0x7F090047
+ public const int default_activity_button = 2131296327;
- // aapt resource value: 0x7f09008e
- public const int container = 2131296398;
+ // aapt resource value: 0x7F090048
+ public const int description = 2131296328;
- // aapt resource value: 0x7f090063
- public const int contentPanel = 2131296355;
+ // aapt resource value: 0x7F090049
+ public const int design_bottom_sheet = 2131296329;
- // aapt resource value: 0x7f0900ac
- public const int content_container = 2131296428;
+ // aapt resource value: 0x7F09004A
+ public const int design_menu_item_action_area = 2131296330;
- // aapt resource value: 0x7f09008f
- public const int coordinator = 2131296399;
+ // aapt resource value: 0x7F09004B
+ public const int design_menu_item_action_area_stub = 2131296331;
- // aapt resource value: 0x7f09006a
- public const int custom = 2131296362;
+ // aapt resource value: 0x7F09004C
+ public const int design_menu_item_text = 2131296332;
- // aapt resource value: 0x7f090069
- public const int customPanel = 2131296361;
+ // aapt resource value: 0x7F09004D
+ public const int design_navigation_view = 2131296333;
- // aapt resource value: 0x7f0900b8
- public const int day = 2131296440;
+ // aapt resource value: 0x7F09004E
+ public const int disableHome = 2131296334;
- // aapt resource value: 0x7f090077
- public const int decor_content_parent = 2131296375;
+ // aapt resource value: 0x7F09004F
+ public const int edit_query = 2131296335;
- // aapt resource value: 0x7f09005d
- public const int default_activity_button = 2131296349;
+ // aapt resource value: 0x7F090050
+ public const int end = 2131296336;
- // aapt resource value: 0x7f090089
- public const int description = 2131296393;
+ // aapt resource value: 0x7F090051
+ public const int end_padder = 2131296337;
- // aapt resource value: 0x7f090091
- public const int design_bottom_sheet = 2131296401;
+ // aapt resource value: 0x7F090052
+ public const int enterAlways = 2131296338;
- // aapt resource value: 0x7f090098
- public const int design_menu_item_action_area = 2131296408;
+ // aapt resource value: 0x7F090053
+ public const int enterAlwaysCollapsed = 2131296339;
- // aapt resource value: 0x7f090097
- public const int design_menu_item_action_area_stub = 2131296407;
+ // aapt resource value: 0x7F090054
+ public const int exitUntilCollapsed = 2131296340;
- // aapt resource value: 0x7f090096
- public const int design_menu_item_text = 2131296406;
+ // aapt resource value: 0x7F090056
+ public const int expanded_menu = 2131296342;
- // aapt resource value: 0x7f090095
- public const int design_navigation_view = 2131296405;
+ // aapt resource value: 0x7F090055
+ public const int expand_activities_button = 2131296341;
- // aapt resource value: 0x7f090015
- public const int disableHome = 2131296277;
+ // aapt resource value: 0x7F090057
+ public const int fill = 2131296343;
- // aapt resource value: 0x7f09007b
- public const int edit_query = 2131296379;
+ // aapt resource value: 0x7F090004
+ public const int FILL = 2131296260;
- // aapt resource value: 0x7f090025
- public const int end = 2131296293;
+ // aapt resource value: 0x7F090058
+ public const int fill_horizontal = 2131296344;
- // aapt resource value: 0x7f0900cf
- public const int end_padder = 2131296463;
+ // aapt resource value: 0x7F090005
+ public const int FILL_STROKE = 2131296261;
- // aapt resource value: 0x7f090034
- public const int enterAlways = 2131296308;
+ // aapt resource value: 0x7F090059
+ public const int fill_vertical = 2131296345;
- // aapt resource value: 0x7f090035
- public const int enterAlwaysCollapsed = 2131296309;
+ // aapt resource value: 0x7F09005A
+ public const int fingerprint_icon = 2131296346;
- // aapt resource value: 0x7f090036
- public const int exitUntilCollapsed = 2131296310;
+ // aapt resource value: 0x7F09005B
+ public const int @fixed = 2131296347;
- // aapt resource value: 0x7f09005b
- public const int expand_activities_button = 2131296347;
+ // aapt resource value: 0x7F090007
+ public const int FixedBehind = 2131296263;
- // aapt resource value: 0x7f09006f
- public const int expanded_menu = 2131296367;
+ // aapt resource value: 0x7F090008
+ public const int FixedFront = 2131296264;
- // aapt resource value: 0x7f090045
- public const int fill = 2131296325;
+ // aapt resource value: 0x7F09005C
+ public const int forever = 2131296348;
- // aapt resource value: 0x7f090046
- public const int fill_horizontal = 2131296326;
+ // aapt resource value: 0x7F090006
+ public const int FUNCTION = 2131296262;
- // aapt resource value: 0x7f09003d
- public const int fill_vertical = 2131296317;
+ // aapt resource value: 0x7F09005D
+ public const int gd_btn_back = 2131296349;
- // aapt resource value: 0x7f09008a
- public const int fingerprint_icon = 2131296394;
+ // aapt resource value: 0x7F09005E
+ public const int gd_btn_myLocation = 2131296350;
- // aapt resource value: 0x7f090049
- public const int @fixed = 2131296329;
+ // aapt resource value: 0x7F09005F
+ public const int gd_btn_save = 2131296351;
- // aapt resource value: 0x7f09004d
- public const int forever = 2131296333;
+ // aapt resource value: 0x7F090060
+ public const int gd_img_search_delete = 2131296352;
- // aapt resource value: 0x7f09009d
- public const int gd_btn_back = 2131296413;
+ // aapt resource value: 0x7F090061
+ public const int gd_ll_myhome = 2131296353;
- // aapt resource value: 0x7f0900a6
- public const int gd_btn_myLocation = 2131296422;
+ // aapt resource value: 0x7F090062
+ public const int gd_ll_search = 2131296354;
- // aapt resource value: 0x7f0900a5
- public const int gd_btn_save = 2131296421;
+ // aapt resource value: 0x7F090063
+ public const int gd_mapView = 2131296355;
- // aapt resource value: 0x7f0900a2
- public const int gd_img_search_delete = 2131296418;
+ // aapt resource value: 0x7F090064
+ public const int gd_rl_topview = 2131296356;
- // aapt resource value: 0x7f0900a4
- public const int gd_ll_myhome = 2131296420;
+ // aapt resource value: 0x7F090065
+ public const int gd_tv_activity_title = 2131296357;
- // aapt resource value: 0x7f0900a0
- public const int gd_ll_search = 2131296416;
+ // aapt resource value: 0x7F090066
+ public const int gd_tv_radius = 2131296358;
- // aapt resource value: 0x7f09009f
- public const int gd_mapView = 2131296415;
+ // aapt resource value: 0x7F090067
+ public const int gd_tv_search_title = 2131296359;
- // aapt resource value: 0x7f09009c
- public const int gd_rl_topview = 2131296412;
+ // aapt resource value: 0x7F090068
+ public const int hdl_gallery_rootView = 2131296360;
- // aapt resource value: 0x7f09009e
- public const int gd_tv_activity_title = 2131296414;
+ // aapt resource value: 0x7F090069
+ public const int hdl_gallery_viewPager = 2131296361;
- // aapt resource value: 0x7f0900a3
- public const int gd_tv_radius = 2131296419;
+ // aapt resource value: 0x7F09006A
+ public const int hdl_options1 = 2131296362;
- // aapt resource value: 0x7f0900a1
- public const int gd_tv_search_title = 2131296417;
+ // aapt resource value: 0x7F09006B
+ public const int hdl_options2 = 2131296363;
- // aapt resource value: 0x7f09009a
- public const int hdl_gallery_rootView = 2131296410;
+ // aapt resource value: 0x7F09006C
+ public const int hdl_options3 = 2131296364;
- // aapt resource value: 0x7f09009b
- public const int hdl_gallery_viewPager = 2131296411;
+ // aapt resource value: 0x7F09006D
+ public const int hdl_pickerview_ll = 2131296365;
- // aapt resource value: 0x7f0900ae
- public const int hdl_options1 = 2131296430;
+ // aapt resource value: 0x7F09006E
+ public const int home = 2131296366;
- // aapt resource value: 0x7f0900af
- public const int hdl_options2 = 2131296431;
+ // aapt resource value: 0x7F09006F
+ public const int homeAsUp = 2131296367;
- // aapt resource value: 0x7f0900b0
- public const int hdl_options3 = 2131296432;
+ // aapt resource value: 0x7F090070
+ public const int hour = 2131296368;
- // aapt resource value: 0x7f0900ad
- public const int hdl_pickerview_ll = 2131296429;
+ // aapt resource value: 0x7F090071
+ public const int icon = 2131296369;
- // aapt resource value: 0x7f090005
- public const int home = 2131296261;
+ // aapt resource value: 0x7F090072
+ public const int icon_group = 2131296370;
- // aapt resource value: 0x7f090016
- public const int homeAsUp = 2131296278;
+ // aapt resource value: 0x7F090073
+ public const int ifRoom = 2131296371;
- // aapt resource value: 0x7f0900b9
- public const int hour = 2131296441;
+ // aapt resource value: 0x7F090074
+ public const int image = 2131296372;
- // aapt resource value: 0x7f09005f
- public const int icon = 2131296351;
+ // aapt resource value: 0x7F090075
+ public const int info = 2131296373;
+
+ // aapt resource value: 0x7F090076
+ public const int italic = 2131296374;
+
+ // aapt resource value: 0x7F090077
+ public const int item_touch_helper_previous_elevation = 2131296375;
+
+ // aapt resource value: 0x7F090078
+ public const int largeLabel = 2131296376;
+
+ // aapt resource value: 0x7F090079
+ public const int left = 2131296377;
+
+ // aapt resource value: 0x7F09007A
+ public const int line1 = 2131296378;
+
+ // aapt resource value: 0x7F09007B
+ public const int line3 = 2131296379;
+
+ // aapt resource value: 0x7F09007C
+ public const int listMode = 2131296380;
+
+ // aapt resource value: 0x7F09007D
+ public const int list_item = 2131296381;
+
+ // aapt resource value: 0x7F09007E
+ public const int masked = 2131296382;
+
+ // aapt resource value: 0x7F09000A
+ public const int MatchLayout = 2131296266;
+
+ // aapt resource value: 0x7F09007F
+ public const int media_actions = 2131296383;
+
+ // aapt resource value: 0x7F090080
+ public const int message = 2131296384;
- // aapt resource value: 0x7f0900ce
- public const int icon_group = 2131296462;
+ // aapt resource value: 0x7F090009
+ public const int META = 2131296265;
- // aapt resource value: 0x7f09002f
- public const int ifRoom = 2131296303;
+ // aapt resource value: 0x7F090081
+ public const int middle = 2131296385;
- // aapt resource value: 0x7f09005c
- public const int image = 2131296348;
+ // aapt resource value: 0x7F090082
+ public const int min = 2131296386;
- // aapt resource value: 0x7f0900ca
- public const int info = 2131296458;
+ // aapt resource value: 0x7F090083
+ public const int mini = 2131296387;
- // aapt resource value: 0x7f09004e
- public const int italic = 2131296334;
+ // aapt resource value: 0x7F090084
+ public const int month = 2131296388;
- // aapt resource value: 0x7f090000
- public const int item_touch_helper_previous_elevation = 2131296256;
+ // aapt resource value: 0x7F090085
+ public const int multiply = 2131296389;
- // aapt resource value: 0x7f09008d
- public const int largeLabel = 2131296397;
+ // aapt resource value: 0x7F090086
+ public const int myButton = 2131296390;
- // aapt resource value: 0x7f09003e
- public const int left = 2131296318;
+ // aapt resource value: 0x7F090087
+ public const int navigation_header_container = 2131296391;
- // aapt resource value: 0x7f09000d
- public const int line1 = 2131296269;
+ // aapt resource value: 0x7F090088
+ public const int never = 2131296392;
- // aapt resource value: 0x7f09000e
- public const int line3 = 2131296270;
+ // aapt resource value: 0x7F090089
+ public const int none = 2131296393;
- // aapt resource value: 0x7f090012
- public const int listMode = 2131296274;
+ // aapt resource value: 0x7F09008A
+ public const int normal = 2131296394;
- // aapt resource value: 0x7f09005e
- public const int list_item = 2131296350;
+ // aapt resource value: 0x7F09000B
+ public const int Notice = 2131296267;
- // aapt resource value: 0x7f0900da
- public const int masked = 2131296474;
+ // aapt resource value: 0x7F09008B
+ public const int notification_background = 2131296395;
- // aapt resource value: 0x7f0900c3
- public const int media_actions = 2131296451;
+ // aapt resource value: 0x7F09008C
+ public const int notification_main_column = 2131296396;
- // aapt resource value: 0x7f0900d5
- public const int message = 2131296469;
+ // aapt resource value: 0x7F09008D
+ public const int notification_main_column_container = 2131296397;
- // aapt resource value: 0x7f090026
- public const int middle = 2131296294;
+ // aapt resource value: 0x7F09008E
+ public const int options1 = 2131296398;
- // aapt resource value: 0x7f0900ba
- public const int min = 2131296442;
+ // aapt resource value: 0x7F09008F
+ public const int options2 = 2131296399;
- // aapt resource value: 0x7f090048
- public const int mini = 2131296328;
+ // aapt resource value: 0x7F090090
+ public const int options3 = 2131296400;
- // aapt resource value: 0x7f0900b7
- public const int month = 2131296439;
+ // aapt resource value: 0x7F090091
+ public const int optionspicker = 2131296401;
- // aapt resource value: 0x7f09001c
- public const int multiply = 2131296284;
+ // aapt resource value: 0x7F090092
+ public const int outmost_container = 2131296402;
- // aapt resource value: 0x7f0900bc
- public const int myButton = 2131296444;
+ // aapt resource value: 0x7F090093
+ public const int parallax = 2131296403;
- // aapt resource value: 0x7f090094
- public const int navigation_header_container = 2131296404;
+ // aapt resource value: 0x7F090094
+ public const int parentPanel = 2131296404;
- // aapt resource value: 0x7f090030
- public const int never = 2131296304;
+ // aapt resource value: 0x7F09000C
+ public const int Password = 2131296268;
- // aapt resource value: 0x7f090017
- public const int none = 2131296279;
+ // aapt resource value: 0x7F09000D
+ public const int PasswordLabel = 2131296269;
- // aapt resource value: 0x7f090013
- public const int normal = 2131296275;
+ // aapt resource value: 0x7F090095
+ public const int pin = 2131296405;
- // aapt resource value: 0x7f0900cc
- public const int notification_background = 2131296460;
+ // aapt resource value: 0x7F090096
+ public const int progress_circular = 2131296406;
- // aapt resource value: 0x7f0900c6
- public const int notification_main_column = 2131296454;
+ // aapt resource value: 0x7F090097
+ public const int progress_horizontal = 2131296407;
- // aapt resource value: 0x7f0900c5
- public const int notification_main_column_container = 2131296453;
+ // aapt resource value: 0x7F090098
+ public const int radio = 2131296408;
- // aapt resource value: 0x7f0900b2
- public const int options1 = 2131296434;
+ // aapt resource value: 0x7F090099
+ public const int right = 2131296409;
- // aapt resource value: 0x7f0900b3
- public const int options2 = 2131296435;
+ // aapt resource value: 0x7F09009A
+ public const int right_icon = 2131296410;
- // aapt resource value: 0x7f0900b4
- public const int options3 = 2131296436;
+ // aapt resource value: 0x7F09009B
+ public const int right_side = 2131296411;
- // aapt resource value: 0x7f0900b1
- public const int optionspicker = 2131296433;
+ // aapt resource value: 0x7F09009C
+ public const int rv_topbar = 2131296412;
- // aapt resource value: 0x7f0900ab
- public const int outmost_container = 2131296427;
+ // aapt resource value: 0x7F090013
+ public const int Scale = 2131296275;
- // aapt resource value: 0x7f090041
- public const int parallax = 2131296321;
+ // aapt resource value: 0x7F09009D
+ public const int screen = 2131296413;
- // aapt resource value: 0x7f090062
- public const int parentPanel = 2131296354;
+ // aapt resource value: 0x7F09009E
+ public const int scroll = 2131296414;
- // aapt resource value: 0x7f090042
- public const int pin = 2131296322;
+ // aapt resource value: 0x7F0900A2
+ public const int scrollable = 2131296418;
- // aapt resource value: 0x7f090006
- public const int progress_circular = 2131296262;
+ // aapt resource value: 0x7F09009F
+ public const int scrollIndicatorDown = 2131296415;
- // aapt resource value: 0x7f090007
- public const int progress_horizontal = 2131296263;
+ // aapt resource value: 0x7F0900A0
+ public const int scrollIndicatorUp = 2131296416;
- // aapt resource value: 0x7f090072
- public const int radio = 2131296370;
+ // aapt resource value: 0x7F0900A1
+ public const int scrollView = 2131296417;
- // aapt resource value: 0x7f09003f
- public const int right = 2131296319;
+ // aapt resource value: 0x7F0900A3
+ public const int search_badge = 2131296419;
- // aapt resource value: 0x7f0900cb
- public const int right_icon = 2131296459;
+ // aapt resource value: 0x7F0900A4
+ public const int search_bar = 2131296420;
- // aapt resource value: 0x7f0900c7
- public const int right_side = 2131296455;
+ // aapt resource value: 0x7F0900A5
+ public const int search_button = 2131296421;
- // aapt resource value: 0x7f0900a7
- public const int rv_topbar = 2131296423;
+ // aapt resource value: 0x7F0900A6
+ public const int search_close_btn = 2131296422;
- // aapt resource value: 0x7f09001d
- public const int screen = 2131296285;
+ // aapt resource value: 0x7F0900A7
+ public const int search_edit_frame = 2131296423;
- // aapt resource value: 0x7f090037
- public const int scroll = 2131296311;
+ // aapt resource value: 0x7F0900A8
+ public const int search_go_btn = 2131296424;
- // aapt resource value: 0x7f090068
- public const int scrollIndicatorDown = 2131296360;
+ // aapt resource value: 0x7F0900A9
+ public const int search_mag_icon = 2131296425;
- // aapt resource value: 0x7f090064
- public const int scrollIndicatorUp = 2131296356;
+ // aapt resource value: 0x7F0900AA
+ public const int search_plate = 2131296426;
- // aapt resource value: 0x7f090065
- public const int scrollView = 2131296357;
+ // aapt resource value: 0x7F0900AB
+ public const int search_src_text = 2131296427;
- // aapt resource value: 0x7f09004a
- public const int scrollable = 2131296330;
+ // aapt resource value: 0x7F0900AC
+ public const int search_voice_btn = 2131296428;
- // aapt resource value: 0x7f09007d
- public const int search_badge = 2131296381;
+ // aapt resource value: 0x7F0900AD
+ public const int second = 2131296429;
- // aapt resource value: 0x7f09007c
- public const int search_bar = 2131296380;
+ // aapt resource value: 0x7F0900AE
+ public const int select_dialog_listview = 2131296430;
- // aapt resource value: 0x7f09007e
- public const int search_button = 2131296382;
+ // aapt resource value: 0x7F09000E
+ public const int SHIFT = 2131296270;
- // aapt resource value: 0x7f090083
- public const int search_close_btn = 2131296387;
+ // aapt resource value: 0x7F0900AF
+ public const int shortcut = 2131296431;
- // aapt resource value: 0x7f09007f
- public const int search_edit_frame = 2131296383;
+ // aapt resource value: 0x7F0900B0
+ public const int showCustom = 2131296432;
- // aapt resource value: 0x7f090085
- public const int search_go_btn = 2131296389;
+ // aapt resource value: 0x7F0900B1
+ public const int showHome = 2131296433;
- // aapt resource value: 0x7f090080
- public const int search_mag_icon = 2131296384;
+ // aapt resource value: 0x7F0900B2
+ public const int showTitle = 2131296434;
- // aapt resource value: 0x7f090081
- public const int search_plate = 2131296385;
+ // aapt resource value: 0x7F0900B3
+ public const int smallLabel = 2131296435;
- // aapt resource value: 0x7f090082
- public const int search_src_text = 2131296386;
+ // aapt resource value: 0x7F0900B4
+ public const int snackbar_action = 2131296436;
- // aapt resource value: 0x7f090086
- public const int search_voice_btn = 2131296390;
+ // aapt resource value: 0x7F0900B5
+ public const int snackbar_text = 2131296437;
- // aapt resource value: 0x7f0900bb
- public const int second = 2131296443;
+ // aapt resource value: 0x7F0900B6
+ public const int snap = 2131296438;
- // aapt resource value: 0x7f090087
- public const int select_dialog_listview = 2131296391;
+ // aapt resource value: 0x7F0900B7
+ public const int spacer = 2131296439;
- // aapt resource value: 0x7f090071
- public const int shortcut = 2131296369;
+ // aapt resource value: 0x7F0900B8
+ public const int split_action_bar = 2131296440;
- // aapt resource value: 0x7f090018
- public const int showCustom = 2131296280;
+ // aapt resource value: 0x7F0900B9
+ public const int src_atop = 2131296441;
- // aapt resource value: 0x7f090019
- public const int showHome = 2131296281;
+ // aapt resource value: 0x7F0900BA
+ public const int src_in = 2131296442;
- // aapt resource value: 0x7f09001a
- public const int showTitle = 2131296282;
+ // aapt resource value: 0x7F0900BB
+ public const int src_over = 2131296443;
- // aapt resource value: 0x7f09008c
- public const int smallLabel = 2131296396;
+ // aapt resource value: 0x7F0900BC
+ public const int srl_classics_arrow = 2131296444;
- // aapt resource value: 0x7f090093
- public const int snackbar_action = 2131296403;
+ // aapt resource value: 0x7F0900BD
+ public const int srl_classics_center = 2131296445;
- // aapt resource value: 0x7f090092
- public const int snackbar_text = 2131296402;
+ // aapt resource value: 0x7F0900BE
+ public const int srl_classics_progress = 2131296446;
- // aapt resource value: 0x7f090038
- public const int snap = 2131296312;
+ // aapt resource value: 0x7F0900BF
+ public const int srl_classics_title = 2131296447;
- // aapt resource value: 0x7f090061
- public const int spacer = 2131296353;
+ // aapt resource value: 0x7F0900C0
+ public const int srl_classics_update = 2131296448;
- // aapt resource value: 0x7f090008
- public const int split_action_bar = 2131296264;
+ // aapt resource value: 0x7F09000F
+ public const int SSID = 2131296271;
- // aapt resource value: 0x7f09001e
- public const int src_atop = 2131296286;
+ // aapt resource value: 0x7F090010
+ public const int SSIDLabel = 2131296272;
- // aapt resource value: 0x7f09001f
- public const int src_in = 2131296287;
+ // aapt resource value: 0x7F0900C1
+ public const int start = 2131296449;
- // aapt resource value: 0x7f090020
- public const int src_over = 2131296288;
+ // aapt resource value: 0x7F0900C2
+ public const int startV1 = 2131296450;
- // aapt resource value: 0x7f0900d0
- public const int srl_classics_arrow = 2131296464;
+ // aapt resource value: 0x7F0900C3
+ public const int startV1V4 = 2131296451;
- // aapt resource value: 0x7f0900d3
- public const int srl_classics_center = 2131296467;
+ // aapt resource value: 0x7F0900C4
+ public const int startV4 = 2131296452;
- // aapt resource value: 0x7f0900d2
- public const int srl_classics_progress = 2131296466;
+ // aapt resource value: 0x7F0900C5
+ public const int status = 2131296453;
- // aapt resource value: 0x7f0900d1
- public const int srl_classics_title = 2131296465;
+ // aapt resource value: 0x7F0900C6
+ public const int status_bar_latest_event_content = 2131296454;
- // aapt resource value: 0x7f0900d4
- public const int srl_classics_update = 2131296468;
+ // aapt resource value: 0x7F0900C7
+ public const int stop = 2131296455;
- // aapt resource value: 0x7f090040
- public const int start = 2131296320;
+ // aapt resource value: 0x7F090011
+ public const int STROKE = 2131296273;
- // aapt resource value: 0x7f09008b
- public const int status = 2131296395;
+ // aapt resource value: 0x7F0900C8
+ public const int submenuarrow = 2131296456;
- // aapt resource value: 0x7f0900c2
- public const int status_bar_latest_event_content = 2131296450;
+ // aapt resource value: 0x7F0900C9
+ public const int submit_area = 2131296457;
- // aapt resource value: 0x7f090073
- public const int submenuarrow = 2131296371;
+ // aapt resource value: 0x7F0900CA
+ public const int subtitle = 2131296458;
- // aapt resource value: 0x7f090084
- public const int submit_area = 2131296388;
+ // aapt resource value: 0x7F090012
+ public const int SYM = 2131296274;
- // aapt resource value: 0x7f090088
- public const int subtitle = 2131296392;
+ // aapt resource value: 0x7F0900CB
+ public const int tabMode = 2131296459;
- // aapt resource value: 0x7f090014
- public const int tabMode = 2131296276;
+ // aapt resource value: 0x7F0900CC
+ public const int text = 2131296460;
- // aapt resource value: 0x7f09000f
- public const int text = 2131296271;
+ // aapt resource value: 0x7F0900CD
+ public const int text2 = 2131296461;
- // aapt resource value: 0x7f090010
- public const int text2 = 2131296272;
+ // aapt resource value: 0x7F0900D1
+ public const int textinput_counter = 2131296465;
- // aapt resource value: 0x7f090067
- public const int textSpacerNoButtons = 2131296359;
+ // aapt resource value: 0x7F0900D2
+ public const int textinput_error = 2131296466;
- // aapt resource value: 0x7f090066
- public const int textSpacerNoTitle = 2131296358;
+ // aapt resource value: 0x7F0900CE
+ public const int textSpacerNoButtons = 2131296462;
- // aapt resource value: 0x7f090099
- public const int text_input_password_toggle = 2131296409;
+ // aapt resource value: 0x7F0900CF
+ public const int textSpacerNoTitle = 2131296463;
- // aapt resource value: 0x7f09000a
- public const int textinput_counter = 2131296266;
+ // aapt resource value: 0x7F0900D0
+ public const int text_input_password_toggle = 2131296464;
- // aapt resource value: 0x7f09000b
- public const int textinput_error = 2131296267;
+ // aapt resource value: 0x7F0900D3
+ public const int time = 2131296467;
- // aapt resource value: 0x7f0900c8
- public const int time = 2131296456;
+ // aapt resource value: 0x7F0900D4
+ public const int timepicker = 2131296468;
- // aapt resource value: 0x7f0900b5
- public const int timepicker = 2131296437;
+ // aapt resource value: 0x7F0900D5
+ public const int title = 2131296469;
- // aapt resource value: 0x7f090011
- public const int title = 2131296273;
+ // aapt resource value: 0x7F0900D6
+ public const int titleDividerNoCustom = 2131296470;
- // aapt resource value: 0x7f09006e
- public const int titleDividerNoCustom = 2131296366;
+ // aapt resource value: 0x7F0900D7
+ public const int title_template = 2131296471;
- // aapt resource value: 0x7f09006c
- public const int title_template = 2131296364;
+ // aapt resource value: 0x7F0900D8
+ public const int top = 2131296472;
- // aapt resource value: 0x7f090033
- public const int top = 2131296307;
+ // aapt resource value: 0x7F0900D9
+ public const int topPanel = 2131296473;
- // aapt resource value: 0x7f09006b
- public const int topPanel = 2131296363;
+ // aapt resource value: 0x7F0900DA
+ public const int touch_outside = 2131296474;
- // aapt resource value: 0x7f090090
- public const int touch_outside = 2131296400;
+ // aapt resource value: 0x7F090014
+ public const int Translate = 2131296276;
- // aapt resource value: 0x7f0900a9
- public const int tvTitle = 2131296425;
+ // aapt resource value: 0x7F0900DB
+ public const int tvTitle = 2131296475;
- // aapt resource value: 0x7f0900d7
- public const int tv_zxing_back = 2131296471;
+ // aapt resource value: 0x7F0900DC
+ public const int tv_zxing_back = 2131296476;
- // aapt resource value: 0x7f0900d8
- public const int tv_zxing_flash = 2131296472;
+ // aapt resource value: 0x7F0900DD
+ public const int tv_zxing_flash = 2131296477;
- // aapt resource value: 0x7f0900d6
- public const int tv_zxing_scan = 2131296470;
+ // aapt resource value: 0x7F0900DE
+ public const int tv_zxing_scan = 2131296478;
- // aapt resource value: 0x7f090022
- public const int uniform = 2131296290;
+ // aapt resource value: 0x7F0900DF
+ public const int uniform = 2131296479;
- // aapt resource value: 0x7f090009
- public const int up = 2131296265;
+ // aapt resource value: 0x7F0900E0
+ public const int up = 2131296480;
- // aapt resource value: 0x7f09001b
- public const int useLogo = 2131296283;
+ // aapt resource value: 0x7F0900E1
+ public const int useLogo = 2131296481;
- // aapt resource value: 0x7f09000c
- public const int view_offset_helper = 2131296268;
+ // aapt resource value: 0x7F0900E2
+ public const int view_offset_helper = 2131296482;
- // aapt resource value: 0x7f0900d9
- public const int visible = 2131296473;
+ // aapt resource value: 0x7F0900E3
+ public const int visible = 2131296483;
- // aapt resource value: 0x7f090031
- public const int withText = 2131296305;
+ // aapt resource value: 0x7F0900E4
+ public const int withText = 2131296484;
- // aapt resource value: 0x7f090023
- public const int wrap_content = 2131296291;
+ // aapt resource value: 0x7F0900E5
+ public const int wrap_content = 2131296485;
- // aapt resource value: 0x7f0900b6
- public const int year = 2131296438;
+ // aapt resource value: 0x7F0900E6
+ public const int year = 2131296486;
static Id()
{
@@ -3700,38 +3720,38 @@
public partial class Integer
{
- // aapt resource value: 0x7f0e0000
- public const int abc_config_activityDefaultDur = 2131623936;
+ // aapt resource value: 0x7F0A0000
+ public const int abc_config_activityDefaultDur = 2131361792;
- // aapt resource value: 0x7f0e0001
- public const int abc_config_activityShortDur = 2131623937;
+ // aapt resource value: 0x7F0A0001
+ public const int abc_config_activityShortDur = 2131361793;
- // aapt resource value: 0x7f0e000a
- public const int animation_default_duration = 2131623946;
+ // aapt resource value: 0x7F0A0002
+ public const int animation_default_duration = 2131361794;
- // aapt resource value: 0x7f0e0005
- public const int app_bar_elevation_anim_duration = 2131623941;
+ // aapt resource value: 0x7F0A0003
+ public const int app_bar_elevation_anim_duration = 2131361795;
- // aapt resource value: 0x7f0e0006
- public const int bottom_sheet_slide_duration = 2131623942;
+ // aapt resource value: 0x7F0A0004
+ public const int bottom_sheet_slide_duration = 2131361796;
- // aapt resource value: 0x7f0e0002
- public const int cancel_button_image_alpha = 2131623938;
+ // aapt resource value: 0x7F0A0005
+ public const int cancel_button_image_alpha = 2131361797;
- // aapt resource value: 0x7f0e0003
- public const int config_tooltipAnimTime = 2131623939;
+ // aapt resource value: 0x7F0A0006
+ public const int config_tooltipAnimTime = 2131361798;
- // aapt resource value: 0x7f0e0004
- public const int design_snackbar_text_max_lines = 2131623940;
+ // aapt resource value: 0x7F0A0007
+ public const int design_snackbar_text_max_lines = 2131361799;
- // aapt resource value: 0x7f0e0007
- public const int hide_password_duration = 2131623943;
+ // aapt resource value: 0x7F0A0008
+ public const int hide_password_duration = 2131361800;
- // aapt resource value: 0x7f0e0008
- public const int show_password_duration = 2131623944;
+ // aapt resource value: 0x7F0A0009
+ public const int show_password_duration = 2131361801;
- // aapt resource value: 0x7f0e0009
- public const int status_bar_notification_info_maxnum = 2131623945;
+ // aapt resource value: 0x7F0A000A
+ public const int status_bar_notification_info_maxnum = 2131361802;
static Integer()
{
@@ -3746,230 +3766,239 @@
public partial class Layout
{
- // aapt resource value: 0x7f040000
- public const int abc_action_bar_title_item = 2130968576;
+ // aapt resource value: 0x7F0B0000
+ public const int abc_action_bar_title_item = 2131427328;
- // aapt resource value: 0x7f040001
- public const int abc_action_bar_up_container = 2130968577;
+ // aapt resource value: 0x7F0B0001
+ public const int abc_action_bar_up_container = 2131427329;
- // aapt resource value: 0x7f040002
- public const int abc_action_bar_view_list_nav_layout = 2130968578;
+ // aapt resource value: 0x7F0B0002
+ public const int abc_action_bar_view_list_nav_layout = 2131427330;
- // aapt resource value: 0x7f040003
- public const int abc_action_menu_item_layout = 2130968579;
+ // aapt resource value: 0x7F0B0003
+ public const int abc_action_menu_item_layout = 2131427331;
- // aapt resource value: 0x7f040004
- public const int abc_action_menu_layout = 2130968580;
+ // aapt resource value: 0x7F0B0004
+ public const int abc_action_menu_layout = 2131427332;
- // aapt resource value: 0x7f040005
- public const int abc_action_mode_bar = 2130968581;
+ // aapt resource value: 0x7F0B0005
+ public const int abc_action_mode_bar = 2131427333;
- // aapt resource value: 0x7f040006
- public const int abc_action_mode_close_item_material = 2130968582;
+ // aapt resource value: 0x7F0B0006
+ public const int abc_action_mode_close_item_material = 2131427334;
- // aapt resource value: 0x7f040007
- public const int abc_activity_chooser_view = 2130968583;
+ // aapt resource value: 0x7F0B0007
+ public const int abc_activity_chooser_view = 2131427335;
- // aapt resource value: 0x7f040008
- public const int abc_activity_chooser_view_list_item = 2130968584;
+ // aapt resource value: 0x7F0B0008
+ public const int abc_activity_chooser_view_list_item = 2131427336;
- // aapt resource value: 0x7f040009
- public const int abc_alert_dialog_button_bar_material = 2130968585;
+ // aapt resource value: 0x7F0B0009
+ public const int abc_alert_dialog_button_bar_material = 2131427337;
- // aapt resource value: 0x7f04000a
- public const int abc_alert_dialog_material = 2130968586;
+ // aapt resource value: 0x7F0B000A
+ public const int abc_alert_dialog_material = 2131427338;
- // aapt resource value: 0x7f04000b
- public const int abc_alert_dialog_title_material = 2130968587;
+ // aapt resource value: 0x7F0B000B
+ public const int abc_alert_dialog_title_material = 2131427339;
- // aapt resource value: 0x7f04000c
- public const int abc_dialog_title_material = 2130968588;
+ // aapt resource value: 0x7F0B000C
+ public const int abc_dialog_title_material = 2131427340;
- // aapt resource value: 0x7f04000d
- public const int abc_expanded_menu_layout = 2130968589;
+ // aapt resource value: 0x7F0B000D
+ public const int abc_expanded_menu_layout = 2131427341;
- // aapt resource value: 0x7f04000e
- public const int abc_list_menu_item_checkbox = 2130968590;
+ // aapt resource value: 0x7F0B000E
+ public const int abc_list_menu_item_checkbox = 2131427342;
- // aapt resource value: 0x7f04000f
- public const int abc_list_menu_item_icon = 2130968591;
+ // aapt resource value: 0x7F0B000F
+ public const int abc_list_menu_item_icon = 2131427343;
- // aapt resource value: 0x7f040010
- public const int abc_list_menu_item_layout = 2130968592;
+ // aapt resource value: 0x7F0B0010
+ public const int abc_list_menu_item_layout = 2131427344;
- // aapt resource value: 0x7f040011
- public const int abc_list_menu_item_radio = 2130968593;
+ // aapt resource value: 0x7F0B0011
+ public const int abc_list_menu_item_radio = 2131427345;
- // aapt resource value: 0x7f040012
- public const int abc_popup_menu_header_item_layout = 2130968594;
+ // aapt resource value: 0x7F0B0012
+ public const int abc_popup_menu_header_item_layout = 2131427346;
- // aapt resource value: 0x7f040013
- public const int abc_popup_menu_item_layout = 2130968595;
+ // aapt resource value: 0x7F0B0013
+ public const int abc_popup_menu_item_layout = 2131427347;
- // aapt resource value: 0x7f040014
- public const int abc_screen_content_include = 2130968596;
+ // aapt resource value: 0x7F0B0014
+ public const int abc_screen_content_include = 2131427348;
- // aapt resource value: 0x7f040015
- public const int abc_screen_simple = 2130968597;
+ // aapt resource value: 0x7F0B0015
+ public const int abc_screen_simple = 2131427349;
- // aapt resource value: 0x7f040016
- public const int abc_screen_simple_overlay_action_mode = 2130968598;
+ // aapt resource value: 0x7F0B0016
+ public const int abc_screen_simple_overlay_action_mode = 2131427350;
- // aapt resource value: 0x7f040017
- public const int abc_screen_toolbar = 2130968599;
+ // aapt resource value: 0x7F0B0017
+ public const int abc_screen_toolbar = 2131427351;
- // aapt resource value: 0x7f040018
- public const int abc_search_dropdown_item_icons_2line = 2130968600;
+ // aapt resource value: 0x7F0B0018
+ public const int abc_search_dropdown_item_icons_2line = 2131427352;
- // aapt resource value: 0x7f040019
- public const int abc_search_view = 2130968601;
+ // aapt resource value: 0x7F0B0019
+ public const int abc_search_view = 2131427353;
- // aapt resource value: 0x7f04001a
- public const int abc_select_dialog_material = 2130968602;
+ // aapt resource value: 0x7F0B001A
+ public const int abc_select_dialog_material = 2131427354;
- // aapt resource value: 0x7f04001b
- public const int biometric_prompt_dialog_content = 2130968603;
+ // aapt resource value: 0x7F0B001B
+ public const int activity_elian = 2131427355;
- // aapt resource value: 0x7f04001c
- public const int design_bottom_navigation_item = 2130968604;
+ // aapt resource value: 0x7F0B001C
+ public const int biometric_prompt_dialog_content = 2131427356;
- // aapt resource value: 0x7f04001d
- public const int design_bottom_sheet_dialog = 2130968605;
+ // aapt resource value: 0x7F0B001D
+ public const int design_bottom_navigation_item = 2131427357;
- // aapt resource value: 0x7f04001e
- public const int design_layout_snackbar = 2130968606;
+ // aapt resource value: 0x7F0B001E
+ public const int design_bottom_sheet_dialog = 2131427358;
- // aapt resource value: 0x7f04001f
- public const int design_layout_snackbar_include = 2130968607;
+ // aapt resource value: 0x7F0B001F
+ public const int design_layout_snackbar = 2131427359;
- // aapt resource value: 0x7f040020
- public const int design_layout_tab_icon = 2130968608;
+ // aapt resource value: 0x7F0B0020
+ public const int design_layout_snackbar_include = 2131427360;
- // aapt resource value: 0x7f040021
- public const int design_layout_tab_text = 2130968609;
+ // aapt resource value: 0x7F0B0021
+ public const int design_layout_tab_icon = 2131427361;
- // aapt resource value: 0x7f040022
- public const int design_menu_item_action_area = 2130968610;
+ // aapt resource value: 0x7F0B0022
+ public const int design_layout_tab_text = 2131427362;
- // aapt resource value: 0x7f040023
- public const int design_navigation_item = 2130968611;
+ // aapt resource value: 0x7F0B0023
+ public const int design_menu_item_action_area = 2131427363;
- // aapt resource value: 0x7f040024
- public const int design_navigation_item_header = 2130968612;
+ // aapt resource value: 0x7F0B0024
+ public const int design_navigation_item = 2131427364;
+
+ // aapt resource value: 0x7F0B0025
+ public const int design_navigation_item_header = 2131427365;
+
+ // aapt resource value: 0x7F0B0026
+ public const int design_navigation_item_separator = 2131427366;
+
+ // aapt resource value: 0x7F0B0027
+ public const int design_navigation_item_subheader = 2131427367;
- // aapt resource value: 0x7f040025
- public const int design_navigation_item_separator = 2130968613;
+ // aapt resource value: 0x7F0B0028
+ public const int design_navigation_menu = 2131427368;
- // aapt resource value: 0x7f040026
- public const int design_navigation_item_subheader = 2130968614;
+ // aapt resource value: 0x7F0B0029
+ public const int design_navigation_menu_item = 2131427369;
- // aapt resource value: 0x7f040027
- public const int design_navigation_menu = 2130968615;
+ // aapt resource value: 0x7F0B002A
+ public const int design_text_input_password_icon = 2131427370;
- // aapt resource value: 0x7f040028
- public const int design_navigation_menu_item = 2130968616;
+ // aapt resource value: 0x7F0B002B
+ public const int hdl_gallery_banner_view_layout = 2131427371;
- // aapt resource value: 0x7f040029
- public const int design_text_input_password_icon = 2130968617;
+ // aapt resource value: 0x7F0B002C
+ public const int hdl_widget_activity_crop_image = 2131427372;
- // aapt resource value: 0x7f04002a
- public const int hdl_gallery_banner_view_layout = 2130968618;
+ // aapt resource value: 0x7F0B002D
+ public const int hdl_widget_activity_geofence_round = 2131427373;
- // aapt resource value: 0x7f04002b
- public const int hdl_widget_activity_crop_image = 2130968619;
+ // aapt resource value: 0x7F0B002E
+ public const int hdl_widget_air_button = 2131427374;
- // aapt resource value: 0x7f04002c
- public const int hdl_widget_activity_geofence_round = 2130968620;
+ // aapt resource value: 0x7F0B002F
+ public const int hdl_widget_include_pickerview_topbar = 2131427375;
- // aapt resource value: 0x7f04002d
- public const int hdl_widget_air_button = 2130968621;
+ // aapt resource value: 0x7F0B0030
+ public const int hdl_widget_layout_basepickerview = 2131427376;
- // aapt resource value: 0x7f04002e
- public const int hdl_widget_include_pickerview_topbar = 2130968622;
+ // aapt resource value: 0x7F0B0031
+ public const int hdl_widget_pickerview = 2131427377;
- // aapt resource value: 0x7f04002f
- public const int hdl_widget_layout_basepickerview = 2130968623;
+ // aapt resource value: 0x7F0B0032
+ public const int hdl_widget_pickerview_options = 2131427378;
- // aapt resource value: 0x7f040030
- public const int hdl_widget_pickerview = 2130968624;
+ // aapt resource value: 0x7F0B0033
+ public const int hdl_widget_pickerview_time = 2131427379;
- // aapt resource value: 0x7f040031
- public const int hdl_widget_pickerview_options = 2130968625;
+ // aapt resource value: 0x7F0B0034
+ public const int Main = 2131427380;
- // aapt resource value: 0x7f040032
- public const int hdl_widget_pickerview_time = 2130968626;
+ // aapt resource value: 0x7F0B0035
+ public const int notification_action = 2131427381;
- // aapt resource value: 0x7f040033
- public const int Main = 2130968627;
+ // aapt resource value: 0x7F0B0036
+ public const int notification_action_tombstone = 2131427382;
- // aapt resource value: 0x7f040034
- public const int notification_action = 2130968628;
+ // aapt resource value: 0x7F0B0037
+ public const int notification_media_action = 2131427383;
- // aapt resource value: 0x7f040035
- public const int notification_action_tombstone = 2130968629;
+ // aapt resource value: 0x7F0B0038
+ public const int notification_media_cancel_action = 2131427384;
- // aapt resource value: 0x7f040036
- public const int notification_media_action = 2130968630;
+ // aapt resource value: 0x7F0B0039
+ public const int notification_template_big_media = 2131427385;
- // aapt resource value: 0x7f040037
- public const int notification_media_cancel_action = 2130968631;
+ // aapt resource value: 0x7F0B003A
+ public const int notification_template_big_media_custom = 2131427386;
- // aapt resource value: 0x7f040038
- public const int notification_template_big_media = 2130968632;
+ // aapt resource value: 0x7F0B003B
+ public const int notification_template_big_media_narrow = 2131427387;
- // aapt resource value: 0x7f040039
- public const int notification_template_big_media_custom = 2130968633;
+ // aapt resource value: 0x7F0B003C
+ public const int notification_template_big_media_narrow_custom = 2131427388;
- // aapt resource value: 0x7f04003a
- public const int notification_template_big_media_narrow = 2130968634;
+ // aapt resource value: 0x7F0B003D
+ public const int notification_template_custom_big = 2131427389;
- // aapt resource value: 0x7f04003b
- public const int notification_template_big_media_narrow_custom = 2130968635;
+ // aapt resource value: 0x7F0B003E
+ public const int notification_template_icon_group = 2131427390;
- // aapt resource value: 0x7f04003c
- public const int notification_template_custom_big = 2130968636;
+ // aapt resource value: 0x7F0B003F
+ public const int notification_template_lines_media = 2131427391;
- // aapt resource value: 0x7f04003d
- public const int notification_template_icon_group = 2130968637;
+ // aapt resource value: 0x7F0B0040
+ public const int notification_template_media = 2131427392;
- // aapt resource value: 0x7f04003e
- public const int notification_template_lines_media = 2130968638;
+ // aapt resource value: 0x7F0B0041
+ public const int notification_template_media_custom = 2131427393;
- // aapt resource value: 0x7f04003f
- public const int notification_template_media = 2130968639;
+ // aapt resource value: 0x7F0B0042
+ public const int notification_template_part_chronometer = 2131427394;
- // aapt resource value: 0x7f040040
- public const int notification_template_media_custom = 2130968640;
+ // aapt resource value: 0x7F0B0043
+ public const int notification_template_part_time = 2131427395;
- // aapt resource value: 0x7f040041
- public const int notification_template_part_chronometer = 2130968641;
+ // aapt resource value: 0x7F0B0044
+ public const int select_dialog_item_material = 2131427396;
- // aapt resource value: 0x7f040042
- public const int notification_template_part_time = 2130968642;
+ // aapt resource value: 0x7F0B0045
+ public const int select_dialog_multichoice_material = 2131427397;
- // aapt resource value: 0x7f040043
- public const int select_dialog_item_material = 2130968643;
+ // aapt resource value: 0x7F0B0046
+ public const int select_dialog_singlechoice_material = 2131427398;
- // aapt resource value: 0x7f040044
- public const int select_dialog_multichoice_material = 2130968644;
+ // aapt resource value: 0x7F0B0047
+ public const int srl_classics_footer = 2131427399;
- // aapt resource value: 0x7f040045
- public const int select_dialog_singlechoice_material = 2130968645;
+ // aapt resource value: 0x7F0B0048
+ public const int srl_classics_header = 2131427400;
- // aapt resource value: 0x7f040046
- public const int srl_classics_footer = 2130968646;
+ // aapt resource value: 0x7F0B0049
+ public const int support_simple_spinner_dropdown_item = 2131427401;
- // aapt resource value: 0x7f040047
- public const int srl_classics_header = 2130968647;
+ // aapt resource value: 0x7F0B004A
+ public const int tooltip = 2131427402;
- // aapt resource value: 0x7f040048
- public const int support_simple_spinner_dropdown_item = 2130968648;
+ // aapt resource value: 0x7F0B004C
+ public const int zxingscanneractivitylayout = 2131427404;
- // aapt resource value: 0x7f040049
- public const int tooltip = 2130968649;
+ // aapt resource value: 0x7F0B004D
+ public const int zxingscannerfragmentlayout = 2131427405;
- // aapt resource value: 0x7f04004a
- public const int zxing_layout = 2130968650;
+ // aapt resource value: 0x7F0B004B
+ public const int zxing_layout = 2131427403;
static Layout()
{
@@ -3984,8 +4013,8 @@
public partial class Mipmap
{
- // aapt resource value: 0x7f030000
- public const int Icon = 2130903040;
+ // aapt resource value: 0x7F0C0000
+ public const int Icon = 2131492864;
static Mipmap()
{
@@ -4000,242 +4029,242 @@
public partial class String
{
- // aapt resource value: 0x7f0a0000
- public const int abc_action_bar_home_description = 2131361792;
+ // aapt resource value: 0x7F0D0000
+ public const int abc_action_bar_home_description = 2131558400;
- // aapt resource value: 0x7f0a0001
- public const int abc_action_bar_home_description_format = 2131361793;
+ // aapt resource value: 0x7F0D0001
+ public const int abc_action_bar_home_description_format = 2131558401;
- // aapt resource value: 0x7f0a0002
- public const int abc_action_bar_home_subtitle_description_format = 2131361794;
+ // aapt resource value: 0x7F0D0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131558402;
- // aapt resource value: 0x7f0a0003
- public const int abc_action_bar_up_description = 2131361795;
+ // aapt resource value: 0x7F0D0003
+ public const int abc_action_bar_up_description = 2131558403;
- // aapt resource value: 0x7f0a0004
- public const int abc_action_menu_overflow_description = 2131361796;
+ // aapt resource value: 0x7F0D0004
+ public const int abc_action_menu_overflow_description = 2131558404;
- // aapt resource value: 0x7f0a0005
- public const int abc_action_mode_done = 2131361797;
+ // aapt resource value: 0x7F0D0005
+ public const int abc_action_mode_done = 2131558405;
- // aapt resource value: 0x7f0a0006
- public const int abc_activity_chooser_view_see_all = 2131361798;
+ // aapt resource value: 0x7F0D0007
+ public const int abc_activitychooserview_choose_application = 2131558407;
- // aapt resource value: 0x7f0a0007
- public const int abc_activitychooserview_choose_application = 2131361799;
+ // aapt resource value: 0x7F0D0006
+ public const int abc_activity_chooser_view_see_all = 2131558406;
- // aapt resource value: 0x7f0a0008
- public const int abc_capital_off = 2131361800;
+ // aapt resource value: 0x7F0D0008
+ public const int abc_capital_off = 2131558408;
- // aapt resource value: 0x7f0a0009
- public const int abc_capital_on = 2131361801;
+ // aapt resource value: 0x7F0D0009
+ public const int abc_capital_on = 2131558409;
- // aapt resource value: 0x7f0a0015
- public const int abc_font_family_body_1_material = 2131361813;
+ // aapt resource value: 0x7F0D000A
+ public const int abc_font_family_body_1_material = 2131558410;
- // aapt resource value: 0x7f0a0016
- public const int abc_font_family_body_2_material = 2131361814;
+ // aapt resource value: 0x7F0D000B
+ public const int abc_font_family_body_2_material = 2131558411;
- // aapt resource value: 0x7f0a0017
- public const int abc_font_family_button_material = 2131361815;
+ // aapt resource value: 0x7F0D000C
+ public const int abc_font_family_button_material = 2131558412;
- // aapt resource value: 0x7f0a0018
- public const int abc_font_family_caption_material = 2131361816;
+ // aapt resource value: 0x7F0D000D
+ public const int abc_font_family_caption_material = 2131558413;
- // aapt resource value: 0x7f0a0019
- public const int abc_font_family_display_1_material = 2131361817;
+ // aapt resource value: 0x7F0D000E
+ public const int abc_font_family_display_1_material = 2131558414;
- // aapt resource value: 0x7f0a001a
- public const int abc_font_family_display_2_material = 2131361818;
+ // aapt resource value: 0x7F0D000F
+ public const int abc_font_family_display_2_material = 2131558415;
- // aapt resource value: 0x7f0a001b
- public const int abc_font_family_display_3_material = 2131361819;
+ // aapt resource value: 0x7F0D0010
+ public const int abc_font_family_display_3_material = 2131558416;
- // aapt resource value: 0x7f0a001c
- public const int abc_font_family_display_4_material = 2131361820;
+ // aapt resource value: 0x7F0D0011
+ public const int abc_font_family_display_4_material = 2131558417;
- // aapt resource value: 0x7f0a001d
- public const int abc_font_family_headline_material = 2131361821;
+ // aapt resource value: 0x7F0D0012
+ public const int abc_font_family_headline_material = 2131558418;
- // aapt resource value: 0x7f0a001e
- public const int abc_font_family_menu_material = 2131361822;
+ // aapt resource value: 0x7F0D0013
+ public const int abc_font_family_menu_material = 2131558419;
- // aapt resource value: 0x7f0a001f
- public const int abc_font_family_subhead_material = 2131361823;
+ // aapt resource value: 0x7F0D0014
+ public const int abc_font_family_subhead_material = 2131558420;
- // aapt resource value: 0x7f0a0020
- public const int abc_font_family_title_material = 2131361824;
+ // aapt resource value: 0x7F0D0015
+ public const int abc_font_family_title_material = 2131558421;
- // aapt resource value: 0x7f0a000a
- public const int abc_search_hint = 2131361802;
+ // aapt resource value: 0x7F0D0017
+ public const int abc_searchview_description_clear = 2131558423;
- // aapt resource value: 0x7f0a000b
- public const int abc_searchview_description_clear = 2131361803;
+ // aapt resource value: 0x7F0D0018
+ public const int abc_searchview_description_query = 2131558424;
- // aapt resource value: 0x7f0a000c
- public const int abc_searchview_description_query = 2131361804;
+ // aapt resource value: 0x7F0D0019
+ public const int abc_searchview_description_search = 2131558425;
- // aapt resource value: 0x7f0a000d
- public const int abc_searchview_description_search = 2131361805;
+ // aapt resource value: 0x7F0D001A
+ public const int abc_searchview_description_submit = 2131558426;
- // aapt resource value: 0x7f0a000e
- public const int abc_searchview_description_submit = 2131361806;
+ // aapt resource value: 0x7F0D001B
+ public const int abc_searchview_description_voice = 2131558427;
- // aapt resource value: 0x7f0a000f
- public const int abc_searchview_description_voice = 2131361807;
+ // aapt resource value: 0x7F0D0016
+ public const int abc_search_hint = 2131558422;
- // aapt resource value: 0x7f0a0010
- public const int abc_shareactionprovider_share_with = 2131361808;
+ // aapt resource value: 0x7F0D001C
+ public const int abc_shareactionprovider_share_with = 2131558428;
- // aapt resource value: 0x7f0a0011
- public const int abc_shareactionprovider_share_with_application = 2131361809;
+ // aapt resource value: 0x7F0D001D
+ public const int abc_shareactionprovider_share_with_application = 2131558429;
- // aapt resource value: 0x7f0a0012
- public const int abc_toolbar_collapse_description = 2131361810;
+ // aapt resource value: 0x7F0D001E
+ public const int abc_toolbar_collapse_description = 2131558430;
- // aapt resource value: 0x7f0a003c
- public const int app_name = 2131361852;
+ // aapt resource value: 0x7F0D0020
+ public const int appbar_scrolling_view_behavior = 2131558432;
- // aapt resource value: 0x7f0a0021
- public const int appbar_scrolling_view_behavior = 2131361825;
+ // aapt resource value: 0x7F0D001F
+ public const int app_name = 2131558431;
- // aapt resource value: 0x7f0a0022
- public const int bottom_sheet_behavior = 2131361826;
+ // aapt resource value: 0x7F0D0021
+ public const int bottom_sheet_behavior = 2131558433;
- // aapt resource value: 0x7f0a0023
- public const int character_counter_pattern = 2131361827;
+ // aapt resource value: 0x7F0D0022
+ public const int character_counter_pattern = 2131558434;
- // aapt resource value: 0x7f0a003d
- public const int gd_activity_title = 2131361853;
+ // aapt resource value: 0x7F0D0023
+ public const int gd_activity_title = 2131558435;
- // aapt resource value: 0x7f0a003e
- public const int gd_cancel = 2131361854;
+ // aapt resource value: 0x7F0D0024
+ public const int gd_cancel = 2131558436;
- // aapt resource value: 0x7f0a003f
- public const int gd_myhome = 2131361855;
+ // aapt resource value: 0x7F0D0025
+ public const int gd_myhome = 2131558437;
- // aapt resource value: 0x7f0a0040
- public const int gd_notifyMsg = 2131361856;
+ // aapt resource value: 0x7F0D0026
+ public const int gd_notifyMsg = 2131558438;
- // aapt resource value: 0x7f0a0041
- public const int gd_notifyTitle = 2131361857;
+ // aapt resource value: 0x7F0D0027
+ public const int gd_notifyTitle = 2131558439;
- // aapt resource value: 0x7f0a0042
- public const int gd_save = 2131361858;
+ // aapt resource value: 0x7F0D0028
+ public const int gd_save = 2131558440;
- // aapt resource value: 0x7f0a0043
- public const int gd_search_tip = 2131361859;
+ // aapt resource value: 0x7F0D0029
+ public const int gd_search_tip = 2131558441;
- // aapt resource value: 0x7f0a0044
- public const int gd_select_distance = 2131361860;
+ // aapt resource value: 0x7F0D002A
+ public const int gd_select_distance = 2131558442;
- // aapt resource value: 0x7f0a0045
- public const int gd_setting = 2131361861;
+ // aapt resource value: 0x7F0D002B
+ public const int gd_setting = 2131558443;
- // aapt resource value: 0x7f0a004e
- public const int hello = 2131361870;
+ // aapt resource value: 0x7F0D002C
+ public const int hello = 2131558444;
- // aapt resource value: 0x7f0a0029
- public const int not_recognized_fingerprint_hint = 2131361833;
+ // aapt resource value: 0x7F0D002D
+ public const int not_recognized_fingerprint_hint = 2131558445;
- // aapt resource value: 0x7f0a0024
- public const int password_toggle_content_description = 2131361828;
+ // aapt resource value: 0x7F0D002E
+ public const int password_toggle_content_description = 2131558446;
- // aapt resource value: 0x7f0a0025
- public const int path_password_eye = 2131361829;
+ // aapt resource value: 0x7F0D002F
+ public const int path_password_eye = 2131558447;
- // aapt resource value: 0x7f0a0026
- public const int path_password_eye_mask_strike_through = 2131361830;
+ // aapt resource value: 0x7F0D0030
+ public const int path_password_eye_mask_strike_through = 2131558448;
- // aapt resource value: 0x7f0a0027
- public const int path_password_eye_mask_visible = 2131361831;
+ // aapt resource value: 0x7F0D0031
+ public const int path_password_eye_mask_visible = 2131558449;
- // aapt resource value: 0x7f0a0028
- public const int path_password_strike_through = 2131361832;
+ // aapt resource value: 0x7F0D0032
+ public const int path_password_strike_through = 2131558450;
- // aapt resource value: 0x7f0a0046
- public const int pickerview_cancel = 2131361862;
+ // aapt resource value: 0x7F0D0033
+ public const int pickerview_cancel = 2131558451;
- // aapt resource value: 0x7f0a0047
- public const int pickerview_day = 2131361863;
+ // aapt resource value: 0x7F0D0034
+ public const int pickerview_day = 2131558452;
- // aapt resource value: 0x7f0a0048
- public const int pickerview_hours = 2131361864;
+ // aapt resource value: 0x7F0D0035
+ public const int pickerview_hours = 2131558453;
- // aapt resource value: 0x7f0a0049
- public const int pickerview_minutes = 2131361865;
+ // aapt resource value: 0x7F0D0036
+ public const int pickerview_minutes = 2131558454;
- // aapt resource value: 0x7f0a004a
- public const int pickerview_month = 2131361866;
+ // aapt resource value: 0x7F0D0037
+ public const int pickerview_month = 2131558455;
- // aapt resource value: 0x7f0a004b
- public const int pickerview_seconds = 2131361867;
+ // aapt resource value: 0x7F0D0038
+ public const int pickerview_seconds = 2131558456;
- // aapt resource value: 0x7f0a004c
- public const int pickerview_submit = 2131361868;
+ // aapt resource value: 0x7F0D0039
+ public const int pickerview_submit = 2131558457;
- // aapt resource value: 0x7f0a004d
- public const int pickerview_year = 2131361869;
+ // aapt resource value: 0x7F0D003A
+ public const int pickerview_year = 2131558458;
- // aapt resource value: 0x7f0a0013
- public const int search_menu_title = 2131361811;
+ // aapt resource value: 0x7F0D003B
+ public const int search_menu_title = 2131558459;
- // aapt resource value: 0x7f0a002b
- public const int srl_component_falsify = 2131361835;
+ // aapt resource value: 0x7F0D003C
+ public const int srl_component_falsify = 2131558460;
- // aapt resource value: 0x7f0a002c
- public const int srl_content_empty = 2131361836;
+ // aapt resource value: 0x7F0D003D
+ public const int srl_content_empty = 2131558461;
- // aapt resource value: 0x7f0a002d
- public const int srl_footer_failed = 2131361837;
+ // aapt resource value: 0x7F0D003E
+ public const int srl_footer_failed = 2131558462;
- // aapt resource value: 0x7f0a002e
- public const int srl_footer_finish = 2131361838;
+ // aapt resource value: 0x7F0D003F
+ public const int srl_footer_finish = 2131558463;
- // aapt resource value: 0x7f0a002f
- public const int srl_footer_loading = 2131361839;
+ // aapt resource value: 0x7F0D0040
+ public const int srl_footer_loading = 2131558464;
- // aapt resource value: 0x7f0a0030
- public const int srl_footer_nothing = 2131361840;
+ // aapt resource value: 0x7F0D0041
+ public const int srl_footer_nothing = 2131558465;
- // aapt resource value: 0x7f0a0031
- public const int srl_footer_pulling = 2131361841;
+ // aapt resource value: 0x7F0D0042
+ public const int srl_footer_pulling = 2131558466;
- // aapt resource value: 0x7f0a0032
- public const int srl_footer_refreshing = 2131361842;
+ // aapt resource value: 0x7F0D0043
+ public const int srl_footer_refreshing = 2131558467;
- // aapt resource value: 0x7f0a0033
- public const int srl_footer_release = 2131361843;
+ // aapt resource value: 0x7F0D0044
+ public const int srl_footer_release = 2131558468;
- // aapt resource value: 0x7f0a0034
- public const int srl_header_failed = 2131361844;
+ // aapt resource value: 0x7F0D0045
+ public const int srl_header_failed = 2131558469;
- // aapt resource value: 0x7f0a0035
- public const int srl_header_finish = 2131361845;
+ // aapt resource value: 0x7F0D0046
+ public const int srl_header_finish = 2131558470;
- // aapt resource value: 0x7f0a0036
- public const int srl_header_loading = 2131361846;
+ // aapt resource value: 0x7F0D0047
+ public const int srl_header_loading = 2131558471;
- // aapt resource value: 0x7f0a0037
- public const int srl_header_pulling = 2131361847;
+ // aapt resource value: 0x7F0D0048
+ public const int srl_header_pulling = 2131558472;
- // aapt resource value: 0x7f0a0038
- public const int srl_header_refreshing = 2131361848;
+ // aapt resource value: 0x7F0D0049
+ public const int srl_header_refreshing = 2131558473;
- // aapt resource value: 0x7f0a0039
- public const int srl_header_release = 2131361849;
+ // aapt resource value: 0x7F0D004A
+ public const int srl_header_release = 2131558474;
- // aapt resource value: 0x7f0a003a
- public const int srl_header_secondary = 2131361850;
+ // aapt resource value: 0x7F0D004B
+ public const int srl_header_secondary = 2131558475;
- // aapt resource value: 0x7f0a003b
- public const int srl_header_update = 2131361851;
+ // aapt resource value: 0x7F0D004C
+ public const int srl_header_update = 2131558476;
- // aapt resource value: 0x7f0a0014
- public const int status_bar_notification_info_overflow = 2131361812;
+ // aapt resource value: 0x7F0D004D
+ public const int status_bar_notification_info_overflow = 2131558477;
- // aapt resource value: 0x7f0a002a
- public const int touch_fingerprint_sensor_hint = 2131361834;
+ // aapt resource value: 0x7F0D004E
+ public const int touch_fingerprint_sensor_hint = 2131558478;
static String()
{
@@ -4250,1205 +4279,1205 @@
public partial class Style
{
- // aapt resource value: 0x7f0b009d
- public const int AlertDialog_AppCompat = 2131427485;
+ // aapt resource value: 0x7F0E0000
+ public const int AlertDialog_AppCompat = 2131623936;
- // aapt resource value: 0x7f0b009e
- public const int AlertDialog_AppCompat_Light = 2131427486;
+ // aapt resource value: 0x7F0E0001
+ public const int AlertDialog_AppCompat_Light = 2131623937;
- // aapt resource value: 0x7f0b009f
- public const int Animation_AppCompat_Dialog = 2131427487;
+ // aapt resource value: 0x7F0E0002
+ public const int Animation_AppCompat_Dialog = 2131623938;
- // aapt resource value: 0x7f0b00a0
- public const int Animation_AppCompat_DropDownUp = 2131427488;
+ // aapt resource value: 0x7F0E0003
+ public const int Animation_AppCompat_DropDownUp = 2131623939;
- // aapt resource value: 0x7f0b00a1
- public const int Animation_AppCompat_Tooltip = 2131427489;
+ // aapt resource value: 0x7F0E0004
+ public const int Animation_AppCompat_Tooltip = 2131623940;
- // aapt resource value: 0x7f0b0169
- public const int Animation_Design_BottomSheetDialog = 2131427689;
+ // aapt resource value: 0x7F0E0005
+ public const int Animation_Design_BottomSheetDialog = 2131623941;
- // aapt resource value: 0x7f0b00a2
- public const int Base_AlertDialog_AppCompat = 2131427490;
+ // aapt resource value: 0x7F0E0006
+ public const int Base_AlertDialog_AppCompat = 2131623942;
- // aapt resource value: 0x7f0b00a3
- public const int Base_AlertDialog_AppCompat_Light = 2131427491;
+ // aapt resource value: 0x7F0E0007
+ public const int Base_AlertDialog_AppCompat_Light = 2131623943;
- // aapt resource value: 0x7f0b00a4
- public const int Base_Animation_AppCompat_Dialog = 2131427492;
+ // aapt resource value: 0x7F0E0008
+ public const int Base_Animation_AppCompat_Dialog = 2131623944;
- // aapt resource value: 0x7f0b00a5
- public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
+ // aapt resource value: 0x7F0E0009
+ public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
- // aapt resource value: 0x7f0b00a6
- public const int Base_Animation_AppCompat_Tooltip = 2131427494;
+ // aapt resource value: 0x7F0E000A
+ public const int Base_Animation_AppCompat_Tooltip = 2131623946;
- // aapt resource value: 0x7f0b00a7
- public const int Base_DialogWindowTitle_AppCompat = 2131427495;
+ // aapt resource value: 0x7F0E000C
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
- // aapt resource value: 0x7f0b00a8
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
+ // aapt resource value: 0x7F0E000B
+ public const int Base_DialogWindowTitle_AppCompat = 2131623947;
- // aapt resource value: 0x7f0b0039
- public const int Base_TextAppearance_AppCompat = 2131427385;
+ // aapt resource value: 0x7F0E000D
+ public const int Base_TextAppearance_AppCompat = 2131623949;
- // aapt resource value: 0x7f0b003a
- public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
+ // aapt resource value: 0x7F0E000E
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
- // aapt resource value: 0x7f0b003b
- public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
+ // aapt resource value: 0x7F0E000F
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
- // aapt resource value: 0x7f0b0027
- public const int Base_TextAppearance_AppCompat_Button = 2131427367;
+ // aapt resource value: 0x7F0E0010
+ public const int Base_TextAppearance_AppCompat_Button = 2131623952;
- // aapt resource value: 0x7f0b003c
- public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
+ // aapt resource value: 0x7F0E0011
+ public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
- // aapt resource value: 0x7f0b003d
- public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
+ // aapt resource value: 0x7F0E0012
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
- // aapt resource value: 0x7f0b003e
- public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
+ // aapt resource value: 0x7F0E0013
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
- // aapt resource value: 0x7f0b003f
- public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
+ // aapt resource value: 0x7F0E0014
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
- // aapt resource value: 0x7f0b0040
- public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
+ // aapt resource value: 0x7F0E0015
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
- // aapt resource value: 0x7f0b0041
- public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
+ // aapt resource value: 0x7F0E0016
+ public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
- // aapt resource value: 0x7f0b000b
- public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
+ // aapt resource value: 0x7F0E0017
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
- // aapt resource value: 0x7f0b0042
- public const int Base_TextAppearance_AppCompat_Large = 2131427394;
+ // aapt resource value: 0x7F0E0018
+ public const int Base_TextAppearance_AppCompat_Large = 2131623960;
- // aapt resource value: 0x7f0b000c
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
+ // aapt resource value: 0x7F0E0019
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
- // aapt resource value: 0x7f0b0043
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
+ // aapt resource value: 0x7F0E001A
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
- // aapt resource value: 0x7f0b0044
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
+ // aapt resource value: 0x7F0E001B
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
- // aapt resource value: 0x7f0b0045
- public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
+ // aapt resource value: 0x7F0E001C
+ public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
- // aapt resource value: 0x7f0b000d
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
+ // aapt resource value: 0x7F0E001D
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
- // aapt resource value: 0x7f0b0046
- public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
+ // aapt resource value: 0x7F0E001E
+ public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
- // aapt resource value: 0x7f0b00a9
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
+ // aapt resource value: 0x7F0E001F
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
- // aapt resource value: 0x7f0b0047
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
+ // aapt resource value: 0x7F0E0020
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
- // aapt resource value: 0x7f0b0048
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
+ // aapt resource value: 0x7F0E0021
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
- // aapt resource value: 0x7f0b0049
- public const int Base_TextAppearance_AppCompat_Small = 2131427401;
+ // aapt resource value: 0x7F0E0022
+ public const int Base_TextAppearance_AppCompat_Small = 2131623970;
- // aapt resource value: 0x7f0b000e
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
+ // aapt resource value: 0x7F0E0023
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
- // aapt resource value: 0x7f0b004a
- public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
+ // aapt resource value: 0x7F0E0024
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
- // aapt resource value: 0x7f0b000f
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
+ // aapt resource value: 0x7F0E0025
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
- // aapt resource value: 0x7f0b004b
- public const int Base_TextAppearance_AppCompat_Title = 2131427403;
+ // aapt resource value: 0x7F0E0026
+ public const int Base_TextAppearance_AppCompat_Title = 2131623974;
- // aapt resource value: 0x7f0b0010
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
+ // aapt resource value: 0x7F0E0027
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
- // aapt resource value: 0x7f0b00aa
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
+ // aapt resource value: 0x7F0E0028
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
- // aapt resource value: 0x7f0b008e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
+ // aapt resource value: 0x7F0E0029
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
- // aapt resource value: 0x7f0b004c
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
+ // aapt resource value: 0x7F0E002A
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
- // aapt resource value: 0x7f0b004d
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
+ // aapt resource value: 0x7F0E002B
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
- // aapt resource value: 0x7f0b004e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
+ // aapt resource value: 0x7F0E002C
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
- // aapt resource value: 0x7f0b004f
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
+ // aapt resource value: 0x7F0E002D
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
- // aapt resource value: 0x7f0b0050
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
+ // aapt resource value: 0x7F0E002E
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
- // aapt resource value: 0x7f0b0051
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
+ // aapt resource value: 0x7F0E002F
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
- // aapt resource value: 0x7f0b0052
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
+ // aapt resource value: 0x7F0E0030
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
- // aapt resource value: 0x7f0b0095
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
+ // aapt resource value: 0x7F0E0031
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
- // aapt resource value: 0x7f0b0096
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
+ // aapt resource value: 0x7F0E0032
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
- // aapt resource value: 0x7f0b008f
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
+ // aapt resource value: 0x7F0E0033
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
- // aapt resource value: 0x7f0b00ab
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
+ // aapt resource value: 0x7F0E0034
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
- // aapt resource value: 0x7f0b0053
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
+ // aapt resource value: 0x7F0E0035
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
- // aapt resource value: 0x7f0b0054
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
+ // aapt resource value: 0x7F0E0036
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
- // aapt resource value: 0x7f0b0055
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
+ // aapt resource value: 0x7F0E0037
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
- // aapt resource value: 0x7f0b0056
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
+ // aapt resource value: 0x7F0E0038
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
- // aapt resource value: 0x7f0b0057
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
+ // aapt resource value: 0x7F0E0039
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
- // aapt resource value: 0x7f0b00ac
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
+ // aapt resource value: 0x7F0E003A
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
- // aapt resource value: 0x7f0b0058
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
+ // aapt resource value: 0x7F0E003B
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
- // aapt resource value: 0x7f0b0059
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
+ // aapt resource value: 0x7F0E003C
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
- // aapt resource value: 0x7f0b005a
- public const int Base_Theme_AppCompat = 2131427418;
+ // aapt resource value: 0x7F0E004B
+ public const int Base_ThemeOverlay_AppCompat = 2131624011;
- // aapt resource value: 0x7f0b00ad
- public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
+ // aapt resource value: 0x7F0E004C
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
- // aapt resource value: 0x7f0b0011
- public const int Base_Theme_AppCompat_Dialog = 2131427345;
+ // aapt resource value: 0x7F0E004D
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
- // aapt resource value: 0x7f0b0012
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
+ // aapt resource value: 0x7F0E004E
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
- // aapt resource value: 0x7f0b00ae
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
+ // aapt resource value: 0x7F0E004F
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
- // aapt resource value: 0x7f0b0013
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
+ // aapt resource value: 0x7F0E0050
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
- // aapt resource value: 0x7f0b0001
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
+ // aapt resource value: 0x7F0E0051
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
- // aapt resource value: 0x7f0b005b
- public const int Base_Theme_AppCompat_Light = 2131427419;
+ // aapt resource value: 0x7F0E003D
+ public const int Base_Theme_AppCompat = 2131623997;
- // aapt resource value: 0x7f0b00af
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
+ // aapt resource value: 0x7F0E003E
+ public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
- // aapt resource value: 0x7f0b0014
- public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
+ // aapt resource value: 0x7F0E003F
+ public const int Base_Theme_AppCompat_Dialog = 2131623999;
- // aapt resource value: 0x7f0b0015
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
+ // aapt resource value: 0x7F0E0043
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
- // aapt resource value: 0x7f0b00b0
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
+ // aapt resource value: 0x7F0E0040
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
- // aapt resource value: 0x7f0b0016
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
+ // aapt resource value: 0x7F0E0041
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
- // aapt resource value: 0x7f0b0002
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
+ // aapt resource value: 0x7F0E0042
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
- // aapt resource value: 0x7f0b00b1
- public const int Base_ThemeOverlay_AppCompat = 2131427505;
+ // aapt resource value: 0x7F0E0044
+ public const int Base_Theme_AppCompat_Light = 2131624004;
- // aapt resource value: 0x7f0b00b2
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
+ // aapt resource value: 0x7F0E0045
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
- // aapt resource value: 0x7f0b00b3
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
+ // aapt resource value: 0x7F0E0046
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
- // aapt resource value: 0x7f0b00b4
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
+ // aapt resource value: 0x7F0E004A
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
- // aapt resource value: 0x7f0b0017
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
+ // aapt resource value: 0x7F0E0047
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
- // aapt resource value: 0x7f0b0018
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
+ // aapt resource value: 0x7F0E0048
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
- // aapt resource value: 0x7f0b00b5
- public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
+ // aapt resource value: 0x7F0E0049
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
- // aapt resource value: 0x7f0b0019
- public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
+ // aapt resource value: 0x7F0E0054
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
- // aapt resource value: 0x7f0b001a
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
+ // aapt resource value: 0x7F0E0052
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
- // aapt resource value: 0x7f0b001b
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
+ // aapt resource value: 0x7F0E0053
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
- // aapt resource value: 0x7f0b0023
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
+ // aapt resource value: 0x7F0E0055
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
- // aapt resource value: 0x7f0b0024
- public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
+ // aapt resource value: 0x7F0E0056
+ public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
- // aapt resource value: 0x7f0b016a
- public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
+ // aapt resource value: 0x7F0E0057
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
- // aapt resource value: 0x7f0b005c
- public const int Base_V21_Theme_AppCompat = 2131427420;
+ // aapt resource value: 0x7F0E005C
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
- // aapt resource value: 0x7f0b005d
- public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
+ // aapt resource value: 0x7F0E0058
+ public const int Base_V21_Theme_AppCompat = 2131624024;
- // aapt resource value: 0x7f0b005e
- public const int Base_V21_Theme_AppCompat_Light = 2131427422;
+ // aapt resource value: 0x7F0E0059
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
- // aapt resource value: 0x7f0b005f
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
+ // aapt resource value: 0x7F0E005A
+ public const int Base_V21_Theme_AppCompat_Light = 2131624026;
- // aapt resource value: 0x7f0b0060
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
+ // aapt resource value: 0x7F0E005B
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
- // aapt resource value: 0x7f0b0166
- public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
+ // aapt resource value: 0x7F0E005D
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
- // aapt resource value: 0x7f0b008c
- public const int Base_V22_Theme_AppCompat = 2131427468;
+ // aapt resource value: 0x7F0E005E
+ public const int Base_V22_Theme_AppCompat = 2131624030;
- // aapt resource value: 0x7f0b008d
- public const int Base_V22_Theme_AppCompat_Light = 2131427469;
+ // aapt resource value: 0x7F0E005F
+ public const int Base_V22_Theme_AppCompat_Light = 2131624031;
- // aapt resource value: 0x7f0b0090
- public const int Base_V23_Theme_AppCompat = 2131427472;
+ // aapt resource value: 0x7F0E0060
+ public const int Base_V23_Theme_AppCompat = 2131624032;
- // aapt resource value: 0x7f0b0091
- public const int Base_V23_Theme_AppCompat_Light = 2131427473;
+ // aapt resource value: 0x7F0E0061
+ public const int Base_V23_Theme_AppCompat_Light = 2131624033;
- // aapt resource value: 0x7f0b0099
- public const int Base_V26_Theme_AppCompat = 2131427481;
+ // aapt resource value: 0x7F0E0062
+ public const int Base_V26_Theme_AppCompat = 2131624034;
- // aapt resource value: 0x7f0b009a
- public const int Base_V26_Theme_AppCompat_Light = 2131427482;
+ // aapt resource value: 0x7F0E0063
+ public const int Base_V26_Theme_AppCompat_Light = 2131624035;
- // aapt resource value: 0x7f0b009b
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
+ // aapt resource value: 0x7F0E0064
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
- // aapt resource value: 0x7f0b0168
- public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
+ // aapt resource value: 0x7F0E0065
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
- // aapt resource value: 0x7f0b00b6
- public const int Base_V7_Theme_AppCompat = 2131427510;
+ // aapt resource value: 0x7F0E006A
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
- // aapt resource value: 0x7f0b00b7
- public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
+ // aapt resource value: 0x7F0E0066
+ public const int Base_V7_Theme_AppCompat = 2131624038;
- // aapt resource value: 0x7f0b00b8
- public const int Base_V7_Theme_AppCompat_Light = 2131427512;
+ // aapt resource value: 0x7F0E0067
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
- // aapt resource value: 0x7f0b00b9
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
+ // aapt resource value: 0x7F0E0068
+ public const int Base_V7_Theme_AppCompat_Light = 2131624040;
- // aapt resource value: 0x7f0b00ba
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
+ // aapt resource value: 0x7F0E0069
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
- // aapt resource value: 0x7f0b00bb
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
+ // aapt resource value: 0x7F0E006B
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
- // aapt resource value: 0x7f0b00bc
- public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
+ // aapt resource value: 0x7F0E006C
+ public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
- // aapt resource value: 0x7f0b00bd
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
+ // aapt resource value: 0x7F0E006D
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
- // aapt resource value: 0x7f0b00be
- public const int Base_Widget_AppCompat_ActionBar = 2131427518;
+ // aapt resource value: 0x7F0E006E
+ public const int Base_Widget_AppCompat_ActionBar = 2131624046;
- // aapt resource value: 0x7f0b00bf
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
+ // aapt resource value: 0x7F0E006F
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
- // aapt resource value: 0x7f0b00c0
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
+ // aapt resource value: 0x7F0E0070
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
- // aapt resource value: 0x7f0b0061
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
+ // aapt resource value: 0x7F0E0071
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
- // aapt resource value: 0x7f0b0062
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
+ // aapt resource value: 0x7F0E0072
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
- // aapt resource value: 0x7f0b0063
- public const int Base_Widget_AppCompat_ActionButton = 2131427427;
+ // aapt resource value: 0x7F0E0073
+ public const int Base_Widget_AppCompat_ActionButton = 2131624051;
- // aapt resource value: 0x7f0b0064
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
+ // aapt resource value: 0x7F0E0074
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
- // aapt resource value: 0x7f0b0065
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
+ // aapt resource value: 0x7F0E0075
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
- // aapt resource value: 0x7f0b00c1
- public const int Base_Widget_AppCompat_ActionMode = 2131427521;
+ // aapt resource value: 0x7F0E0076
+ public const int Base_Widget_AppCompat_ActionMode = 2131624054;
- // aapt resource value: 0x7f0b00c2
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
+ // aapt resource value: 0x7F0E0077
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
- // aapt resource value: 0x7f0b0025
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
+ // aapt resource value: 0x7F0E0078
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
- // aapt resource value: 0x7f0b0066
- public const int Base_Widget_AppCompat_Button = 2131427430;
+ // aapt resource value: 0x7F0E0079
+ public const int Base_Widget_AppCompat_Button = 2131624057;
- // aapt resource value: 0x7f0b0067
- public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
+ // aapt resource value: 0x7F0E007F
+ public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
- // aapt resource value: 0x7f0b0068
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
+ // aapt resource value: 0x7F0E0080
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
- // aapt resource value: 0x7f0b00c3
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
+ // aapt resource value: 0x7F0E007A
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
- // aapt resource value: 0x7f0b0092
- public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
+ // aapt resource value: 0x7F0E007B
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
- // aapt resource value: 0x7f0b0069
- public const int Base_Widget_AppCompat_Button_Small = 2131427433;
+ // aapt resource value: 0x7F0E007C
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
- // aapt resource value: 0x7f0b006a
- public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
+ // aapt resource value: 0x7F0E007D
+ public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
- // aapt resource value: 0x7f0b00c4
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
+ // aapt resource value: 0x7F0E007E
+ public const int Base_Widget_AppCompat_Button_Small = 2131624062;
- // aapt resource value: 0x7f0b006b
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
+ // aapt resource value: 0x7F0E0081
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
- // aapt resource value: 0x7f0b006c
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
+ // aapt resource value: 0x7F0E0082
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
- // aapt resource value: 0x7f0b00c5
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
+ // aapt resource value: 0x7F0E0083
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
- // aapt resource value: 0x7f0b0000
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
+ // aapt resource value: 0x7F0E0084
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
- // aapt resource value: 0x7f0b00c6
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
+ // aapt resource value: 0x7F0E0085
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
- // aapt resource value: 0x7f0b006d
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
+ // aapt resource value: 0x7F0E0086
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
- // aapt resource value: 0x7f0b0026
- public const int Base_Widget_AppCompat_EditText = 2131427366;
+ // aapt resource value: 0x7F0E0087
+ public const int Base_Widget_AppCompat_EditText = 2131624071;
- // aapt resource value: 0x7f0b006e
- public const int Base_Widget_AppCompat_ImageButton = 2131427438;
+ // aapt resource value: 0x7F0E0088
+ public const int Base_Widget_AppCompat_ImageButton = 2131624072;
- // aapt resource value: 0x7f0b00c7
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
+ // aapt resource value: 0x7F0E0089
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
- // aapt resource value: 0x7f0b00c8
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
+ // aapt resource value: 0x7F0E008A
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
- // aapt resource value: 0x7f0b00c9
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
+ // aapt resource value: 0x7F0E008B
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
- // aapt resource value: 0x7f0b006f
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
+ // aapt resource value: 0x7F0E008C
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
- // aapt resource value: 0x7f0b0070
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
+ // aapt resource value: 0x7F0E008D
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
- // aapt resource value: 0x7f0b0071
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
+ // aapt resource value: 0x7F0E008E
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
- // aapt resource value: 0x7f0b0072
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
+ // aapt resource value: 0x7F0E008F
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
- // aapt resource value: 0x7f0b0073
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
+ // aapt resource value: 0x7F0E0090
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
- // aapt resource value: 0x7f0b00ca
- public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
+ // aapt resource value: 0x7F0E0091
+ public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
- // aapt resource value: 0x7f0b0074
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
+ // aapt resource value: 0x7F0E0092
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
- // aapt resource value: 0x7f0b0075
- public const int Base_Widget_AppCompat_ListView = 2131427445;
+ // aapt resource value: 0x7F0E0093
+ public const int Base_Widget_AppCompat_ListView = 2131624083;
- // aapt resource value: 0x7f0b0076
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
+ // aapt resource value: 0x7F0E0094
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
- // aapt resource value: 0x7f0b0077
- public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
+ // aapt resource value: 0x7F0E0095
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
- // aapt resource value: 0x7f0b0078
- public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
+ // aapt resource value: 0x7F0E0096
+ public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
- // aapt resource value: 0x7f0b0079
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
+ // aapt resource value: 0x7F0E0097
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
- // aapt resource value: 0x7f0b00cb
- public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
+ // aapt resource value: 0x7F0E0098
+ public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
- // aapt resource value: 0x7f0b001c
- public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
+ // aapt resource value: 0x7F0E0099
+ public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
- // aapt resource value: 0x7f0b001d
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
+ // aapt resource value: 0x7F0E009A
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
- // aapt resource value: 0x7f0b007a
- public const int Base_Widget_AppCompat_RatingBar = 2131427450;
+ // aapt resource value: 0x7F0E009B
+ public const int Base_Widget_AppCompat_RatingBar = 2131624091;
- // aapt resource value: 0x7f0b0093
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
+ // aapt resource value: 0x7F0E009C
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
- // aapt resource value: 0x7f0b0094
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
+ // aapt resource value: 0x7F0E009D
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
- // aapt resource value: 0x7f0b00cc
- public const int Base_Widget_AppCompat_SearchView = 2131427532;
+ // aapt resource value: 0x7F0E009E
+ public const int Base_Widget_AppCompat_SearchView = 2131624094;
- // aapt resource value: 0x7f0b00cd
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
+ // aapt resource value: 0x7F0E009F
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
- // aapt resource value: 0x7f0b007b
- public const int Base_Widget_AppCompat_SeekBar = 2131427451;
+ // aapt resource value: 0x7F0E00A0
+ public const int Base_Widget_AppCompat_SeekBar = 2131624096;
- // aapt resource value: 0x7f0b00ce
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
+ // aapt resource value: 0x7F0E00A1
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
- // aapt resource value: 0x7f0b007c
- public const int Base_Widget_AppCompat_Spinner = 2131427452;
+ // aapt resource value: 0x7F0E00A2
+ public const int Base_Widget_AppCompat_Spinner = 2131624098;
- // aapt resource value: 0x7f0b0003
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
+ // aapt resource value: 0x7F0E00A3
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
- // aapt resource value: 0x7f0b007d
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
+ // aapt resource value: 0x7F0E00A4
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
- // aapt resource value: 0x7f0b009c
- public const int Base_Widget_AppCompat_Toolbar = 2131427484;
+ // aapt resource value: 0x7F0E00A5
+ public const int Base_Widget_AppCompat_Toolbar = 2131624101;
- // aapt resource value: 0x7f0b007e
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
+ // aapt resource value: 0x7F0E00A6
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
- // aapt resource value: 0x7f0b0167
- public const int Base_Widget_Design_AppBarLayout = 2131427687;
+ // aapt resource value: 0x7F0E00A7
+ public const int Base_Widget_Design_AppBarLayout = 2131624103;
- // aapt resource value: 0x7f0b016b
- public const int Base_Widget_Design_TabLayout = 2131427691;
+ // aapt resource value: 0x7F0E00A8
+ public const int Base_Widget_Design_TabLayout = 2131624104;
- // aapt resource value: 0x7f0b018a
- public const int BottomSheetDialogAnimation = 2131427722;
+ // aapt resource value: 0x7F0E00A9
+ public const int BottomSheetDialogAnimation = 2131624105;
- // aapt resource value: 0x7f0b018f
- public const int MyTheme = 2131427727;
+ // aapt resource value: 0x7F0E018D
+ public const int custom_dialog2 = 2131624333;
- // aapt resource value: 0x7f0b001e
- public const int Platform_AppCompat = 2131427358;
+ // aapt resource value: 0x7F0E00AA
+ public const int MyTheme = 2131624106;
- // aapt resource value: 0x7f0b001f
- public const int Platform_AppCompat_Light = 2131427359;
+ // aapt resource value: 0x7F0E018E
+ public const int picker_view_scale_anim = 2131624334;
- // aapt resource value: 0x7f0b007f
- public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+ // aapt resource value: 0x7F0E018F
+ public const int picker_view_slide_anim = 2131624335;
- // aapt resource value: 0x7f0b0080
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+ // aapt resource value: 0x7F0E00AB
+ public const int Platform_AppCompat = 2131624107;
- // aapt resource value: 0x7f0b0081
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+ // aapt resource value: 0x7F0E00AC
+ public const int Platform_AppCompat_Light = 2131624108;
- // aapt resource value: 0x7f0b0020
- public const int Platform_V11_AppCompat = 2131427360;
+ // aapt resource value: 0x7F0E00AD
+ public const int Platform_ThemeOverlay_AppCompat = 2131624109;
- // aapt resource value: 0x7f0b0021
- public const int Platform_V11_AppCompat_Light = 2131427361;
+ // aapt resource value: 0x7F0E00AE
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
- // aapt resource value: 0x7f0b0028
- public const int Platform_V14_AppCompat = 2131427368;
+ // aapt resource value: 0x7F0E00AF
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
- // aapt resource value: 0x7f0b0029
- public const int Platform_V14_AppCompat_Light = 2131427369;
+ // aapt resource value: 0x7F0E00B0
+ public const int Platform_V11_AppCompat = 2131624112;
- // aapt resource value: 0x7f0b0082
- public const int Platform_V21_AppCompat = 2131427458;
+ // aapt resource value: 0x7F0E00B1
+ public const int Platform_V11_AppCompat_Light = 2131624113;
- // aapt resource value: 0x7f0b0083
- public const int Platform_V21_AppCompat_Light = 2131427459;
+ // aapt resource value: 0x7F0E00B2
+ public const int Platform_V14_AppCompat = 2131624114;
- // aapt resource value: 0x7f0b0097
- public const int Platform_V25_AppCompat = 2131427479;
+ // aapt resource value: 0x7F0E00B3
+ public const int Platform_V14_AppCompat_Light = 2131624115;
- // aapt resource value: 0x7f0b0098
- public const int Platform_V25_AppCompat_Light = 2131427480;
+ // aapt resource value: 0x7F0E00B4
+ public const int Platform_V21_AppCompat = 2131624116;
- // aapt resource value: 0x7f0b0022
- public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+ // aapt resource value: 0x7F0E00B5
+ public const int Platform_V21_AppCompat_Light = 2131624117;
- // aapt resource value: 0x7f0b002b
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+ // aapt resource value: 0x7F0E00B6
+ public const int Platform_V25_AppCompat = 2131624118;
- // aapt resource value: 0x7f0b002c
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+ // aapt resource value: 0x7F0E00B7
+ public const int Platform_V25_AppCompat_Light = 2131624119;
- // aapt resource value: 0x7f0b002d
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+ // aapt resource value: 0x7F0E00B8
+ public const int Platform_Widget_AppCompat_Spinner = 2131624120;
- // aapt resource value: 0x7f0b002e
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+ // aapt resource value: 0x7F0E00B9
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
- // aapt resource value: 0x7f0b002f
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+ // aapt resource value: 0x7F0E00BA
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
- // aapt resource value: 0x7f0b0030
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+ // aapt resource value: 0x7F0E00BB
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
- // aapt resource value: 0x7f0b0031
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+ // aapt resource value: 0x7F0E00BC
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
- // aapt resource value: 0x7f0b0032
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+ // aapt resource value: 0x7F0E00BD
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
- // aapt resource value: 0x7f0b0033
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+ // aapt resource value: 0x7F0E00BE
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
- // aapt resource value: 0x7f0b0034
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+ // aapt resource value: 0x7F0E00C4
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
- // aapt resource value: 0x7f0b0035
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+ // aapt resource value: 0x7F0E00BF
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
- // aapt resource value: 0x7f0b0036
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+ // aapt resource value: 0x7F0E00C0
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
- // aapt resource value: 0x7f0b0037
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+ // aapt resource value: 0x7F0E00C1
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
- // aapt resource value: 0x7f0b0038
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+ // aapt resource value: 0x7F0E00C2
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
- // aapt resource value: 0x7f0b00cf
- public const int TextAppearance_AppCompat = 2131427535;
+ // aapt resource value: 0x7F0E00C3
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
- // aapt resource value: 0x7f0b00d0
- public const int TextAppearance_AppCompat_Body1 = 2131427536;
+ // aapt resource value: 0x7F0E00C5
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
- // aapt resource value: 0x7f0b00d1
- public const int TextAppearance_AppCompat_Body2 = 2131427537;
+ // aapt resource value: 0x7F0E00C6
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
- // aapt resource value: 0x7f0b00d2
- public const int TextAppearance_AppCompat_Button = 2131427538;
+ // aapt resource value: 0x7F0E00C7
+ public const int TextAppearance_AppCompat = 2131624135;
- // aapt resource value: 0x7f0b00d3
- public const int TextAppearance_AppCompat_Caption = 2131427539;
+ // aapt resource value: 0x7F0E00C8
+ public const int TextAppearance_AppCompat_Body1 = 2131624136;
- // aapt resource value: 0x7f0b00d4
- public const int TextAppearance_AppCompat_Display1 = 2131427540;
+ // aapt resource value: 0x7F0E00C9
+ public const int TextAppearance_AppCompat_Body2 = 2131624137;
- // aapt resource value: 0x7f0b00d5
- public const int TextAppearance_AppCompat_Display2 = 2131427541;
+ // aapt resource value: 0x7F0E00CA
+ public const int TextAppearance_AppCompat_Button = 2131624138;
- // aapt resource value: 0x7f0b00d6
- public const int TextAppearance_AppCompat_Display3 = 2131427542;
+ // aapt resource value: 0x7F0E00CB
+ public const int TextAppearance_AppCompat_Caption = 2131624139;
- // aapt resource value: 0x7f0b00d7
- public const int TextAppearance_AppCompat_Display4 = 2131427543;
+ // aapt resource value: 0x7F0E00CC
+ public const int TextAppearance_AppCompat_Display1 = 2131624140;
- // aapt resource value: 0x7f0b00d8
- public const int TextAppearance_AppCompat_Headline = 2131427544;
+ // aapt resource value: 0x7F0E00CD
+ public const int TextAppearance_AppCompat_Display2 = 2131624141;
- // aapt resource value: 0x7f0b00d9
- public const int TextAppearance_AppCompat_Inverse = 2131427545;
+ // aapt resource value: 0x7F0E00CE
+ public const int TextAppearance_AppCompat_Display3 = 2131624142;
- // aapt resource value: 0x7f0b00da
- public const int TextAppearance_AppCompat_Large = 2131427546;
+ // aapt resource value: 0x7F0E00CF
+ public const int TextAppearance_AppCompat_Display4 = 2131624143;
- // aapt resource value: 0x7f0b00db
- public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
+ // aapt resource value: 0x7F0E00D0
+ public const int TextAppearance_AppCompat_Headline = 2131624144;
- // aapt resource value: 0x7f0b00dc
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
+ // aapt resource value: 0x7F0E00D1
+ public const int TextAppearance_AppCompat_Inverse = 2131624145;
- // aapt resource value: 0x7f0b00dd
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
+ // aapt resource value: 0x7F0E00D2
+ public const int TextAppearance_AppCompat_Large = 2131624146;
- // aapt resource value: 0x7f0b00de
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
+ // aapt resource value: 0x7F0E00D3
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
- // aapt resource value: 0x7f0b00df
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
+ // aapt resource value: 0x7F0E00D4
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
- // aapt resource value: 0x7f0b00e0
- public const int TextAppearance_AppCompat_Medium = 2131427552;
+ // aapt resource value: 0x7F0E00D5
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
- // aapt resource value: 0x7f0b00e1
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
+ // aapt resource value: 0x7F0E00D6
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
- // aapt resource value: 0x7f0b00e2
- public const int TextAppearance_AppCompat_Menu = 2131427554;
+ // aapt resource value: 0x7F0E00D7
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
- // aapt resource value: 0x7f0b0084
- public const int TextAppearance_AppCompat_Notification = 2131427460;
+ // aapt resource value: 0x7F0E00D8
+ public const int TextAppearance_AppCompat_Medium = 2131624152;
- // aapt resource value: 0x7f0b0085
- public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
+ // aapt resource value: 0x7F0E00D9
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
- // aapt resource value: 0x7f0b0086
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
+ // aapt resource value: 0x7F0E00DA
+ public const int TextAppearance_AppCompat_Menu = 2131624154;
- // aapt resource value: 0x7f0b00e3
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
+ // aapt resource value: 0x7F0E00DB
+ public const int TextAppearance_AppCompat_Notification = 2131624155;
- // aapt resource value: 0x7f0b00e4
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
+ // aapt resource value: 0x7F0E00DC
+ public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
- // aapt resource value: 0x7f0b0087
- public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
+ // aapt resource value: 0x7F0E00DD
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
- // aapt resource value: 0x7f0b0088
- public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
+ // aapt resource value: 0x7F0E00DE
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
- // aapt resource value: 0x7f0b0089
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
+ // aapt resource value: 0x7F0E00DF
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
- // aapt resource value: 0x7f0b008a
- public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
+ // aapt resource value: 0x7F0E00E0
+ public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
- // aapt resource value: 0x7f0b008b
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
+ // aapt resource value: 0x7F0E00E1
+ public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
- // aapt resource value: 0x7f0b00e5
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+ // aapt resource value: 0x7F0E00E2
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
- // aapt resource value: 0x7f0b00e6
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+ // aapt resource value: 0x7F0E00E3
+ public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
- // aapt resource value: 0x7f0b00e7
- public const int TextAppearance_AppCompat_Small = 2131427559;
+ // aapt resource value: 0x7F0E00E4
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
- // aapt resource value: 0x7f0b00e8
- public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+ // aapt resource value: 0x7F0E00E5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
- // aapt resource value: 0x7f0b00e9
- public const int TextAppearance_AppCompat_Subhead = 2131427561;
+ // aapt resource value: 0x7F0E00E6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
- // aapt resource value: 0x7f0b00ea
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+ // aapt resource value: 0x7F0E00E7
+ public const int TextAppearance_AppCompat_Small = 2131624167;
- // aapt resource value: 0x7f0b00eb
- public const int TextAppearance_AppCompat_Title = 2131427563;
+ // aapt resource value: 0x7F0E00E8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
- // aapt resource value: 0x7f0b00ec
- public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+ // aapt resource value: 0x7F0E00E9
+ public const int TextAppearance_AppCompat_Subhead = 2131624169;
- // aapt resource value: 0x7f0b002a
- public const int TextAppearance_AppCompat_Tooltip = 2131427370;
+ // aapt resource value: 0x7F0E00EA
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
- // aapt resource value: 0x7f0b00ed
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+ // aapt resource value: 0x7F0E00EB
+ public const int TextAppearance_AppCompat_Title = 2131624171;
- // aapt resource value: 0x7f0b00ee
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+ // aapt resource value: 0x7F0E00EC
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
- // aapt resource value: 0x7f0b00ef
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+ // aapt resource value: 0x7F0E00ED
+ public const int TextAppearance_AppCompat_Tooltip = 2131624173;
- // aapt resource value: 0x7f0b00f0
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+ // aapt resource value: 0x7F0E00EE
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
- // aapt resource value: 0x7f0b00f1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+ // aapt resource value: 0x7F0E00EF
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
- // aapt resource value: 0x7f0b00f2
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+ // aapt resource value: 0x7F0E00F0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
- // aapt resource value: 0x7f0b00f3
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+ // aapt resource value: 0x7F0E00F1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
- // aapt resource value: 0x7f0b00f4
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+ // aapt resource value: 0x7F0E00F2
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
- // aapt resource value: 0x7f0b00f5
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+ // aapt resource value: 0x7F0E00F3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
- // aapt resource value: 0x7f0b00f6
- public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+ // aapt resource value: 0x7F0E00F4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
- // aapt resource value: 0x7f0b00f7
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
+ // aapt resource value: 0x7F0E00F5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
- // aapt resource value: 0x7f0b00f8
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
+ // aapt resource value: 0x7F0E00F6
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
- // aapt resource value: 0x7f0b00f9
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
+ // aapt resource value: 0x7F0E00F7
+ public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
- // aapt resource value: 0x7f0b00fa
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
+ // aapt resource value: 0x7F0E00F8
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
- // aapt resource value: 0x7f0b00fb
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
+ // aapt resource value: 0x7F0E00F9
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
- // aapt resource value: 0x7f0b00fc
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
+ // aapt resource value: 0x7F0E00FA
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
- // aapt resource value: 0x7f0b00fd
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
+ // aapt resource value: 0x7F0E00FB
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
- // aapt resource value: 0x7f0b00fe
- public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
+ // aapt resource value: 0x7F0E00FC
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
- // aapt resource value: 0x7f0b00ff
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
+ // aapt resource value: 0x7F0E00FD
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
- // aapt resource value: 0x7f0b0183
- public const int TextAppearance_Compat_Notification = 2131427715;
+ // aapt resource value: 0x7F0E00FE
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
- // aapt resource value: 0x7f0b0184
- public const int TextAppearance_Compat_Notification_Info = 2131427716;
+ // aapt resource value: 0x7F0E00FF
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
- // aapt resource value: 0x7f0b0160
- public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
+ // aapt resource value: 0x7F0E0100
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
- // aapt resource value: 0x7f0b0189
- public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
+ // aapt resource value: 0x7F0E0101
+ public const int TextAppearance_Compat_Notification = 2131624193;
- // aapt resource value: 0x7f0b0164
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
+ // aapt resource value: 0x7F0E0102
+ public const int TextAppearance_Compat_Notification_Info = 2131624194;
- // aapt resource value: 0x7f0b0161
- public const int TextAppearance_Compat_Notification_Media = 2131427681;
+ // aapt resource value: 0x7F0E0103
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
- // aapt resource value: 0x7f0b0185
- public const int TextAppearance_Compat_Notification_Time = 2131427717;
+ // aapt resource value: 0x7F0E0104
+ public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
- // aapt resource value: 0x7f0b0162
- public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
+ // aapt resource value: 0x7F0E0105
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
- // aapt resource value: 0x7f0b0186
- public const int TextAppearance_Compat_Notification_Title = 2131427718;
+ // aapt resource value: 0x7F0E0106
+ public const int TextAppearance_Compat_Notification_Media = 2131624198;
- // aapt resource value: 0x7f0b0163
- public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
+ // aapt resource value: 0x7F0E0107
+ public const int TextAppearance_Compat_Notification_Time = 2131624199;
- // aapt resource value: 0x7f0b016c
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
+ // aapt resource value: 0x7F0E0108
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
- // aapt resource value: 0x7f0b016d
- public const int TextAppearance_Design_Counter = 2131427693;
+ // aapt resource value: 0x7F0E0109
+ public const int TextAppearance_Compat_Notification_Title = 2131624201;
- // aapt resource value: 0x7f0b016e
- public const int TextAppearance_Design_Counter_Overflow = 2131427694;
+ // aapt resource value: 0x7F0E010A
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
- // aapt resource value: 0x7f0b016f
- public const int TextAppearance_Design_Error = 2131427695;
+ // aapt resource value: 0x7F0E010B
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
- // aapt resource value: 0x7f0b0170
- public const int TextAppearance_Design_Hint = 2131427696;
+ // aapt resource value: 0x7F0E010C
+ public const int TextAppearance_Design_Counter = 2131624204;
- // aapt resource value: 0x7f0b0171
- public const int TextAppearance_Design_Snackbar_Message = 2131427697;
+ // aapt resource value: 0x7F0E010D
+ public const int TextAppearance_Design_Counter_Overflow = 2131624205;
- // aapt resource value: 0x7f0b0172
- public const int TextAppearance_Design_Tab = 2131427698;
+ // aapt resource value: 0x7F0E010E
+ public const int TextAppearance_Design_Error = 2131624206;
- // aapt resource value: 0x7f0b0100
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
+ // aapt resource value: 0x7F0E010F
+ public const int TextAppearance_Design_Hint = 2131624207;
- // aapt resource value: 0x7f0b0101
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
+ // aapt resource value: 0x7F0E0110
+ public const int TextAppearance_Design_Snackbar_Message = 2131624208;
- // aapt resource value: 0x7f0b0102
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
+ // aapt resource value: 0x7F0E0111
+ public const int TextAppearance_Design_Tab = 2131624209;
- // aapt resource value: 0x7f0b0103
- public const int Theme_AppCompat = 2131427587;
+ // aapt resource value: 0x7F0E0112
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
- // aapt resource value: 0x7f0b0104
- public const int Theme_AppCompat_CompactMenu = 2131427588;
+ // aapt resource value: 0x7F0E0113
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
- // aapt resource value: 0x7f0b0004
- public const int Theme_AppCompat_DayNight = 2131427332;
+ // aapt resource value: 0x7F0E0114
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
- // aapt resource value: 0x7f0b0005
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
+ // aapt resource value: 0x7F0E0131
+ public const int ThemeOverlay_AppCompat = 2131624241;
- // aapt resource value: 0x7f0b0006
- public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
+ // aapt resource value: 0x7F0E0132
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
- // aapt resource value: 0x7f0b0007
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
+ // aapt resource value: 0x7F0E0133
+ public const int ThemeOverlay_AppCompat_Dark = 2131624243;
- // aapt resource value: 0x7f0b0008
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
+ // aapt resource value: 0x7F0E0134
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
- // aapt resource value: 0x7f0b0009
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
+ // aapt resource value: 0x7F0E0135
+ public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
- // aapt resource value: 0x7f0b000a
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
+ // aapt resource value: 0x7F0E0136
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
- // aapt resource value: 0x7f0b0105
- public const int Theme_AppCompat_Dialog = 2131427589;
+ // aapt resource value: 0x7F0E0137
+ public const int ThemeOverlay_AppCompat_Light = 2131624247;
- // aapt resource value: 0x7f0b0106
- public const int Theme_AppCompat_Dialog_Alert = 2131427590;
+ // aapt resource value: 0x7F0E0115
+ public const int Theme_AppCompat = 2131624213;
- // aapt resource value: 0x7f0b0107
- public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
+ // aapt resource value: 0x7F0E0116
+ public const int Theme_AppCompat_CompactMenu = 2131624214;
- // aapt resource value: 0x7f0b0108
- public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
+ // aapt resource value: 0x7F0E0117
+ public const int Theme_AppCompat_DayNight = 2131624215;
- // aapt resource value: 0x7f0b0109
- public const int Theme_AppCompat_Light = 2131427593;
+ // aapt resource value: 0x7F0E0118
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
- // aapt resource value: 0x7f0b010a
- public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
+ // aapt resource value: 0x7F0E0119
+ public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
- // aapt resource value: 0x7f0b010b
- public const int Theme_AppCompat_Light_Dialog = 2131427595;
+ // aapt resource value: 0x7F0E011C
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
- // aapt resource value: 0x7f0b010c
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
+ // aapt resource value: 0x7F0E011A
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
- // aapt resource value: 0x7f0b010d
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
+ // aapt resource value: 0x7F0E011B
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
- // aapt resource value: 0x7f0b010e
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
+ // aapt resource value: 0x7F0E011D
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
- // aapt resource value: 0x7f0b010f
- public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
+ // aapt resource value: 0x7F0E011E
+ public const int Theme_AppCompat_Dialog = 2131624222;
- // aapt resource value: 0x7f0b0110
- public const int Theme_AppCompat_NoActionBar = 2131427600;
+ // aapt resource value: 0x7F0E0121
+ public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
- // aapt resource value: 0x7f0b018b
- public const int Theme_BiometricPromptDialog = 2131427723;
+ // aapt resource value: 0x7F0E011F
+ public const int Theme_AppCompat_Dialog_Alert = 2131624223;
- // aapt resource value: 0x7f0b0173
- public const int Theme_Design = 2131427699;
+ // aapt resource value: 0x7F0E0120
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
- // aapt resource value: 0x7f0b0174
- public const int Theme_Design_BottomSheetDialog = 2131427700;
+ // aapt resource value: 0x7F0E0122
+ public const int Theme_AppCompat_Light = 2131624226;
- // aapt resource value: 0x7f0b0175
- public const int Theme_Design_Light = 2131427701;
+ // aapt resource value: 0x7F0E0123
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
- // aapt resource value: 0x7f0b0176
- public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
+ // aapt resource value: 0x7F0E0124
+ public const int Theme_AppCompat_Light_Dialog = 2131624228;
- // aapt resource value: 0x7f0b0177
- public const int Theme_Design_Light_NoActionBar = 2131427703;
+ // aapt resource value: 0x7F0E0127
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
- // aapt resource value: 0x7f0b0178
- public const int Theme_Design_NoActionBar = 2131427704;
+ // aapt resource value: 0x7F0E0125
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
- // aapt resource value: 0x7f0b0111
- public const int ThemeOverlay_AppCompat = 2131427601;
+ // aapt resource value: 0x7F0E0126
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
- // aapt resource value: 0x7f0b0112
- public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
+ // aapt resource value: 0x7F0E0128
+ public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
- // aapt resource value: 0x7f0b0113
- public const int ThemeOverlay_AppCompat_Dark = 2131427603;
+ // aapt resource value: 0x7F0E0129
+ public const int Theme_AppCompat_NoActionBar = 2131624233;
- // aapt resource value: 0x7f0b0114
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
+ // aapt resource value: 0x7F0E012A
+ public const int Theme_BiometricPromptDialog = 2131624234;
- // aapt resource value: 0x7f0b0115
- public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
+ // aapt resource value: 0x7F0E012B
+ public const int Theme_Design = 2131624235;
- // aapt resource value: 0x7f0b0116
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
+ // aapt resource value: 0x7F0E012C
+ public const int Theme_Design_BottomSheetDialog = 2131624236;
- // aapt resource value: 0x7f0b0117
- public const int ThemeOverlay_AppCompat_Light = 2131427607;
+ // aapt resource value: 0x7F0E012D
+ public const int Theme_Design_Light = 2131624237;
- // aapt resource value: 0x7f0b0118
- public const int Widget_AppCompat_ActionBar = 2131427608;
+ // aapt resource value: 0x7F0E012E
+ public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
- // aapt resource value: 0x7f0b0119
- public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
+ // aapt resource value: 0x7F0E012F
+ public const int Theme_Design_Light_NoActionBar = 2131624239;
- // aapt resource value: 0x7f0b011a
- public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
+ // aapt resource value: 0x7F0E0130
+ public const int Theme_Design_NoActionBar = 2131624240;
- // aapt resource value: 0x7f0b011b
- public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
+ // aapt resource value: 0x7F0E0138
+ public const int Widget_AppCompat_ActionBar = 2131624248;
- // aapt resource value: 0x7f0b011c
- public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
+ // aapt resource value: 0x7F0E0139
+ public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
- // aapt resource value: 0x7f0b011d
- public const int Widget_AppCompat_ActionButton = 2131427613;
+ // aapt resource value: 0x7F0E013A
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
- // aapt resource value: 0x7f0b011e
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
+ // aapt resource value: 0x7F0E013B
+ public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
- // aapt resource value: 0x7f0b011f
- public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
+ // aapt resource value: 0x7F0E013C
+ public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
- // aapt resource value: 0x7f0b0120
- public const int Widget_AppCompat_ActionMode = 2131427616;
+ // aapt resource value: 0x7F0E013D
+ public const int Widget_AppCompat_ActionButton = 2131624253;
- // aapt resource value: 0x7f0b0121
- public const int Widget_AppCompat_ActivityChooserView = 2131427617;
+ // aapt resource value: 0x7F0E013E
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
- // aapt resource value: 0x7f0b0122
- public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
+ // aapt resource value: 0x7F0E013F
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
- // aapt resource value: 0x7f0b0123
- public const int Widget_AppCompat_Button = 2131427619;
+ // aapt resource value: 0x7F0E0140
+ public const int Widget_AppCompat_ActionMode = 2131624256;
- // aapt resource value: 0x7f0b0124
- public const int Widget_AppCompat_Button_Borderless = 2131427620;
+ // aapt resource value: 0x7F0E0141
+ public const int Widget_AppCompat_ActivityChooserView = 2131624257;
- // aapt resource value: 0x7f0b0125
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
+ // aapt resource value: 0x7F0E0142
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
- // aapt resource value: 0x7f0b0126
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
+ // aapt resource value: 0x7F0E0143
+ public const int Widget_AppCompat_Button = 2131624259;
- // aapt resource value: 0x7f0b0127
- public const int Widget_AppCompat_Button_Colored = 2131427623;
+ // aapt resource value: 0x7F0E0149
+ public const int Widget_AppCompat_ButtonBar = 2131624265;
- // aapt resource value: 0x7f0b0128
- public const int Widget_AppCompat_Button_Small = 2131427624;
+ // aapt resource value: 0x7F0E014A
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
- // aapt resource value: 0x7f0b0129
- public const int Widget_AppCompat_ButtonBar = 2131427625;
+ // aapt resource value: 0x7F0E0144
+ public const int Widget_AppCompat_Button_Borderless = 2131624260;
- // aapt resource value: 0x7f0b012a
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
+ // aapt resource value: 0x7F0E0145
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
- // aapt resource value: 0x7f0b012b
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
+ // aapt resource value: 0x7F0E0146
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
- // aapt resource value: 0x7f0b012c
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
+ // aapt resource value: 0x7F0E0147
+ public const int Widget_AppCompat_Button_Colored = 2131624263;
- // aapt resource value: 0x7f0b012d
- public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
+ // aapt resource value: 0x7F0E0148
+ public const int Widget_AppCompat_Button_Small = 2131624264;
- // aapt resource value: 0x7f0b012e
- public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
+ // aapt resource value: 0x7F0E014B
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
- // aapt resource value: 0x7f0b012f
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
+ // aapt resource value: 0x7F0E014C
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
- // aapt resource value: 0x7f0b0130
- public const int Widget_AppCompat_EditText = 2131427632;
+ // aapt resource value: 0x7F0E014D
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
- // aapt resource value: 0x7f0b0131
- public const int Widget_AppCompat_ImageButton = 2131427633;
+ // aapt resource value: 0x7F0E014E
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
- // aapt resource value: 0x7f0b0132
- public const int Widget_AppCompat_Light_ActionBar = 2131427634;
+ // aapt resource value: 0x7F0E014F
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
- // aapt resource value: 0x7f0b0133
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
+ // aapt resource value: 0x7F0E0150
+ public const int Widget_AppCompat_EditText = 2131624272;
- // aapt resource value: 0x7f0b0134
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
+ // aapt resource value: 0x7F0E0151
+ public const int Widget_AppCompat_ImageButton = 2131624273;
- // aapt resource value: 0x7f0b0135
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
+ // aapt resource value: 0x7F0E0152
+ public const int Widget_AppCompat_Light_ActionBar = 2131624274;
- // aapt resource value: 0x7f0b0136
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
+ // aapt resource value: 0x7F0E0153
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
- // aapt resource value: 0x7f0b0137
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
+ // aapt resource value: 0x7F0E0154
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
- // aapt resource value: 0x7f0b0138
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
+ // aapt resource value: 0x7F0E0155
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
- // aapt resource value: 0x7f0b0139
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
+ // aapt resource value: 0x7F0E0156
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
- // aapt resource value: 0x7f0b013a
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
+ // aapt resource value: 0x7F0E0157
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
- // aapt resource value: 0x7f0b013b
- public const int Widget_AppCompat_Light_ActionButton = 2131427643;
+ // aapt resource value: 0x7F0E0158
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
- // aapt resource value: 0x7f0b013c
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
+ // aapt resource value: 0x7F0E0159
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
- // aapt resource value: 0x7f0b013d
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
+ // aapt resource value: 0x7F0E015A
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
- // aapt resource value: 0x7f0b013e
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
+ // aapt resource value: 0x7F0E015B
+ public const int Widget_AppCompat_Light_ActionButton = 2131624283;
- // aapt resource value: 0x7f0b013f
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
+ // aapt resource value: 0x7F0E015C
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
- // aapt resource value: 0x7f0b0140
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
+ // aapt resource value: 0x7F0E015D
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
- // aapt resource value: 0x7f0b0141
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
+ // aapt resource value: 0x7F0E015E
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
- // aapt resource value: 0x7f0b0142
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
+ // aapt resource value: 0x7F0E015F
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
- // aapt resource value: 0x7f0b0143
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
+ // aapt resource value: 0x7F0E0160
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
- // aapt resource value: 0x7f0b0144
- public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
+ // aapt resource value: 0x7F0E0161
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
- // aapt resource value: 0x7f0b0145
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
+ // aapt resource value: 0x7F0E0162
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
- // aapt resource value: 0x7f0b0146
- public const int Widget_AppCompat_Light_SearchView = 2131427654;
+ // aapt resource value: 0x7F0E0163
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
- // aapt resource value: 0x7f0b0147
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
+ // aapt resource value: 0x7F0E0164
+ public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
- // aapt resource value: 0x7f0b0148
- public const int Widget_AppCompat_ListMenuView = 2131427656;
+ // aapt resource value: 0x7F0E0165
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
- // aapt resource value: 0x7f0b0149
- public const int Widget_AppCompat_ListPopupWindow = 2131427657;
+ // aapt resource value: 0x7F0E0166
+ public const int Widget_AppCompat_Light_SearchView = 2131624294;
- // aapt resource value: 0x7f0b014a
- public const int Widget_AppCompat_ListView = 2131427658;
+ // aapt resource value: 0x7F0E0167
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
- // aapt resource value: 0x7f0b014b
- public const int Widget_AppCompat_ListView_DropDown = 2131427659;
+ // aapt resource value: 0x7F0E0168
+ public const int Widget_AppCompat_ListMenuView = 2131624296;
- // aapt resource value: 0x7f0b014c
- public const int Widget_AppCompat_ListView_Menu = 2131427660;
+ // aapt resource value: 0x7F0E0169
+ public const int Widget_AppCompat_ListPopupWindow = 2131624297;
- // aapt resource value: 0x7f0b014d
- public const int Widget_AppCompat_PopupMenu = 2131427661;
+ // aapt resource value: 0x7F0E016A
+ public const int Widget_AppCompat_ListView = 2131624298;
- // aapt resource value: 0x7f0b014e
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
+ // aapt resource value: 0x7F0E016B
+ public const int Widget_AppCompat_ListView_DropDown = 2131624299;
- // aapt resource value: 0x7f0b014f
- public const int Widget_AppCompat_PopupWindow = 2131427663;
+ // aapt resource value: 0x7F0E016C
+ public const int Widget_AppCompat_ListView_Menu = 2131624300;
- // aapt resource value: 0x7f0b0150
- public const int Widget_AppCompat_ProgressBar = 2131427664;
+ // aapt resource value: 0x7F0E016D
+ public const int Widget_AppCompat_PopupMenu = 2131624301;
- // aapt resource value: 0x7f0b0151
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
+ // aapt resource value: 0x7F0E016E
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
- // aapt resource value: 0x7f0b0152
- public const int Widget_AppCompat_RatingBar = 2131427666;
+ // aapt resource value: 0x7F0E016F
+ public const int Widget_AppCompat_PopupWindow = 2131624303;
- // aapt resource value: 0x7f0b0153
- public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
+ // aapt resource value: 0x7F0E0170
+ public const int Widget_AppCompat_ProgressBar = 2131624304;
- // aapt resource value: 0x7f0b0154
- public const int Widget_AppCompat_RatingBar_Small = 2131427668;
+ // aapt resource value: 0x7F0E0171
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
- // aapt resource value: 0x7f0b0155
- public const int Widget_AppCompat_SearchView = 2131427669;
+ // aapt resource value: 0x7F0E0172
+ public const int Widget_AppCompat_RatingBar = 2131624306;
- // aapt resource value: 0x7f0b0156
- public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
+ // aapt resource value: 0x7F0E0173
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
- // aapt resource value: 0x7f0b0157
- public const int Widget_AppCompat_SeekBar = 2131427671;
+ // aapt resource value: 0x7F0E0174
+ public const int Widget_AppCompat_RatingBar_Small = 2131624308;
- // aapt resource value: 0x7f0b0158
- public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
+ // aapt resource value: 0x7F0E0175
+ public const int Widget_AppCompat_SearchView = 2131624309;
- // aapt resource value: 0x7f0b0159
- public const int Widget_AppCompat_Spinner = 2131427673;
+ // aapt resource value: 0x7F0E0176
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
- // aapt resource value: 0x7f0b015a
- public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
+ // aapt resource value: 0x7F0E0177
+ public const int Widget_AppCompat_SeekBar = 2131624311;
- // aapt resource value: 0x7f0b015b
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
+ // aapt resource value: 0x7F0E0178
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
- // aapt resource value: 0x7f0b015c
- public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
+ // aapt resource value: 0x7F0E0179
+ public const int Widget_AppCompat_Spinner = 2131624313;
- // aapt resource value: 0x7f0b015d
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
+ // aapt resource value: 0x7F0E017A
+ public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
- // aapt resource value: 0x7f0b015e
- public const int Widget_AppCompat_Toolbar = 2131427678;
+ // aapt resource value: 0x7F0E017B
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
- // aapt resource value: 0x7f0b015f
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
+ // aapt resource value: 0x7F0E017C
+ public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
- // aapt resource value: 0x7f0b0187
- public const int Widget_Compat_NotificationActionContainer = 2131427719;
+ // aapt resource value: 0x7F0E017D
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
- // aapt resource value: 0x7f0b0188
- public const int Widget_Compat_NotificationActionText = 2131427720;
+ // aapt resource value: 0x7F0E017E
+ public const int Widget_AppCompat_Toolbar = 2131624318;
- // aapt resource value: 0x7f0b0179
- public const int Widget_Design_AppBarLayout = 2131427705;
+ // aapt resource value: 0x7F0E017F
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
- // aapt resource value: 0x7f0b017a
- public const int Widget_Design_BottomNavigationView = 2131427706;
+ // aapt resource value: 0x7F0E0180
+ public const int Widget_Compat_NotificationActionContainer = 2131624320;
- // aapt resource value: 0x7f0b017b
- public const int Widget_Design_BottomSheet_Modal = 2131427707;
+ // aapt resource value: 0x7F0E0181
+ public const int Widget_Compat_NotificationActionText = 2131624321;
- // aapt resource value: 0x7f0b017c
- public const int Widget_Design_CollapsingToolbar = 2131427708;
+ // aapt resource value: 0x7F0E0182
+ public const int Widget_Design_AppBarLayout = 2131624322;
- // aapt resource value: 0x7f0b017d
- public const int Widget_Design_CoordinatorLayout = 2131427709;
+ // aapt resource value: 0x7F0E0183
+ public const int Widget_Design_BottomNavigationView = 2131624323;
- // aapt resource value: 0x7f0b017e
- public const int Widget_Design_FloatingActionButton = 2131427710;
+ // aapt resource value: 0x7F0E0184
+ public const int Widget_Design_BottomSheet_Modal = 2131624324;
- // aapt resource value: 0x7f0b017f
- public const int Widget_Design_NavigationView = 2131427711;
+ // aapt resource value: 0x7F0E0185
+ public const int Widget_Design_CollapsingToolbar = 2131624325;
- // aapt resource value: 0x7f0b0180
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
+ // aapt resource value: 0x7F0E0186
+ public const int Widget_Design_CoordinatorLayout = 2131624326;
- // aapt resource value: 0x7f0b0181
- public const int Widget_Design_Snackbar = 2131427713;
+ // aapt resource value: 0x7F0E0187
+ public const int Widget_Design_FloatingActionButton = 2131624327;
- // aapt resource value: 0x7f0b0165
- public const int Widget_Design_TabLayout = 2131427685;
+ // aapt resource value: 0x7F0E0188
+ public const int Widget_Design_NavigationView = 2131624328;
- // aapt resource value: 0x7f0b0182
- public const int Widget_Design_TextInputLayout = 2131427714;
+ // aapt resource value: 0x7F0E0189
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
- // aapt resource value: 0x7f0b018c
- public const int custom_dialog2 = 2131427724;
+ // aapt resource value: 0x7F0E018A
+ public const int Widget_Design_Snackbar = 2131624330;
- // aapt resource value: 0x7f0b018d
- public const int picker_view_scale_anim = 2131427725;
+ // aapt resource value: 0x7F0E018B
+ public const int Widget_Design_TabLayout = 2131624331;
- // aapt resource value: 0x7f0b018e
- public const int picker_view_slide_anim = 2131427726;
+ // aapt resource value: 0x7F0E018C
+ public const int Widget_Design_TextInputLayout = 2131624332;
static Style()
{
@@ -5460,204 +5489,193 @@
}
}
- 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[] {
- 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};
+ 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};
- // aapt resource value: 10
- public const int ActionBar_background = 10;
-
- // aapt resource value: 12
- public const int ActionBar_backgroundSplit = 12;
-
- // aapt resource value: 11
- public const int ActionBar_backgroundStacked = 11;
-
- // aapt resource value: 21
- public const int ActionBar_contentInsetEnd = 21;
-
- // aapt resource value: 25
- public const int ActionBar_contentInsetEndWithActions = 25;
-
- // aapt resource value: 22
- public const int ActionBar_contentInsetLeft = 22;
-
- // aapt resource value: 23
- public const int ActionBar_contentInsetRight = 23;
-
- // aapt resource value: 20
- public const int ActionBar_contentInsetStart = 20;
-
- // aapt resource value: 24
- public const int ActionBar_contentInsetStartWithNavigation = 24;
-
- // aapt resource value: 13
- public const int ActionBar_customNavigationLayout = 13;
-
- // aapt resource value: 3
- public const int ActionBar_displayOptions = 3;
-
- // aapt resource value: 9
- public const int ActionBar_divider = 9;
-
- // aapt resource value: 26
- public const int ActionBar_elevation = 26;
-
- // aapt resource value: 0
- public const int ActionBar_height = 0;
-
- // aapt resource value: 19
- public const int ActionBar_hideOnContentScroll = 19;
-
- // aapt resource value: 28
- public const int ActionBar_homeAsUpIndicator = 28;
-
- // aapt resource value: 14
- public const int ActionBar_homeLayout = 14;
-
- // aapt resource value: 7
- public const int ActionBar_icon = 7;
-
- // aapt resource value: 16
- public const int ActionBar_indeterminateProgressStyle = 16;
-
- // aapt resource value: 18
- public const int ActionBar_itemPadding = 18;
-
- // aapt resource value: 8
- public const int ActionBar_logo = 8;
-
- // aapt resource value: 2
- public const int ActionBar_navigationMode = 2;
-
- // aapt resource value: 27
- public const int ActionBar_popupTheme = 27;
-
- // aapt resource value: 17
- public const int ActionBar_progressBarPadding = 17;
-
- // aapt resource value: 15
- public const int ActionBar_progressBarStyle = 15;
-
- // aapt resource value: 4
- public const int ActionBar_subtitle = 4;
-
- // aapt resource value: 6
- public const int ActionBar_subtitleTextStyle = 6;
-
- // aapt resource value: 1
- public const int ActionBar_title = 1;
-
- // aapt resource value: 5
- public const int ActionBar_titleTextStyle = 5;
-
+ // aapt resource value: { 0x10100B3 }
public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
+ // aapt resource value: 0
+ public const int ActionBar_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionBar_backgroundSplit = 1;
+
+ // aapt resource value: 2
+ public const int ActionBar_backgroundStacked = 2;
+
+ // aapt resource value: 3
+ public const int ActionBar_contentInsetEnd = 3;
+
+ // aapt resource value: 4
+ public const int ActionBar_contentInsetEndWithActions = 4;
+
+ // aapt resource value: 5
+ public const int ActionBar_contentInsetLeft = 5;
+
+ // aapt resource value: 6
+ public const int ActionBar_contentInsetRight = 6;
+
+ // aapt resource value: 7
+ public const int ActionBar_contentInsetStart = 7;
+
+ // aapt resource value: 8
+ public const int ActionBar_contentInsetStartWithNavigation = 8;
+
+ // aapt resource value: 9
+ public const int ActionBar_customNavigationLayout = 9;
+
+ // aapt resource value: 10
+ public const int ActionBar_displayOptions = 10;
+
+ // aapt resource value: 11
+ public const int ActionBar_divider = 11;
+
+ // aapt resource value: 12
+ public const int ActionBar_elevation = 12;
+
+ // aapt resource value: 13
+ public const int ActionBar_height = 13;
+
+ // aapt resource value: 14
+ public const int ActionBar_hideOnContentScroll = 14;
+
+ // aapt resource value: 15
+ public const int ActionBar_homeAsUpIndicator = 15;
+
+ // aapt resource value: 16
+ public const int ActionBar_homeLayout = 16;
+
+ // aapt resource value: 17
+ public const int ActionBar_icon = 17;
+
+ // aapt resource value: 18
+ public const int ActionBar_indeterminateProgressStyle = 18;
+
+ // aapt resource value: 19
+ public const int ActionBar_itemPadding = 19;
+
+ // aapt resource value: 20
+ public const int ActionBar_logo = 20;
+
+ // aapt resource value: 21
+ public const int ActionBar_navigationMode = 21;
+
+ // aapt resource value: 22
+ public const int ActionBar_popupTheme = 22;
+
+ // aapt resource value: 23
+ public const int ActionBar_progressBarPadding = 23;
+
+ // aapt resource value: 24
+ public const int ActionBar_progressBarStyle = 24;
+
+ // aapt resource value: 25
+ public const int ActionBar_subtitle = 25;
+
+ // aapt resource value: 26
+ public const int ActionBar_subtitleTextStyle = 26;
+
+ // aapt resource value: 27
+ public const int ActionBar_title = 27;
+
+ // aapt resource value: 28
+ public const int ActionBar_titleTextStyle = 28;
+
+ // aapt resource value: { 0x101013F }
public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
public const int ActionMenuItemView_android_minWidth = 0;
- public static int[] ActionMenuView;
+ // aapt resource value: { 0xFFFFFFFF }
+ public static int[] ActionMenuView = new int[] {
+ -1};
+ // aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
public static int[] ActionMode = new int[] {
- 2130771978,
- 2130771984,
- 2130771985,
- 2130771989,
- 2130771991,
- 2130772007};
-
- // aapt resource value: 3
- public const int ActionMode_background = 3;
-
- // aapt resource value: 4
- public const int ActionMode_backgroundSplit = 4;
-
- // aapt resource value: 5
- public const int ActionMode_closeItemLayout = 5;
+ 2130968642,
+ 2130968643,
+ 2130968672,
+ 2130968756,
+ 2130968939,
+ 2130968993};
// aapt resource value: 0
- public const int ActionMode_height = 0;
+ public const int ActionMode_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionMode_backgroundSplit = 1;
// aapt resource value: 2
- public const int ActionMode_subtitleTextStyle = 2;
+ public const int ActionMode_closeItemLayout = 2;
- // aapt resource value: 1
- public const int ActionMode_titleTextStyle = 1;
+ // aapt resource value: 3
+ public const int ActionMode_height = 3;
+ // aapt resource value: 4
+ public const int ActionMode_subtitleTextStyle = 4;
+
+ // aapt resource value: 5
+ public const int ActionMode_titleTextStyle = 5;
+
+ // aapt resource value: { 0x7F040096,0x7F0400C1 }
public static int[] ActivityChooserView = new int[] {
- 2130772008,
- 2130772009};
-
- // aapt resource value: 1
- public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+ 2130968726,
+ 2130968769};
// aapt resource value: 0
- public const int ActivityChooserView_initialActivityCount = 0;
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+ // aapt resource value: 1
+ public const int ActivityChooserView_initialActivityCount = 1;
+
+ // aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
public static int[] AlertDialog = new int[] {
16842994,
- 2130772010,
- 2130772011,
- 2130772012,
- 2130772013,
- 2130772014,
- 2130772015};
+ 2130968664,
+ 2130968794,
+ 2130968795,
+ 2130968809,
+ 2130968855,
+ 2130968856};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -5665,27 +5683,39 @@
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
- // aapt resource value: 5
- public const int AlertDialog_listItemLayout = 5;
-
// aapt resource value: 2
- public const int AlertDialog_listLayout = 2;
+ public const int AlertDialog_listItemLayout = 2;
// aapt resource value: 3
- public const int AlertDialog_multiChoiceItemLayout = 3;
-
- // aapt resource value: 6
- public const int AlertDialog_showTitle = 6;
+ public const int AlertDialog_listLayout = 3;
// aapt resource value: 4
- public const int AlertDialog_singleChoiceItemLayout = 4;
+ public const int AlertDialog_multiChoiceItemLayout = 4;
+ // aapt resource value: 5
+ public const int AlertDialog_showTitle = 5;
+
+ // aapt resource value: 6
+ public const int AlertDialog_singleChoiceItemLayout = 6;
+
+ // aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
public static int[] AppBarLayout = new int[] {
16842964,
16843919,
16844096,
- 2130772005,
- 2130772223};
+ 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;
// aapt resource value: 0
public const int AppBarLayout_android_background = 0;
@@ -5702,19 +5732,10 @@
// aapt resource value: 4
public const int AppBarLayout_expanded = 4;
- public static int[] AppBarLayoutStates = new int[] {
- 2130772224,
- 2130772225};
-
- // aapt resource value: 0
- public const int AppBarLayoutStates_state_collapsed = 0;
-
- // aapt resource value: 1
- public const int AppBarLayoutStates_state_collapsible = 1;
-
+ // aapt resource value: { 0x7F0400D4,0x7F0400D5 }
public static int[] AppBarLayout_Layout = new int[] {
- 2130772226,
- 2130772227};
+ 2130968788,
+ 2130968789};
// aapt resource value: 0
public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -5722,11 +5743,12 @@
// 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,
- 2130772016,
- 2130772017,
- 2130772018};
+ 2130968862,
+ 2130968981,
+ 2130968982};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -5740,11 +5762,12 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
+ // aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130772019,
- 2130772020,
- 2130772021};
+ 2130968978,
+ 2130968979,
+ 2130968980};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -5758,6 +5781,7 @@
// aapt resource value: 3
public const int AppCompatSeekBar_tickMarkTintMode = 3;
+ // aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
public static int[] AppCompatTextHelper = new int[] {
16842804,
16843117,
@@ -5788,265 +5812,267 @@
// 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,
- 2130772022,
- 2130772023,
- 2130772024,
- 2130772025,
- 2130772026,
- 2130772027,
- 2130772028};
+ 2130968637,
+ 2130968638,
+ 2130968639,
+ 2130968640,
+ 2130968641,
+ 2130968742,
+ 2130968961};
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
- // aapt resource value: 6
- public const int AppCompatTextView_autoSizeMaxTextSize = 6;
-
- // aapt resource value: 5
- public const int AppCompatTextView_autoSizeMinTextSize = 5;
-
- // aapt resource value: 4
- public const int AppCompatTextView_autoSizePresetSizes = 4;
-
- // aapt resource value: 3
- public const int AppCompatTextView_autoSizeStepGranularity = 3;
+ // aapt resource value: 1
+ public const int AppCompatTextView_autoSizeMaxTextSize = 1;
// aapt resource value: 2
- public const int AppCompatTextView_autoSizeTextType = 2;
+ public const int AppCompatTextView_autoSizeMinTextSize = 2;
+
+ // aapt resource value: 3
+ public const int AppCompatTextView_autoSizePresetSizes = 3;
+
+ // aapt resource value: 4
+ public const int AppCompatTextView_autoSizeStepGranularity = 4;
+
+ // aapt resource value: 5
+ public const int AppCompatTextView_autoSizeTextType = 5;
+
+ // aapt resource value: 6
+ public const int AppCompatTextView_fontFamily = 6;
// aapt resource value: 7
- public const int AppCompatTextView_fontFamily = 7;
+ public const int AppCompatTextView_textAllCaps = 7;
- // aapt resource value: 1
- public const int AppCompatTextView_textAllCaps = 1;
-
+ // aapt resource value: { 0x1010057,0x10100AE,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 }
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 2130772029,
- 2130772030,
- 2130772031,
- 2130772032,
- 2130772033,
- 2130772034,
- 2130772035,
- 2130772036,
- 2130772037,
- 2130772038,
- 2130772039,
- 2130772040,
- 2130772041,
- 2130772042,
- 2130772043,
- 2130772044,
- 2130772045,
- 2130772046,
- 2130772047,
- 2130772048,
- 2130772049,
- 2130772050,
- 2130772051,
- 2130772052,
- 2130772053,
- 2130772054,
- 2130772055,
- 2130772056,
- 2130772057,
- 2130772058,
- 2130772059,
- 2130772060,
- 2130772061,
- 2130772062,
- 2130772063,
- 2130772064,
- 2130772065,
- 2130772066,
- 2130772067,
- 2130772068,
- 2130772069,
- 2130772070,
- 2130772071,
- 2130772072,
- 2130772073,
- 2130772074,
- 2130772075,
- 2130772076,
- 2130772077,
- 2130772078,
- 2130772079,
- 2130772080,
- 2130772081,
- 2130772082,
- 2130772083,
- 2130772084,
- 2130772085,
- 2130772086,
- 2130772087,
- 2130772088,
- 2130772089,
- 2130772090,
- 2130772091,
- 2130772092,
- 2130772093,
- 2130772094,
- 2130772095,
- 2130772096,
- 2130772097,
- 2130772098,
- 2130772099,
- 2130772100,
- 2130772101,
- 2130772102,
- 2130772103,
- 2130772104,
- 2130772105,
- 2130772106,
- 2130772107,
- 2130772108,
- 2130772109,
- 2130772110,
- 2130772111,
- 2130772112,
- 2130772113,
- 2130772114,
- 2130772115,
- 2130772116,
- 2130772117,
- 2130772118,
- 2130772119,
- 2130772120,
- 2130772121,
- 2130772122,
- 2130772123,
- 2130772124,
- 2130772125,
- 2130772126,
- 2130772127,
- 2130772128,
- 2130772129,
- 2130772130,
- 2130772131,
- 2130772132,
- 2130772133,
- 2130772134,
- 2130772135,
- 2130772136,
- 2130772137,
- 2130772138,
- 2130772139,
- 2130772140,
- 2130772141,
- 2130772142,
- 2130772143,
- 2130772144,
- 2130772145};
+ 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: 23
- public const int AppCompatTheme_actionBarDivider = 23;
+ // aapt resource value: 2
+ public const int AppCompatTheme_actionBarDivider = 2;
- // aapt resource value: 24
- public const int AppCompatTheme_actionBarItemBackground = 24;
+ // aapt resource value: 3
+ public const int AppCompatTheme_actionBarItemBackground = 3;
- // aapt resource value: 17
- public const int AppCompatTheme_actionBarPopupTheme = 17;
+ // aapt resource value: 4
+ public const int AppCompatTheme_actionBarPopupTheme = 4;
- // aapt resource value: 22
- public const int AppCompatTheme_actionBarSize = 22;
+ // aapt resource value: 5
+ public const int AppCompatTheme_actionBarSize = 5;
- // aapt resource value: 19
- public const int AppCompatTheme_actionBarSplitStyle = 19;
+ // aapt resource value: 6
+ public const int AppCompatTheme_actionBarSplitStyle = 6;
- // aapt resource value: 18
- public const int AppCompatTheme_actionBarStyle = 18;
+ // aapt resource value: 7
+ public const int AppCompatTheme_actionBarStyle = 7;
- // aapt resource value: 13
- public const int AppCompatTheme_actionBarTabBarStyle = 13;
+ // aapt resource value: 8
+ public const int AppCompatTheme_actionBarTabBarStyle = 8;
+
+ // aapt resource value: 9
+ public const int AppCompatTheme_actionBarTabStyle = 9;
+
+ // aapt resource value: 10
+ public const int AppCompatTheme_actionBarTabTextStyle = 10;
+
+ // aapt resource value: 11
+ public const int AppCompatTheme_actionBarTheme = 11;
// aapt resource value: 12
- public const int AppCompatTheme_actionBarTabStyle = 12;
+ public const int AppCompatTheme_actionBarWidgetTheme = 12;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionButtonStyle = 13;
// aapt resource value: 14
- public const int AppCompatTheme_actionBarTabTextStyle = 14;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionBarTheme = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionBarWidgetTheme = 21;
-
- // aapt resource value: 50
- public const int AppCompatTheme_actionButtonStyle = 50;
-
- // aapt resource value: 46
- public const int AppCompatTheme_actionDropDownStyle = 46;
-
- // aapt resource value: 25
- public const int AppCompatTheme_actionMenuTextAppearance = 25;
-
- // aapt resource value: 26
- public const int AppCompatTheme_actionMenuTextColor = 26;
-
- // aapt resource value: 29
- public const int AppCompatTheme_actionModeBackground = 29;
-
- // aapt resource value: 28
- public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
-
- // aapt resource value: 31
- public const int AppCompatTheme_actionModeCloseDrawable = 31;
-
- // aapt resource value: 33
- public const int AppCompatTheme_actionModeCopyDrawable = 33;
-
- // aapt resource value: 32
- public const int AppCompatTheme_actionModeCutDrawable = 32;
-
- // aapt resource value: 37
- public const int AppCompatTheme_actionModeFindDrawable = 37;
-
- // aapt resource value: 34
- public const int AppCompatTheme_actionModePasteDrawable = 34;
-
- // aapt resource value: 39
- public const int AppCompatTheme_actionModePopupWindowStyle = 39;
-
- // aapt resource value: 35
- public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
-
- // aapt resource value: 36
- public const int AppCompatTheme_actionModeShareDrawable = 36;
-
- // aapt resource value: 30
- public const int AppCompatTheme_actionModeSplitBackground = 30;
-
- // aapt resource value: 27
- public const int AppCompatTheme_actionModeStyle = 27;
-
- // aapt resource value: 38
- public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+ public const int AppCompatTheme_actionDropDownStyle = 14;
// aapt resource value: 15
- public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+ public const int AppCompatTheme_actionMenuTextAppearance = 15;
// aapt resource value: 16
- public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+ public const int AppCompatTheme_actionMenuTextColor = 16;
- // aapt resource value: 58
- public const int AppCompatTheme_activityChooserViewStyle = 58;
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionModeBackground = 17;
- // aapt resource value: 95
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
- // aapt resource value: 96
- public const int AppCompatTheme_alertDialogCenterButtons = 96;
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionModeCloseDrawable = 19;
- // aapt resource value: 94
- public const int AppCompatTheme_alertDialogStyle = 94;
+ // aapt resource value: 20
+ public const int AppCompatTheme_actionModeCopyDrawable = 20;
- // aapt resource value: 97
- public const int AppCompatTheme_alertDialogTheme = 97;
+ // aapt resource value: 21
+ public const int AppCompatTheme_actionModeCutDrawable = 21;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionModeFindDrawable = 22;
+
+ // aapt resource value: 23
+ public const int AppCompatTheme_actionModePasteDrawable = 23;
+
+ // aapt resource value: 24
+ public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+
+ // aapt resource value: 25
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+
+ // aapt resource value: 26
+ public const int AppCompatTheme_actionModeShareDrawable = 26;
+
+ // aapt resource value: 27
+ public const int AppCompatTheme_actionModeSplitBackground = 27;
+
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeStyle = 28;
+
+ // aapt resource value: 29
+ public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+
+ // aapt resource value: 30
+ public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+
+ // aapt resource value: 31
+ public const int AppCompatTheme_actionOverflowMenuStyle = 31;
+
+ // aapt resource value: 32
+ public const int AppCompatTheme_activityChooserViewStyle = 32;
+
+ // aapt resource value: 33
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+
+ // aapt resource value: 34
+ public const int AppCompatTheme_alertDialogCenterButtons = 34;
+
+ // aapt resource value: 35
+ public const int AppCompatTheme_alertDialogStyle = 35;
+
+ // aapt resource value: 36
+ public const int AppCompatTheme_alertDialogTheme = 36;
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -6054,270 +6080,272 @@
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
- // aapt resource value: 102
- public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
+ // aapt resource value: 37
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
- // aapt resource value: 55
- public const int AppCompatTheme_borderlessButtonStyle = 55;
+ // aapt resource value: 38
+ public const int AppCompatTheme_borderlessButtonStyle = 38;
- // aapt resource value: 52
- public const int AppCompatTheme_buttonBarButtonStyle = 52;
+ // aapt resource value: 39
+ public const int AppCompatTheme_buttonBarButtonStyle = 39;
- // aapt resource value: 100
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+ // aapt resource value: 40
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
- // aapt resource value: 101
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+ // aapt resource value: 41
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
- // aapt resource value: 99
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
-
- // aapt resource value: 51
- public const int AppCompatTheme_buttonBarStyle = 51;
-
- // aapt resource value: 103
- public const int AppCompatTheme_buttonStyle = 103;
-
- // aapt resource value: 104
- public const int AppCompatTheme_buttonStyleSmall = 104;
-
- // aapt resource value: 105
- public const int AppCompatTheme_checkboxStyle = 105;
-
- // aapt resource value: 106
- public const int AppCompatTheme_checkedTextViewStyle = 106;
-
- // aapt resource value: 86
- public const int AppCompatTheme_colorAccent = 86;
-
- // aapt resource value: 93
- public const int AppCompatTheme_colorBackgroundFloating = 93;
-
- // aapt resource value: 90
- public const int AppCompatTheme_colorButtonNormal = 90;
-
- // aapt resource value: 88
- public const int AppCompatTheme_colorControlActivated = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_colorControlHighlight = 89;
-
- // aapt resource value: 87
- public const int AppCompatTheme_colorControlNormal = 87;
-
- // aapt resource value: 118
- public const int AppCompatTheme_colorError = 118;
-
- // aapt resource value: 84
- public const int AppCompatTheme_colorPrimary = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_colorPrimaryDark = 85;
-
- // aapt resource value: 91
- public const int AppCompatTheme_colorSwitchThumbNormal = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_controlBackground = 92;
-
- // aapt resource value: 44
- public const int AppCompatTheme_dialogPreferredPadding = 44;
+ // aapt resource value: 42
+ public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
// aapt resource value: 43
- public const int AppCompatTheme_dialogTheme = 43;
+ public const int AppCompatTheme_buttonBarStyle = 43;
- // aapt resource value: 57
- public const int AppCompatTheme_dividerHorizontal = 57;
-
- // aapt resource value: 56
- public const int AppCompatTheme_dividerVertical = 56;
-
- // aapt resource value: 75
- public const int AppCompatTheme_dropDownListViewStyle = 75;
-
- // aapt resource value: 47
- public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
-
- // aapt resource value: 64
- public const int AppCompatTheme_editTextBackground = 64;
-
- // aapt resource value: 63
- public const int AppCompatTheme_editTextColor = 63;
-
- // aapt resource value: 107
- public const int AppCompatTheme_editTextStyle = 107;
-
- // aapt resource value: 49
- public const int AppCompatTheme_homeAsUpIndicator = 49;
-
- // aapt resource value: 65
- public const int AppCompatTheme_imageButtonStyle = 65;
-
- // aapt resource value: 83
- public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+ // aapt resource value: 44
+ public const int AppCompatTheme_buttonStyle = 44;
// aapt resource value: 45
- public const int AppCompatTheme_listDividerAlertDialog = 45;
+ public const int AppCompatTheme_buttonStyleSmall = 45;
- // aapt resource value: 115
- public const int AppCompatTheme_listMenuViewStyle = 115;
+ // aapt resource value: 46
+ public const int AppCompatTheme_checkboxStyle = 46;
- // aapt resource value: 76
- public const int AppCompatTheme_listPopupWindowStyle = 76;
+ // aapt resource value: 47
+ public const int AppCompatTheme_checkedTextViewStyle = 47;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_colorAccent = 48;
+
+ // aapt resource value: 49
+ public const int AppCompatTheme_colorBackgroundFloating = 49;
+
+ // aapt resource value: 50
+ public const int AppCompatTheme_colorButtonNormal = 50;
+
+ // aapt resource value: 51
+ public const int AppCompatTheme_colorControlActivated = 51;
+
+ // aapt resource value: 52
+ public const int AppCompatTheme_colorControlHighlight = 52;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_colorControlNormal = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_colorError = 54;
+
+ // aapt resource value: 55
+ public const int AppCompatTheme_colorPrimary = 55;
+
+ // aapt resource value: 56
+ public const int AppCompatTheme_colorPrimaryDark = 56;
+
+ // aapt resource value: 57
+ public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_controlBackground = 58;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_dialogPreferredPadding = 59;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_dialogTheme = 60;
+
+ // aapt resource value: 61
+ public const int AppCompatTheme_dividerHorizontal = 61;
+
+ // aapt resource value: 62
+ public const int AppCompatTheme_dividerVertical = 62;
+
+ // aapt resource value: 64
+ public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
+
+ // aapt resource value: 63
+ public const int AppCompatTheme_dropDownListViewStyle = 63;
+
+ // aapt resource value: 65
+ public const int AppCompatTheme_editTextBackground = 65;
+
+ // aapt resource value: 66
+ public const int AppCompatTheme_editTextColor = 66;
+
+ // aapt resource value: 67
+ public const int AppCompatTheme_editTextStyle = 67;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_homeAsUpIndicator = 68;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_imageButtonStyle = 69;
// aapt resource value: 70
- public const int AppCompatTheme_listPreferredItemHeight = 70;
-
- // aapt resource value: 72
- public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+ public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
// aapt resource value: 71
- public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+ public const int AppCompatTheme_listDividerAlertDialog = 71;
+
+ // aapt resource value: 72
+ public const int AppCompatTheme_listMenuViewStyle = 72;
// aapt resource value: 73
- public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+ public const int AppCompatTheme_listPopupWindowStyle = 73;
// aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
+ public const int AppCompatTheme_listPreferredItemHeight = 74;
+
+ // aapt resource value: 75
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+
+ // aapt resource value: 76
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+
+ // aapt resource value: 77
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+
+ // aapt resource value: 78
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+
+ // aapt resource value: 79
+ public const int AppCompatTheme_panelBackground = 79;
// aapt resource value: 80
- public const int AppCompatTheme_panelBackground = 80;
-
- // aapt resource value: 82
- public const int AppCompatTheme_panelMenuListTheme = 82;
+ public const int AppCompatTheme_panelMenuListTheme = 80;
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
- // aapt resource value: 61
- public const int AppCompatTheme_popupMenuStyle = 61;
+ // aapt resource value: 82
+ public const int AppCompatTheme_popupMenuStyle = 82;
- // aapt resource value: 62
- public const int AppCompatTheme_popupWindowStyle = 62;
+ // aapt resource value: 83
+ public const int AppCompatTheme_popupWindowStyle = 83;
- // aapt resource value: 108
- public const int AppCompatTheme_radioButtonStyle = 108;
+ // aapt resource value: 84
+ public const int AppCompatTheme_radioButtonStyle = 84;
- // aapt resource value: 109
- public const int AppCompatTheme_ratingBarStyle = 109;
+ // aapt resource value: 85
+ public const int AppCompatTheme_ratingBarStyle = 85;
- // aapt resource value: 110
- public const int AppCompatTheme_ratingBarStyleIndicator = 110;
+ // aapt resource value: 86
+ public const int AppCompatTheme_ratingBarStyleIndicator = 86;
- // aapt resource value: 111
- public const int AppCompatTheme_ratingBarStyleSmall = 111;
+ // aapt resource value: 87
+ public const int AppCompatTheme_ratingBarStyleSmall = 87;
- // aapt resource value: 69
- public const int AppCompatTheme_searchViewStyle = 69;
+ // aapt resource value: 88
+ public const int AppCompatTheme_searchViewStyle = 88;
- // aapt resource value: 112
- public const int AppCompatTheme_seekBarStyle = 112;
+ // aapt resource value: 89
+ public const int AppCompatTheme_seekBarStyle = 89;
- // aapt resource value: 53
- public const int AppCompatTheme_selectableItemBackground = 53;
+ // aapt resource value: 90
+ public const int AppCompatTheme_selectableItemBackground = 90;
- // aapt resource value: 54
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+ // aapt resource value: 91
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
- // aapt resource value: 48
- public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
+ // aapt resource value: 92
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
- // aapt resource value: 113
- public const int AppCompatTheme_spinnerStyle = 113;
+ // aapt resource value: 93
+ public const int AppCompatTheme_spinnerStyle = 93;
- // aapt resource value: 114
- public const int AppCompatTheme_switchStyle = 114;
+ // aapt resource value: 94
+ public const int AppCompatTheme_switchStyle = 94;
- // aapt resource value: 40
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+ // aapt resource value: 95
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
- // aapt resource value: 77
- public const int AppCompatTheme_textAppearanceListItem = 77;
+ // aapt resource value: 96
+ public const int AppCompatTheme_textAppearanceListItem = 96;
- // aapt resource value: 78
- public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
-
- // aapt resource value: 79
- public const int AppCompatTheme_textAppearanceListItemSmall = 79;
-
- // aapt resource value: 42
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
-
- // aapt resource value: 67
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
-
- // aapt resource value: 66
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
-
- // aapt resource value: 41
- public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+ // aapt resource value: 97
+ public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
// aapt resource value: 98
- public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+ public const int AppCompatTheme_textAppearanceListItemSmall = 98;
- // aapt resource value: 68
- public const int AppCompatTheme_textColorSearchUrl = 68;
+ // aapt resource value: 99
+ public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
- // aapt resource value: 60
- public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+ // aapt resource value: 100
+ public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
- // aapt resource value: 59
- public const int AppCompatTheme_toolbarStyle = 59;
+ // aapt resource value: 101
+ public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
- // aapt resource value: 117
- public const int AppCompatTheme_tooltipForegroundColor = 117;
+ // aapt resource value: 102
+ public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
+
+ // aapt resource value: 103
+ public const int AppCompatTheme_textColorAlertDialogListItem = 103;
+
+ // aapt resource value: 104
+ public const int AppCompatTheme_textColorSearchUrl = 104;
+
+ // aapt resource value: 105
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
+
+ // aapt resource value: 106
+ public const int AppCompatTheme_toolbarStyle = 106;
+
+ // aapt resource value: 107
+ public const int AppCompatTheme_tooltipForegroundColor = 107;
+
+ // aapt resource value: 108
+ public const int AppCompatTheme_tooltipFrameBackground = 108;
+
+ // aapt resource value: 109
+ public const int AppCompatTheme_windowActionBar = 109;
+
+ // aapt resource value: 110
+ public const int AppCompatTheme_windowActionBarOverlay = 110;
+
+ // aapt resource value: 111
+ public const int AppCompatTheme_windowActionModeOverlay = 111;
+
+ // aapt resource value: 112
+ public const int AppCompatTheme_windowFixedHeightMajor = 112;
+
+ // aapt resource value: 113
+ public const int AppCompatTheme_windowFixedHeightMinor = 113;
+
+ // aapt resource value: 114
+ public const int AppCompatTheme_windowFixedWidthMajor = 114;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_windowFixedWidthMinor = 115;
// aapt resource value: 116
- public const int AppCompatTheme_tooltipFrameBackground = 116;
+ public const int AppCompatTheme_windowMinWidthMajor = 116;
- // aapt resource value: 2
- public const int AppCompatTheme_windowActionBar = 2;
+ // aapt resource value: 117
+ public const int AppCompatTheme_windowMinWidthMinor = 117;
- // aapt resource value: 4
- public const int AppCompatTheme_windowActionBarOverlay = 4;
+ // aapt resource value: 118
+ public const int AppCompatTheme_windowNoTitle = 118;
- // aapt resource value: 5
- public const int AppCompatTheme_windowActionModeOverlay = 5;
-
- // aapt resource value: 9
- public const int AppCompatTheme_windowFixedHeightMajor = 9;
-
- // aapt resource value: 7
- public const int AppCompatTheme_windowFixedHeightMinor = 7;
-
- // aapt resource value: 6
- public const int AppCompatTheme_windowFixedWidthMajor = 6;
-
- // aapt resource value: 8
- public const int AppCompatTheme_windowFixedWidthMinor = 8;
-
- // aapt resource value: 10
- public const int AppCompatTheme_windowMinWidthMajor = 10;
-
- // aapt resource value: 11
- public const int AppCompatTheme_windowMinWidthMinor = 11;
-
- // aapt resource value: 3
- public const int AppCompatTheme_windowNoTitle = 3;
-
+ // aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
public static int[] BallPulseFooter = new int[] {
- 2130772317,
- 2130772338,
- 2130772339};
-
- // aapt resource value: 1
- public const int BallPulseFooter_srlAnimatingColor = 1;
+ 2130968864,
+ 2130968865,
+ 2130968912};
// aapt resource value: 0
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
+ public const int BallPulseFooter_srlAnimatingColor = 0;
+
+ // aapt resource value: 1
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
+ // aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
public static int[] BezierRadarHeader = new int[] {
- 2130772316,
- 2130772324,
- 2130772326};
+ 2130968863,
+ 2130968882,
+ 2130968913};
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
@@ -6328,18 +6356,19 @@
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
+ // aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
public static int[] BottomNavigationView = new int[] {
- 2130772005,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269};
+ 2130968723,
+ 2130968772,
+ 2130968773,
+ 2130968776,
+ 2130968808};
// aapt resource value: 0
public const int BottomNavigationView_elevation = 0;
- // aapt resource value: 4
- public const int BottomNavigationView_itemBackground = 4;
+ // aapt resource value: 1
+ public const int BottomNavigationView_itemBackground = 1;
// aapt resource value: 2
public const int BottomNavigationView_itemIconTint = 2;
@@ -6347,48 +6376,51 @@
// aapt resource value: 3
public const int BottomNavigationView_itemTextColor = 3;
- // aapt resource value: 1
- public const int BottomNavigationView_menu = 1;
+ // aapt resource value: 4
+ public const int BottomNavigationView_menu = 4;
+ // aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
public static int[] BottomSheetBehavior_Layout = new int[] {
- 2130772228,
- 2130772229,
- 2130772230};
-
- // aapt resource value: 1
- public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+ 2130968649,
+ 2130968651,
+ 2130968652};
// aapt resource value: 0
- public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
+ public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
+
+ // aapt resource value: 1
+ public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
// aapt resource value: 2
public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
+ // aapt resource value: { 0x7F040026 }
public static int[] ButtonBarLayout = new int[] {
- 2130772146};
+ 2130968614};
// 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[] {
- 2130772316,
- 2130772317,
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329,
- 2130772330,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772336};
+ 2130968863,
+ 2130968865,
+ 2130968869,
+ 2130968870,
+ 2130968871,
+ 2130968872,
+ 2130968873,
+ 2130968874,
+ 2130968896,
+ 2130968913,
+ 2130968916,
+ 2130968917,
+ 2130968918,
+ 2130968919,
+ 2130968920,
+ 2130968921,
+ 2130968922,
+ 2130968925};
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
@@ -6444,29 +6476,30 @@
// 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[] {
- 2130772316,
- 2130772317,
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772334,
- 2130772335,
- 2130772336,
- 2130772337,
- 2130772340,
- 2130772341};
+ 2130968863,
+ 2130968865,
+ 2130968869,
+ 2130968870,
+ 2130968871,
+ 2130968872,
+ 2130968873,
+ 2130968874,
+ 2130968883,
+ 2130968896,
+ 2130968913,
+ 2130968916,
+ 2130968917,
+ 2130968918,
+ 2130968920,
+ 2130968921,
+ 2130968922,
+ 2130968923,
+ 2130968924,
+ 2130968925,
+ 2130968926,
+ 2130968927};
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
@@ -6492,117 +6525,101 @@
// aapt resource value: 7
public const int ClassicsHeader_srlDrawableSize = 7;
- // aapt resource value: 21
- public const int ClassicsHeader_srlEnableLastTime = 21;
-
// aapt resource value: 8
- public const int ClassicsHeader_srlFinishDuration = 8;
+ public const int ClassicsHeader_srlEnableLastTime = 8;
// aapt resource value: 9
- public const int ClassicsHeader_srlPrimaryColor = 9;
+ public const int ClassicsHeader_srlFinishDuration = 9;
// aapt resource value: 10
- public const int ClassicsHeader_srlTextFailed = 10;
+ public const int ClassicsHeader_srlPrimaryColor = 10;
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFinish = 11;
+ public const int ClassicsHeader_srlTextFailed = 11;
// aapt resource value: 12
- public const int ClassicsHeader_srlTextLoading = 12;
+ public const int ClassicsHeader_srlTextFinish = 12;
// aapt resource value: 13
- public const int ClassicsHeader_srlTextPulling = 13;
+ public const int ClassicsHeader_srlTextLoading = 13;
// aapt resource value: 14
- public const int ClassicsHeader_srlTextRefreshing = 14;
+ public const int ClassicsHeader_srlTextPulling = 14;
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRelease = 15;
+ public const int ClassicsHeader_srlTextRefreshing = 15;
// aapt resource value: 16
- public const int ClassicsHeader_srlTextSecondary = 16;
+ public const int ClassicsHeader_srlTextRelease = 16;
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSizeTime = 17;
+ public const int ClassicsHeader_srlTextSecondary = 17;
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTitle = 18;
+ public const int ClassicsHeader_srlTextSizeTime = 18;
+
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextSizeTitle = 19;
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextUpdate = 19;
+ // aapt resource value: 21
+ public const int ClassicsHeader_srlTextUpdate = 21;
+ // aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
public static int[] CollapsingToolbarLayout = new int[] {
- 2130771980,
- 2130772231,
- 2130772232,
- 2130772233,
- 2130772234,
- 2130772235,
- 2130772236,
- 2130772237,
- 2130772238,
- 2130772239,
- 2130772240,
- 2130772241,
- 2130772242,
- 2130772243,
- 2130772244,
- 2130772245};
+ 2130968675,
+ 2130968676,
+ 2130968696,
+ 2130968728,
+ 2130968729,
+ 2130968730,
+ 2130968731,
+ 2130968732,
+ 2130968733,
+ 2130968734,
+ 2130968842,
+ 2130968843,
+ 2130968933,
+ 2130968983,
+ 2130968984,
+ 2130968994};
- // 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: 0
+ public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
// aapt resource value: 1
- public const int CollapsingToolbarLayout_expandedTitleMargin = 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;
// aapt resource value: 5
public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
- // aapt resource value: 4
- public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
-
- // aapt resource value: 2
- public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
-
- // aapt resource value: 3
- public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
-
// aapt resource value: 6
- public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+ public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
- // aapt resource value: 12
- public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+ // aapt resource value: 7
+ public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
- // aapt resource value: 11
- public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+ // aapt resource value: 8
+ public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
// aapt resource value: 9
- public const int CollapsingToolbarLayout_statusBarScrim = 9;
+ public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
- // aapt resource value: 0
- public const int CollapsingToolbarLayout_title = 0;
-
- // aapt resource value: 15
- public const int CollapsingToolbarLayout_titleEnabled = 15;
-
- // aapt resource value: 10
- public const int CollapsingToolbarLayout_toolbarId = 10;
-
+ // aapt resource value: { 0x7F0400CF,0x7F0400D0 }
public static int[] CollapsingToolbarLayout_Layout = new int[] {
- 2130772246,
- 2130772247};
+ 2130968783,
+ 2130968784};
// aapt resource value: 0
public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -6610,10 +6627,29 @@
// 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,
- 2130772147};
+ 2130968615};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -6624,10 +6660,11 @@
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
+ // aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
public static int[] CompoundButton = new int[] {
16843015,
- 2130772148,
- 2130772149};
+ 2130968667,
+ 2130968668};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -6638,50 +6675,53 @@
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
+ // aapt resource value: { 0x7F0400C9,0x7F040164 }
public static int[] CoordinatorLayout = new int[] {
- 2130772248,
- 2130772249};
+ 2130968777,
+ 2130968932};
// aapt resource value: 0
public const int CoordinatorLayout_keylines = 0;
- // aapt resource value: 1
- public const int CoordinatorLayout_statusBarBackground = 1;
-
+ // aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
public static int[] CoordinatorLayout_Layout = new int[] {
16842931,
- 2130772250,
- 2130772251,
- 2130772252,
- 2130772253,
- 2130772254,
- 2130772255};
+ 2130968780,
+ 2130968781,
+ 2130968782,
+ 2130968785,
+ 2130968786,
+ 2130968787};
// 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_anchor = 2;
+ public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
+
+ // aapt resource value: 3
+ public const int CoordinatorLayout_Layout_layout_behavior = 3;
// aapt resource value: 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;
+ public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
// aapt resource value: 5
public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
- // aapt resource value: 3
- public const int CoordinatorLayout_Layout_layout_keyline = 3;
+ // aapt resource value: 6
+ public const int CoordinatorLayout_Layout_layout_keyline = 6;
+ // aapt resource value: 1
+ public const int CoordinatorLayout_statusBarBackground = 1;
+
+ // aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
public static int[] DesignTheme = new int[] {
- 2130772256,
- 2130772257,
- 2130772258};
+ 2130968656,
+ 2130968657,
+ 2130968971};
// aapt resource value: 0
public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -6692,61 +6732,70 @@
// 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[] {
- 2130772150,
- 2130772151,
- 2130772152,
- 2130772153,
- 2130772154,
- 2130772155,
- 2130772156,
- 2130772157};
-
- // aapt resource value: 4
- public const int DrawerArrowToggle_arrowHeadLength = 4;
-
- // aapt resource value: 5
- public const int DrawerArrowToggle_arrowShaftLength = 5;
-
- // aapt resource value: 6
- public const int DrawerArrowToggle_barLength = 6;
+ 2130968634,
+ 2130968635,
+ 2130968647,
+ 2130968677,
+ 2130968716,
+ 2130968752,
+ 2130968858,
+ 2130968974};
// aapt resource value: 0
- public const int DrawerArrowToggle_color = 0;
-
- // aapt resource value: 2
- public const int DrawerArrowToggle_drawableSize = 2;
-
- // aapt resource value: 3
- public const int DrawerArrowToggle_gapBetweenBars = 3;
+ public const int DrawerArrowToggle_arrowHeadLength = 0;
// aapt resource value: 1
- public const int DrawerArrowToggle_spinBars = 1;
+ public const int DrawerArrowToggle_arrowShaftLength = 1;
+
+ // aapt resource value: 2
+ public const int DrawerArrowToggle_barLength = 2;
+
+ // aapt resource value: 3
+ public const int DrawerArrowToggle_color = 3;
+
+ // aapt resource value: 4
+ public const int DrawerArrowToggle_drawableSize = 4;
+
+ // aapt resource value: 5
+ public const int DrawerArrowToggle_gapBetweenBars = 5;
+
+ // aapt resource value: 6
+ public const int DrawerArrowToggle_spinBars = 6;
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
+ // aapt resource value: { 0x7F040045,0x7F040046,0x7F04004E,0x7F040093,0x7F04009F,0x7F0400FF,0x7F040109,0x7F0401AB }
public static int[] FloatingActionButton = new int[] {
- 2130772005,
- 2130772221,
- 2130772222,
- 2130772259,
- 2130772260,
- 2130772261,
- 2130772262,
- 2130772263};
-
- // aapt resource value: 1
- public const int FloatingActionButton_backgroundTint = 1;
-
- // aapt resource value: 2
- public const int FloatingActionButton_backgroundTintMode = 2;
-
- // aapt resource value: 6
- public const int FloatingActionButton_borderWidth = 6;
+ 2130968645,
+ 2130968646,
+ 2130968654,
+ 2130968723,
+ 2130968735,
+ 2130968831,
+ 2130968841,
+ 2130969003};
// aapt resource value: 0
- public const int FloatingActionButton_elevation = 0;
+ public const int FloatingActionButton_backgroundTint = 0;
+
+ // 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;
+
+ // aapt resource value: 2
+ public const int FloatingActionButton_borderWidth = 2;
+
+ // aapt resource value: 3
+ public const int FloatingActionButton_elevation = 3;
// aapt resource value: 4
public const int FloatingActionButton_fabSize = 4;
@@ -6754,62 +6803,59 @@
// aapt resource value: 5
public const int FloatingActionButton_pressedTranslationZ = 5;
- // aapt resource value: 3
- public const int FloatingActionButton_rippleColor = 3;
+ // aapt resource value: 6
+ public const int FloatingActionButton_rippleColor = 6;
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
- public static int[] FloatingActionButton_Behavior_Layout = new int[] {
- 2130772264};
-
- // aapt resource value: 0
- public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
-
+ // aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
public static int[] FontFamily = new int[] {
- 2130772305,
- 2130772306,
- 2130772307,
- 2130772308,
- 2130772309,
- 2130772310};
+ 2130968743,
+ 2130968744,
+ 2130968745,
+ 2130968746,
+ 2130968747,
+ 2130968748};
- // aapt resource value: 0
- public const int FontFamily_fontProviderAuthority = 0;
-
- // aapt resource value: 3
- public const int FontFamily_fontProviderCerts = 3;
-
- // aapt resource value: 4
- public const int FontFamily_fontProviderFetchStrategy = 4;
-
- // aapt resource value: 5
- public const int FontFamily_fontProviderFetchTimeout = 5;
-
- // aapt resource value: 1
- public const int FontFamily_fontProviderPackage = 1;
-
- // aapt resource value: 2
- public const int FontFamily_fontProviderQuery = 2;
-
+ // aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
public static int[] FontFamilyFont = new int[] {
- 2130772311,
- 2130772312,
- 2130772313};
-
- // aapt resource value: 1
- public const int FontFamilyFont_font = 1;
+ 2130968741,
+ 2130968749,
+ 2130968750};
// aapt resource value: 0
- public const int FontFamilyFont_fontStyle = 0;
+ public const int FontFamilyFont_font = 0;
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_fontStyle = 1;
// aapt resource value: 2
public const int FontFamilyFont_fontWeight = 2;
+ // 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;
+
+ // aapt resource value: 4
+ public const int FontFamily_fontProviderPackage = 4;
+
+ // aapt resource value: 5
+ public const int FontFamily_fontProviderQuery = 5;
+
+ // aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
- 2130772265};
+ 2130968751};
// aapt resource value: 0
public const int ForegroundLinearLayout_android_foreground = 0;
@@ -6820,142 +6866,146 @@
// 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[] {
- 2130772382,
- 2130772383,
- 2130772384,
- 2130772385,
- 2130772386,
- 2130772387,
- 2130772388,
- 2130772389,
- 2130772390,
- 2130772391,
- 2130772392,
- 2130772393,
- 2130772394,
- 2130772395,
- 2130772396,
- 2130772397,
- 2130772398,
- 2130772399};
+ 2130968617,
+ 2130968618,
+ 2130968619,
+ 2130968620,
+ 2130968621,
+ 2130968622,
+ 2130968623,
+ 2130968624,
+ 2130968625,
+ 2130968626,
+ 2130968627,
+ 2130968628,
+ 2130968629,
+ 2130968630,
+ 2130968631,
+ 2130968632,
+ 2130968633,
+ 2130968754};
- // aapt resource value: 5
- public const int HDLArcSeekBar_arc_border_color = 5;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_border_width = 4;
-
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_colors = 3;
-
- // aapt resource value: 6
- public const int HDLArcSeekBar_arc_max = 6;
-
- // aapt resource value: 7
- public const int HDLArcSeekBar_arc_min = 7;
+ // aapt resource value: 0
+ public const int HDLArcSeekBar_arc_border_color = 0;
// aapt resource value: 1
- public const int HDLArcSeekBar_arc_open_angle = 1;
-
- // aapt resource value: 8
- public const int HDLArcSeekBar_arc_progress = 8;
-
- // aapt resource value: 16
- public const int HDLArcSeekBar_arc_progress_bar_color = 16;
-
- // aapt resource value: 17
- public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+ public const int HDLArcSeekBar_arc_border_width = 1;
// aapt resource value: 2
- public const int HDLArcSeekBar_arc_rotate_angle = 2;
+ public const int HDLArcSeekBar_arc_colors = 2;
- // aapt resource value: 15
- public const int HDLArcSeekBar_arc_shadow_radius = 15;
+ // aapt resource value: 3
+ public const int HDLArcSeekBar_arc_max = 3;
+
+ // aapt resource value: 4
+ public const int HDLArcSeekBar_arc_min = 4;
+
+ // aapt resource value: 5
+ public const int HDLArcSeekBar_arc_open_angle = 5;
+
+ // aapt resource value: 6
+ public const int HDLArcSeekBar_arc_progress = 6;
+
+ // aapt resource value: 7
+ public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+
+ // aapt resource value: 8
+ public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_rotate_angle = 9;
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_thumb_color = 10;
+ public const int HDLArcSeekBar_arc_shadow_radius = 10;
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_radius = 11;
+ public const int HDLArcSeekBar_arc_thumb_color = 11;
+
+ // aapt resource value: 12
+ public const int HDLArcSeekBar_arc_thumb_radius = 12;
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
+ // aapt resource value: 14
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
- // aapt resource value: 9
- public const int HDLArcSeekBar_arc_thumb_width = 9;
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_thumb_width = 15;
+
+ // aapt resource value: 16
+ public const int HDLArcSeekBar_arc_width = 16;
+
+ // aapt resource value: 17
+ public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
+
+ // aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
+ public static int[] HDLCurtainSeekBar = new int[] {
+ 2130968702,
+ 2130968703,
+ 2130968704,
+ 2130968705,
+ 2130968706,
+ 2130968847};
// aapt resource value: 0
- public const int HDLArcSeekBar_arc_width = 0;
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
- // aapt resource value: 14
- public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
-
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130772400,
- 2130772401,
- 2130772402,
- 2130772403,
- 2130772404,
- 2130772405};
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
// aapt resource value: 2
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
+ public const int HDLCurtainSeekBar_curtain_bar_color = 2;
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
-
- // aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_color = 0;
-
- // aapt resource value: 5
- public const int HDLCurtainSeekBar_curtain_bar_height = 5;
+ public const int HDLCurtainSeekBar_curtain_bar_height = 3;
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+ // aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
public static int[] HDLWaveSeekBar = new int[] {
- 2130772406,
- 2130772407,
- 2130772408,
- 2130772409,
- 2130772410,
- 2130772411};
-
- // aapt resource value: 1
- public const int HDLWaveSeekBar_second_wave_color = 1;
-
- // aapt resource value: 2
- public const int HDLWaveSeekBar_wave_bg_color = 2;
-
- // aapt resource value: 3
- public const int HDLWaveSeekBar_wave_border_color = 3;
+ 2130968848,
+ 2130969005,
+ 2130969006,
+ 2130969007,
+ 2130969008,
+ 2130969009};
// aapt resource value: 0
- public const int HDLWaveSeekBar_wave_color = 0;
+ public const int HDLWaveSeekBar_second_wave_color = 0;
- // aapt resource value: 5
- public const int HDLWaveSeekBar_wave_height = 5;
+ // aapt resource value: 1
+ public const int HDLWaveSeekBar_wave_bg_color = 1;
+
+ // aapt resource value: 2
+ public const int HDLWaveSeekBar_wave_border_color = 2;
+
+ // aapt resource value: 3
+ public const int HDLWaveSeekBar_wave_color = 3;
// aapt resource value: 4
- public const int HDLWaveSeekBar_wave_width = 4;
+ public const int HDLWaveSeekBar_wave_height = 4;
+ // aapt resource value: 5
+ public const int HDLWaveSeekBar_wave_width = 5;
+
+ // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130771988,
- 2130772158,
- 2130772159,
- 2130772160};
+ 2130968712,
+ 2130968714,
+ 2130968807,
+ 2130968853};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -6975,15 +7025,10 @@
// aapt resource value: 5
public const int LinearLayoutCompat_divider = 5;
- // aapt resource value: 8
- public const int LinearLayoutCompat_dividerPadding = 8;
-
// aapt resource value: 6
- public const int LinearLayoutCompat_measureWithLargestChild = 6;
+ public const int LinearLayoutCompat_dividerPadding = 6;
- // aapt resource value: 7
- public const int LinearLayoutCompat_showDividers = 7;
-
+ // aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
@@ -7002,6 +7047,13 @@
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
+ // aapt resource value: 7
+ public const int LinearLayoutCompat_measureWithLargestChild = 7;
+
+ // aapt resource value: 8
+ public const int LinearLayoutCompat_showDividers = 8;
+
+ // aapt resource value: { 0x10102AC,0x10102AD }
public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -7012,6 +7064,7 @@
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
+ // aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
public static int[] MenuGroup = new int[] {
16842766,
16842960,
@@ -7038,6 +7091,7 @@
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
+ // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -7052,28 +7106,28 @@
16843236,
16843237,
16843375,
- 2130772161,
- 2130772162,
- 2130772163,
- 2130772164,
- 2130772165,
- 2130772166,
- 2130772167,
- 2130772168,
- 2130772169,
- 2130772170};
-
- // aapt resource value: 16
- public const int MenuItem_actionLayout = 16;
-
- // aapt resource value: 18
- public const int MenuItem_actionProviderClass = 18;
-
- // aapt resource value: 17
- public const int MenuItem_actionViewClass = 17;
+ 2130968589,
+ 2130968607,
+ 2130968608,
+ 2130968616,
+ 2130968689,
+ 2130968764,
+ 2130968765,
+ 2130968813,
+ 2130968852,
+ 2130968999};
// aapt resource value: 13
- public const int MenuItem_alphabeticModifiers = 13;
+ public const int MenuItem_actionLayout = 13;
+
+ // aapt resource value: 14
+ public const int MenuItem_actionProviderClass = 14;
+
+ // aapt resource value: 15
+ public const int MenuItem_actionViewClass = 15;
+
+ // aapt resource value: 16
+ public const int MenuItem_alphabeticModifiers = 16;
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
@@ -7114,24 +7168,25 @@
// aapt resource value: 4
public const int MenuItem_android_visible = 4;
+ // aapt resource value: 17
+ public const int MenuItem_contentDescription = 17;
+
+ // aapt resource value: 18
+ public const int MenuItem_iconTint = 18;
+
// aapt resource value: 19
- public const int MenuItem_contentDescription = 19;
-
- // aapt resource value: 21
- public const int MenuItem_iconTint = 21;
-
- // aapt resource value: 22
- public const int MenuItem_iconTintMode = 22;
-
- // aapt resource value: 14
- public const int MenuItem_numericModifiers = 14;
-
- // aapt resource value: 15
- public const int MenuItem_showAsAction = 15;
+ public const int MenuItem_iconTintMode = 19;
// aapt resource value: 20
- public const int MenuItem_tooltipText = 20;
+ public const int MenuItem_numericModifiers = 20;
+ // aapt resource value: 21
+ public const int MenuItem_showAsAction = 21;
+
+ // aapt resource value: 22
+ public const int MenuItem_tooltipText = 22;
+
+ // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
public static int[] MenuView = new int[] {
16842926,
16843052,
@@ -7140,8 +7195,8 @@
16843055,
16843056,
16843057,
- 2130772171,
- 2130772172};
+ 2130968830,
+ 2130968934};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -7170,17 +7225,18 @@
// 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,
- 2130772005,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269,
- 2130772270,
- 2130772271};
+ 2130968723,
+ 2130968755,
+ 2130968772,
+ 2130968773,
+ 2130968775,
+ 2130968776,
+ 2130968808};
// aapt resource value: 0
public const int NavigationView_android_background = 0;
@@ -7194,28 +7250,63 @@
// aapt resource value: 3
public const int NavigationView_elevation = 3;
- // aapt resource value: 9
- public const int NavigationView_headerLayout = 9;
-
- // aapt resource value: 7
- public const int NavigationView_itemBackground = 7;
+ // aapt resource value: 4
+ public const int NavigationView_headerLayout = 4;
// aapt resource value: 5
- public const int NavigationView_itemIconTint = 5;
-
- // aapt resource value: 8
- public const int NavigationView_itemTextAppearance = 8;
+ public const int NavigationView_itemBackground = 5;
// aapt resource value: 6
- public const int NavigationView_itemTextColor = 6;
+ public const int NavigationView_itemIconTint = 6;
+
+ // 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 NavigationView_menu = 4;
+ public const int pickerview_wheelview_textColorOut = 4;
+ // aapt resource value: 5
+ public const int pickerview_wheelview_textSize = 5;
+
+ // aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130772173};
+ 2130968814};
+
+ // aapt resource value: { 0x7F040161 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130968929};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -7226,15 +7317,10 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130772174};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
-
+ // aapt resource value: { 0x7F0400EF,0x7F0400F2 }
public static int[] RecycleListView = new int[] {
- 2130772175,
- 2130772176};
+ 2130968815,
+ 2130968818};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -7242,18 +7328,19 @@
// 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,
- 2130771968,
- 2130771969,
- 2130771970,
- 2130771971,
- 2130771972,
- 2130771973,
- 2130771974,
- 2130771975,
- 2130771976};
+ 2130968736,
+ 2130968737,
+ 2130968738,
+ 2130968739,
+ 2130968740,
+ 2130968779,
+ 2130968840,
+ 2130968857,
+ 2130968928};
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
@@ -7261,63 +7348,66 @@
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
- // aapt resource value: 6
- public const int RecyclerView_fastScrollEnabled = 6;
-
- // aapt resource value: 9
- public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
-
- // aapt resource value: 10
- public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
-
- // aapt resource value: 7
- public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
-
- // aapt resource value: 8
- public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
-
// aapt resource value: 2
- public const int RecyclerView_layoutManager = 2;
-
- // aapt resource value: 4
- public const int RecyclerView_reverseLayout = 4;
+ public const int RecyclerView_fastScrollEnabled = 2;
// aapt resource value: 3
- public const int RecyclerView_spanCount = 3;
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
+
+ // aapt resource value: 4
+ public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
// aapt resource value: 5
- public const int RecyclerView_stackFromEnd = 5;
+ public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
+ // aapt resource value: 6
+ public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
+
+ // aapt resource value: 7
+ public const int RecyclerView_layoutManager = 7;
+
+ // aapt resource value: 8
+ public const int RecyclerView_reverseLayout = 8;
+
+ // aapt resource value: 9
+ public const int RecyclerView_spanCount = 9;
+
+ // aapt resource value: 10
+ public const int RecyclerView_stackFromEnd = 10;
+
+ // aapt resource value: { 0x7F0400C2 }
public static int[] ScrimInsetsFrameLayout = new int[] {
- 2130772272};
+ 2130968770};
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
+ // aapt resource value: { 0x7F04004A }
public static int[] ScrollingViewBehavior_Layout = new int[] {
- 2130772273};
+ 2130968650};
// 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,
- 2130772177,
- 2130772178,
- 2130772179,
- 2130772180,
- 2130772181,
- 2130772182,
- 2130772183,
- 2130772184,
- 2130772185,
- 2130772186,
- 2130772187,
- 2130772188,
- 2130772189};
+ 2130968671,
+ 2130968688,
+ 2130968708,
+ 2130968753,
+ 2130968766,
+ 2130968778,
+ 2130968834,
+ 2130968835,
+ 2130968844,
+ 2130968845,
+ 2130968935,
+ 2130968940,
+ 2130969004};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -7331,83 +7421,84 @@
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
- // aapt resource value: 8
- public const int SearchView_closeIcon = 8;
-
- // aapt resource value: 13
- public const int SearchView_commitIcon = 13;
-
- // aapt resource value: 7
- public const int SearchView_defaultQueryHint = 7;
-
- // aapt resource value: 9
- public const int SearchView_goIcon = 9;
+ // aapt resource value: 4
+ public const int SearchView_closeIcon = 4;
// aapt resource value: 5
- public const int SearchView_iconifiedByDefault = 5;
-
- // aapt resource value: 4
- public const int SearchView_layout = 4;
-
- // aapt resource value: 15
- public const int SearchView_queryBackground = 15;
+ public const int SearchView_commitIcon = 5;
// aapt resource value: 6
- public const int SearchView_queryHint = 6;
+ public const int SearchView_defaultQueryHint = 6;
- // aapt resource value: 11
- public const int SearchView_searchHintIcon = 11;
+ // aapt resource value: 7
+ public const int SearchView_goIcon = 7;
+
+ // aapt resource value: 8
+ public const int SearchView_iconifiedByDefault = 8;
+
+ // aapt resource value: 9
+ public const int SearchView_layout = 9;
// aapt resource value: 10
- public const int SearchView_searchIcon = 10;
+ public const int SearchView_queryBackground = 10;
- // aapt resource value: 16
- public const int SearchView_submitBackground = 16;
-
- // aapt resource value: 14
- public const int SearchView_suggestionRowLayout = 14;
+ // aapt resource value: 11
+ public const int SearchView_queryHint = 11;
// aapt resource value: 12
- public const int SearchView_voiceIcon = 12;
+ public const int SearchView_searchHintIcon = 12;
+ // aapt resource value: 13
+ public const int SearchView_searchIcon = 13;
+
+ // aapt resource value: 14
+ public const int SearchView_submitBackground = 14;
+
+ // aapt resource value: 15
+ public const int SearchView_suggestionRowLayout = 15;
+
+ // aapt resource value: 16
+ public const int SearchView_voiceIcon = 16;
+
+ // aapt resource value: { 0x10100EA,0x10100EB,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 }
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 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};
+ 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};
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -7415,125 +7506,127 @@
// 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: 34
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
-
- // aapt resource value: 33
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
-
- // aapt resource value: 9
- public const int SmartRefreshLayout_srlDragRate = 9;
-
- // aapt resource value: 21
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
-
- // aapt resource value: 31
- public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
-
- // aapt resource value: 30
- public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
-
- // aapt resource value: 28
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
-
- // aapt resource value: 29
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
-
- // aapt resource value: 17
- public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
-
- // aapt resource value: 16
- public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
-
- // aapt resource value: 15
- public const int SmartRefreshLayout_srlEnableLoadMore = 15;
-
- // aapt resource value: 27
- public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
-
- // aapt resource value: 24
- public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
-
- // aapt resource value: 22
- public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
-
- // aapt resource value: 32
- public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
-
- // aapt resource value: 20
- public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
-
- // aapt resource value: 23
- public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
-
- // aapt resource value: 14
- public const int SmartRefreshLayout_srlEnableRefresh = 14;
-
- // aapt resource value: 25
- public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
-
- // aapt resource value: 26
- public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
-
- // aapt resource value: 36
- public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
-
- // aapt resource value: 35
- public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlFooterHeight = 6;
-
- // aapt resource value: 8
- public const int SmartRefreshLayout_srlFooterInsetStart = 8;
-
- // aapt resource value: 11
- public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
-
- // aapt resource value: 19
- public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
-
- // aapt resource value: 13
- public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlHeaderHeight = 5;
-
- // aapt resource value: 7
- public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
-
- // aapt resource value: 10
- public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
-
- // aapt resource value: 18
- public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
-
- // aapt resource value: 12
- public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
-
// aapt resource value: 3
- public const int SmartRefreshLayout_srlPrimaryColor = 3;
+ public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
// aapt resource value: 4
- public const int SmartRefreshLayout_srlReboundDuration = 4;
+ public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
- public static int[] SmartRefreshLayout_Layout = new int[] {
- 2130772315,
- 2130772375};
+ // aapt resource value: 5
+ public const int SmartRefreshLayout_srlDragRate = 5;
- // aapt resource value: 1
- public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+ // aapt resource value: 6
+ public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
- // aapt resource value: 0
- public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+ // aapt resource value: 7
+ public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
+ // aapt resource value: 8
+ public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
+
+ // aapt resource value: 9
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
+
+ // aapt resource value: 10
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
+
+ // aapt resource value: 11
+ public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
+
+ // aapt resource value: 12
+ public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
+
+ // aapt resource value: 13
+ public const int SmartRefreshLayout_srlEnableLoadMore = 13;
+
+ // aapt resource value: 14
+ public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
+
+ // aapt resource value: 15
+ public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
+
+ // aapt resource value: 16
+ public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
+
+ // aapt resource value: 17
+ public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
+
+ // aapt resource value: 18
+ public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
+
+ // aapt resource value: 19
+ public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
+
+ // aapt resource value: 20
+ public const int SmartRefreshLayout_srlEnableRefresh = 20;
+
+ // aapt resource value: 21
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
+
+ // aapt resource value: 22
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
+
+ // aapt resource value: 23
+ public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
+
+ // aapt resource value: 24
+ public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
+
+ // aapt resource value: 25
+ public const int SmartRefreshLayout_srlFooterHeight = 25;
+
+ // aapt resource value: 26
+ public const int SmartRefreshLayout_srlFooterInsetStart = 26;
+
+ // aapt resource value: 27
+ public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
+
+ // aapt resource value: 28
+ public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
+
+ // aapt resource value: 29
+ public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
+
+ // aapt resource value: 30
+ public const int SmartRefreshLayout_srlHeaderHeight = 30;
+
+ // aapt resource value: 31
+ public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
+
+ // aapt resource value: 32
+ public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+
+ // aapt resource value: 33
+ public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+
+ // aapt resource value: 34
+ public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+
+ // aapt resource value: 35
+ public const int SmartRefreshLayout_srlPrimaryColor = 35;
+
+ // aapt resource value: 36
+ public const int SmartRefreshLayout_srlReboundDuration = 36;
+
+ // aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
public static int[] SnackbarLayout = new int[] {
16843039,
- 2130772005,
- 2130772274};
+ 2130968723,
+ 2130968805};
// aapt resource value: 0
public const int SnackbarLayout_android_maxWidth = 0;
@@ -7544,12 +7637,13 @@
// 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,
- 2130772006};
+ 2130968828};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -7566,21 +7660,22 @@
// 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,
- 2130772190,
- 2130772191,
- 2130772192,
- 2130772193,
- 2130772194,
- 2130772195,
- 2130772196,
- 2130772197,
- 2130772198,
- 2130772199,
- 2130772200};
+ 2130968854,
+ 2130968861,
+ 2130968941,
+ 2130968942,
+ 2130968944,
+ 2130968975,
+ 2130968976,
+ 2130968977,
+ 2130969000,
+ 2130969001,
+ 2130969002};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -7591,39 +7686,40 @@
// aapt resource value: 2
public const int SwitchCompat_android_thumb = 2;
- // aapt resource value: 13
- public const int SwitchCompat_showText = 13;
+ // aapt resource value: 3
+ public const int SwitchCompat_showText = 3;
- // aapt resource value: 12
- public const int SwitchCompat_splitTrack = 12;
+ // aapt resource value: 4
+ public const int SwitchCompat_splitTrack = 4;
- // aapt resource value: 10
- public const int SwitchCompat_switchMinWidth = 10;
+ // aapt resource value: 5
+ public const int SwitchCompat_switchMinWidth = 5;
- // aapt resource value: 11
- public const int SwitchCompat_switchPadding = 11;
+ // aapt resource value: 6
+ public const int SwitchCompat_switchPadding = 6;
- // aapt resource value: 9
- public const int SwitchCompat_switchTextAppearance = 9;
+ // aapt resource value: 7
+ public const int SwitchCompat_switchTextAppearance = 7;
// aapt resource value: 8
public const int SwitchCompat_thumbTextPadding = 8;
- // aapt resource value: 3
- public const int SwitchCompat_thumbTint = 3;
+ // aapt resource value: 9
+ public const int SwitchCompat_thumbTint = 9;
- // aapt resource value: 4
- public const int SwitchCompat_thumbTintMode = 4;
+ // aapt resource value: 10
+ public const int SwitchCompat_thumbTintMode = 10;
- // aapt resource value: 5
- public const int SwitchCompat_track = 5;
+ // aapt resource value: 11
+ public const int SwitchCompat_track = 11;
- // aapt resource value: 6
- public const int SwitchCompat_trackTint = 6;
+ // aapt resource value: 12
+ public const int SwitchCompat_trackTint = 12;
- // aapt resource value: 7
- public const int SwitchCompat_trackTintMode = 7;
+ // aapt resource value: 13
+ public const int SwitchCompat_trackTintMode = 13;
+ // aapt resource value: { 0x1010002,0x10100F2,0x101014F }
public static int[] TabItem = new int[] {
16842754,
16842994,
@@ -7638,56 +7734,57 @@
// 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[] {
- 2130772275,
- 2130772276,
- 2130772277,
- 2130772278,
- 2130772279,
- 2130772280,
- 2130772281,
- 2130772282,
- 2130772283,
- 2130772284,
- 2130772285,
- 2130772286,
- 2130772287,
- 2130772288,
- 2130772289,
- 2130772290};
-
- // aapt resource value: 3
- public const int TabLayout_tabBackground = 3;
-
- // aapt resource value: 2
- public const int TabLayout_tabContentStart = 2;
-
- // aapt resource value: 5
- public const int TabLayout_tabGravity = 5;
+ 2130968945,
+ 2130968946,
+ 2130968947,
+ 2130968948,
+ 2130968949,
+ 2130968950,
+ 2130968951,
+ 2130968952,
+ 2130968953,
+ 2130968954,
+ 2130968955,
+ 2130968956,
+ 2130968957,
+ 2130968958,
+ 2130968959,
+ 2130968960};
// aapt resource value: 0
- public const int TabLayout_tabIndicatorColor = 0;
+ public const int TabLayout_tabBackground = 0;
// aapt resource value: 1
- public const int TabLayout_tabIndicatorHeight = 1;
+ public const int TabLayout_tabContentStart = 1;
- // aapt resource value: 7
- public const int TabLayout_tabMaxWidth = 7;
+ // aapt resource value: 2
+ public const int TabLayout_tabGravity = 2;
+
+ // aapt resource value: 3
+ public const int TabLayout_tabIndicatorColor = 3;
+
+ // aapt resource value: 4
+ public const int TabLayout_tabIndicatorHeight = 4;
+
+ // aapt resource value: 5
+ public const int TabLayout_tabMaxWidth = 5;
// aapt resource value: 6
public const int TabLayout_tabMinWidth = 6;
- // aapt resource value: 4
- public const int TabLayout_tabMode = 4;
+ // aapt resource value: 7
+ public const int TabLayout_tabMode = 7;
- // aapt resource value: 15
- public const int TabLayout_tabPadding = 15;
+ // aapt resource value: 8
+ public const int TabLayout_tabPadding = 8;
- // aapt resource value: 14
- public const int TabLayout_tabPaddingBottom = 14;
+ // aapt resource value: 9
+ public const int TabLayout_tabPaddingBottom = 9;
- // aapt resource value: 13
- public const int TabLayout_tabPaddingEnd = 13;
+ // aapt resource value: 10
+ public const int TabLayout_tabPaddingEnd = 10;
// aapt resource value: 11
public const int TabLayout_tabPaddingStart = 11;
@@ -7695,15 +7792,16 @@
// aapt resource value: 12
public const int TabLayout_tabPaddingTop = 12;
- // aapt resource value: 10
- public const int TabLayout_tabSelectedTextColor = 10;
+ // aapt resource value: 13
+ public const int TabLayout_tabSelectedTextColor = 13;
- // aapt resource value: 8
- public const int TabLayout_tabTextAppearance = 8;
+ // aapt resource value: 14
+ public const int TabLayout_tabTextAppearance = 14;
- // aapt resource value: 9
- public const int TabLayout_tabTextColor = 9;
+ // aapt resource value: 15
+ public const int TabLayout_tabTextColor = 15;
+ // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -7716,8 +7814,8 @@
16843107,
16843108,
16843692,
- 2130772022,
- 2130772028};
+ 2130968742,
+ 2130968961};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -7752,29 +7850,30 @@
// aapt resource value: 1
public const int TextAppearance_android_typeface = 1;
- // aapt resource value: 12
- public const int TextAppearance_fontFamily = 12;
-
// aapt resource value: 11
- public const int TextAppearance_textAllCaps = 11;
+ public const int TextAppearance_fontFamily = 11;
+ // aapt resource value: 12
+ public const int TextAppearance_textAllCaps = 12;
+
+ // aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
public static int[] TextInputLayout = new int[] {
16842906,
16843088,
- 2130772291,
- 2130772292,
- 2130772293,
- 2130772294,
- 2130772295,
- 2130772296,
- 2130772297,
- 2130772298,
- 2130772299,
- 2130772300,
- 2130772301,
- 2130772302,
- 2130772303,
- 2130772304};
+ 2130968698,
+ 2130968699,
+ 2130968700,
+ 2130968701,
+ 2130968724,
+ 2130968725,
+ 2130968758,
+ 2130968759,
+ 2130968760,
+ 2130968822,
+ 2130968823,
+ 2130968824,
+ 2130968825,
+ 2130968826};
// aapt resource value: 1
public const int TextInputLayout_android_hint = 1;
@@ -7782,41 +7881,41 @@
// aapt resource value: 0
public const int TextInputLayout_android_textColorHint = 0;
- // aapt resource value: 6
- public const int TextInputLayout_counterEnabled = 6;
-
- // aapt resource value: 7
- public const int TextInputLayout_counterMaxLength = 7;
-
- // aapt resource value: 9
- public const int TextInputLayout_counterOverflowTextAppearance = 9;
-
- // aapt resource value: 8
- public const int TextInputLayout_counterTextAppearance = 8;
-
- // aapt resource value: 4
- public const int TextInputLayout_errorEnabled = 4;
-
- // aapt resource value: 5
- public const int TextInputLayout_errorTextAppearance = 5;
-
- // aapt resource value: 10
- public const int TextInputLayout_hintAnimationEnabled = 10;
+ // aapt resource value: 2
+ public const int TextInputLayout_counterEnabled = 2;
// aapt resource value: 3
- public const int TextInputLayout_hintEnabled = 3;
+ public const int TextInputLayout_counterMaxLength = 3;
- // aapt resource value: 2
- public const int TextInputLayout_hintTextAppearance = 2;
+ // aapt resource value: 4
+ public const int TextInputLayout_counterOverflowTextAppearance = 4;
- // aapt resource value: 13
- public const int TextInputLayout_passwordToggleContentDescription = 13;
+ // aapt resource value: 5
+ public const int TextInputLayout_counterTextAppearance = 5;
+
+ // aapt resource value: 6
+ public const int TextInputLayout_errorEnabled = 6;
+
+ // aapt resource value: 7
+ public const int TextInputLayout_errorTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int TextInputLayout_hintAnimationEnabled = 8;
+
+ // aapt resource value: 9
+ public const int TextInputLayout_hintEnabled = 9;
+
+ // aapt resource value: 10
+ public const int TextInputLayout_hintTextAppearance = 10;
+
+ // aapt resource value: 11
+ public const int TextInputLayout_passwordToggleContentDescription = 11;
// aapt resource value: 12
public const int TextInputLayout_passwordToggleDrawable = 12;
- // aapt resource value: 11
- public const int TextInputLayout_passwordToggleEnabled = 11;
+ // aapt resource value: 13
+ public const int TextInputLayout_passwordToggleEnabled = 13;
// aapt resource value: 14
public const int TextInputLayout_passwordToggleTint = 14;
@@ -7824,36 +7923,37 @@
// 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,
- 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};
+ 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};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -7861,20 +7961,20 @@
// aapt resource value: 1
public const int Toolbar_android_minHeight = 1;
- // aapt resource value: 21
- public const int Toolbar_buttonGravity = 21;
+ // aapt resource value: 2
+ public const int Toolbar_buttonGravity = 2;
- // aapt resource value: 23
- public const int Toolbar_collapseContentDescription = 23;
+ // aapt resource value: 3
+ public const int Toolbar_collapseContentDescription = 3;
- // aapt resource value: 22
- public const int Toolbar_collapseIcon = 22;
+ // aapt resource value: 4
+ public const int Toolbar_collapseIcon = 4;
+
+ // aapt resource value: 5
+ public const int Toolbar_contentInsetEnd = 5;
// aapt resource value: 6
- public const int Toolbar_contentInsetEnd = 6;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetEndWithActions = 10;
+ public const int Toolbar_contentInsetEndWithActions = 6;
// aapt resource value: 7
public const int Toolbar_contentInsetLeft = 7;
@@ -7882,118 +7982,106 @@
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
- // aapt resource value: 5
- public const int Toolbar_contentInsetStart = 5;
-
// aapt resource value: 9
- public const int Toolbar_contentInsetStartWithNavigation = 9;
+ public const int Toolbar_contentInsetStart = 9;
- // aapt resource value: 4
- public const int Toolbar_logo = 4;
-
- // aapt resource value: 26
- public const int Toolbar_logoDescription = 26;
-
- // aapt resource value: 20
- public const int Toolbar_maxButtonHeight = 20;
-
- // aapt resource value: 25
- public const int Toolbar_navigationContentDescription = 25;
-
- // aapt resource value: 24
- public const int Toolbar_navigationIcon = 24;
+ // aapt resource value: 10
+ public const int Toolbar_contentInsetStartWithNavigation = 10;
// aapt resource value: 11
- public const int Toolbar_popupTheme = 11;
-
- // aapt resource value: 3
- public const int Toolbar_subtitle = 3;
-
- // aapt resource value: 13
- public const int Toolbar_subtitleTextAppearance = 13;
-
- // aapt resource value: 28
- public const int Toolbar_subtitleTextColor = 28;
-
- // aapt resource value: 2
- public const int Toolbar_title = 2;
-
- // aapt resource value: 14
- public const int Toolbar_titleMargin = 14;
-
- // aapt resource value: 18
- public const int Toolbar_titleMarginBottom = 18;
-
- // aapt resource value: 16
- public const int Toolbar_titleMarginEnd = 16;
-
- // aapt resource value: 15
- public const int Toolbar_titleMarginStart = 15;
-
- // aapt resource value: 17
- public const int Toolbar_titleMarginTop = 17;
-
- // aapt resource value: 19
- public const int Toolbar_titleMargins = 19;
+ public const int Toolbar_logo = 11;
// aapt resource value: 12
- public const int Toolbar_titleTextAppearance = 12;
+ public const int Toolbar_logoDescription = 12;
+
+ // aapt resource value: 13
+ public const int Toolbar_maxButtonHeight = 13;
+
+ // aapt resource value: 14
+ public const int Toolbar_navigationContentDescription = 14;
+
+ // aapt resource value: 15
+ public const int Toolbar_navigationIcon = 15;
+
+ // aapt resource value: 16
+ public const int Toolbar_popupTheme = 16;
+
+ // aapt resource value: 17
+ public const int Toolbar_subtitle = 17;
+
+ // aapt resource value: 18
+ public const int Toolbar_subtitleTextAppearance = 18;
+
+ // aapt resource value: 19
+ public const int Toolbar_subtitleTextColor = 19;
+
+ // aapt resource value: 20
+ public const int Toolbar_title = 20;
+
+ // aapt resource value: 21
+ public const int Toolbar_titleMargin = 21;
+
+ // aapt resource value: 22
+ public const int Toolbar_titleMarginBottom = 22;
+
+ // aapt resource value: 23
+ public const int Toolbar_titleMarginEnd = 23;
+
+ // aapt resource value: 26
+ public const int Toolbar_titleMargins = 26;
+
+ // aapt resource value: 24
+ public const int Toolbar_titleMarginStart = 24;
+
+ // aapt resource value: 25
+ public const int Toolbar_titleMarginTop = 25;
// aapt resource value: 27
- public const int Toolbar_titleTextColor = 27;
+ public const int Toolbar_titleTextAppearance = 27;
+ // aapt resource value: 28
+ public const int Toolbar_titleTextColor = 28;
+
+ // aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
public static int[] TwoLevelHeader = new int[] {
- 2130772376,
- 2130772377,
- 2130772378,
- 2130772379,
- 2130772380,
- 2130772381};
-
- // aapt resource value: 5
- public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
-
- // aapt resource value: 4
- public const int TwoLevelHeader_srlEnableTwoLevel = 4;
-
- // aapt resource value: 3
- public const int TwoLevelHeader_srlFloorDuration = 3;
-
- // aapt resource value: 1
- public const int TwoLevelHeader_srlFloorRage = 1;
+ 2130968890,
+ 2130968895,
+ 2130968899,
+ 2130968900,
+ 2130968911,
+ 2130968915};
// aapt resource value: 0
- public const int TwoLevelHeader_srlMaxRage = 0;
+ public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
+
+ // aapt resource value: 1
+ public const int TwoLevelHeader_srlEnableTwoLevel = 1;
// aapt resource value: 2
- public const int TwoLevelHeader_srlRefreshRage = 2;
+ public const int TwoLevelHeader_srlFloorDuration = 2;
+ // aapt resource value: 3
+ public const int TwoLevelHeader_srlFloorRage = 3;
+
+ // aapt resource value: 4
+ public const int TwoLevelHeader_srlMaxRage = 4;
+
+ // aapt resource value: 5
+ public const int TwoLevelHeader_srlRefreshRage = 5;
+
+ // aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
public static int[] View = new int[] {
16842752,
16842970,
- 2130772218,
- 2130772219,
- 2130772220};
+ 2130968816,
+ 2130968817,
+ 2130968973};
- // aapt resource value: 1
- public const int View_android_focusable = 1;
-
- // aapt resource value: 0
- public const int View_android_theme = 0;
-
- // aapt resource value: 3
- public const int View_paddingEnd = 3;
-
- // aapt resource value: 2
- public const int View_paddingStart = 2;
-
- // aapt resource value: 4
- public const int View_theme = 4;
-
+ // aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
public static int[] ViewBackgroundHelper = new int[] {
16842964,
- 2130772221,
- 2130772222};
+ 2130968645,
+ 2130968646};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -8004,6 +8092,7 @@
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
+ // aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
@@ -8018,31 +8107,20 @@
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
- public static int[] pickerview = new int[] {
- 2130772412,
- 2130772413,
- 2130772414,
- 2130772415,
- 2130772416,
- 2130772417};
-
- // aapt resource value: 4
- public const int pickerview_wheelview_dividerColor = 4;
+ // aapt resource value: 1
+ public const int View_android_focusable = 1;
// aapt resource value: 0
- public const int pickerview_wheelview_gravity = 0;
-
- // aapt resource value: 5
- public const int pickerview_wheelview_lineSpacingMultiplier = 5;
-
- // aapt resource value: 3
- public const int pickerview_wheelview_textColorCenter = 3;
+ public const int View_android_theme = 0;
// aapt resource value: 2
- public const int pickerview_wheelview_textColorOut = 2;
+ public const int View_paddingEnd = 2;
- // aapt resource value: 1
- public const int pickerview_wheelview_textSize = 1;
+ // aapt resource value: 3
+ public const int View_paddingStart = 3;
+
+ // aapt resource value: 4
+ public const int View_theme = 4;
static Styleable()
{
@@ -8053,6 +8131,25 @@
{
}
}
+
+ 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()
+ {
+ }
+ }
}
}
#pragma warning restore 1591
diff --git a/ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png b/ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png
index 80be5ba..68960e6 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png
+++ b/ZigbeeApp/GateWay.Droid/Resources/drawable/Loading.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png
new file mode 100755
index 0000000..78c5f84
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_748-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.png
new file mode 100755
index 0000000..c2c8ed9
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-3.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-3.png
new file mode 100755
index 0000000..c2c8ed9
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1024_768-3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png
new file mode 100755
index 0000000..ed5abe7
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1125_2436-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png
new file mode 100755
index 0000000..cacd31f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2208.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png
new file mode 100755
index 0000000..73a6627
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1242_2688_XS Max-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008-1.png
new file mode 100755
index 0000000..4942e4a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2008-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.png
new file mode 100755
index 0000000..3aa9190
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-3.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-3.png
new file mode 100755
index 0000000..3aa9190
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1536_2048-3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828-1.png
new file mode 100755
index 0000000..23abb10
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/1792_828-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496-1.png
new file mode 100755
index 0000000..6d32881
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1496-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.png
new file mode 100755
index 0000000..f1db73f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-3.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-3.png
new file mode 100755
index 0000000..f1db73f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_1536-3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png
new file mode 100755
index 0000000..c7b53b1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2048_2732.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242-1.png
new file mode 100755
index 0000000..4092649
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2208_1242-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125-1.png
new file mode 100755
index 0000000..e4ea893
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2436_1125-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242-1.png
new file mode 100755
index 0000000..98dc1c1
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/2688_1242-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480-1.png
new file mode 100755
index 0000000..75b2896
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/320_480-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png
new file mode 100755
index 0000000..dee0605
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-3.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-3.png
new file mode 100755
index 0000000..dee0605
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_1136-3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.png
new file mode 100755
index 0000000..68ece8a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-3.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-3.png
new file mode 100755
index 0000000..68ece8a
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/640_960-3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334-1.png
new file mode 100755
index 0000000..c746b45
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/750_1334-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004-1.png
new file mode 100755
index 0000000..526911f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1004-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.png
new file mode 100755
index 0000000..42fdc74
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-2.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-3.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-3.png
new file mode 100755
index 0000000..42fdc74
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/768_1024-3.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png
new file mode 100755
index 0000000..d85b362
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/828_1792_XR-1.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
index 17aefa3..89d8507 100755
--- a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
+++ b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/Contents.json
@@ -3,6 +3,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
+ "filename": "1920_1080-1.png",
"size": "1920x1080",
"scale": "1x",
"idiom": "tv",
@@ -11,6 +12,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
+ "filename": "3840_2160-1.png",
"size": "1920x1080",
"scale": "2x",
"idiom": "tv",
@@ -20,7 +22,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1242*2688.png",
+ "filename": "1242_2688_XS Max-1.png",
"size": "414x896",
"subtype": "1792",
"scale": "3x",
@@ -30,7 +32,7 @@
"minimum-system-version": "12.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴828*1792.png",
+ "filename": "828_1792_XR-1.png",
"size": "276x597.3",
"subtype": "2688",
"scale": "3x",
@@ -40,7 +42,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2688*1242.png",
+ "filename": "2688_1242-1.png",
"size": "896x414",
"subtype": "1792",
"scale": "3x",
@@ -50,7 +52,7 @@
"minimum-system-version": "12.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴1792*828.png",
+ "filename": "1792_828-1.png",
"size": "597.3x276",
"subtype": "2688",
"scale": "3x",
@@ -60,7 +62,7 @@
"minimum-system-version": "11.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1125*2436.png",
+ "filename": "1125_2436-1.png",
"size": "375x812",
"subtype": "2436h",
"scale": "3x",
@@ -70,7 +72,7 @@
"minimum-system-version": "11.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2436*1125.png",
+ "filename": "2436_1125-1.png",
"size": "812x375",
"subtype": "2436h",
"scale": "3x",
@@ -80,7 +82,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1242*2208.png",
+ "filename": "1242_2208.png",
"size": "414x736",
"subtype": "736h",
"scale": "3x",
@@ -90,7 +92,7 @@
"minimum-system-version": "8.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴750_1334澶囦唤.png",
+ "filename": "750_1334-1.png",
"size": "375x667",
"subtype": "667h",
"scale": "2x",
@@ -100,7 +102,7 @@
"minimum-system-version": "8.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2208*1242.png",
+ "filename": "2208_1242-1.png",
"size": "736x414",
"subtype": "736h",
"scale": "3x",
@@ -110,7 +112,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴2048*2732.png",
+ "filename": "2048_2732.png",
"size": "1024x1366",
"scale": "2x",
"idiom": "ipad"
@@ -119,7 +121,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_960澶囦唤.png",
+ "filename": "640_960-2.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -128,7 +130,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_1136澶囦唤.png",
+ "filename": "640_1136-2.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -138,7 +140,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴768*1024.png",
+ "filename": "768_1024-2.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -147,7 +149,7 @@
"minimum-system-version": "7.0",
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1536*2048.png",
+ "filename": "1536_2048-2.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -156,7 +158,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴1024*768.png",
+ "filename": "1024_768-2.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -165,7 +167,7 @@
"minimum-system-version": "7.0",
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2048*1536.png",
+ "filename": "2048_1536-2.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
@@ -173,7 +175,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴320_480澶囦唤.png",
+ "filename": "320_480-1.png",
"size": "320x480",
"scale": "1x",
"idiom": "iphone"
@@ -181,7 +183,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_960澶囦唤-1.png",
+ "filename": "640_960-3.png",
"size": "320x480",
"scale": "2x",
"idiom": "iphone"
@@ -189,7 +191,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴640_1136澶囦唤-1.png",
+ "filename": "640_1136-3.png",
"size": "320x568",
"subtype": "retina4",
"scale": "2x",
@@ -198,7 +200,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "鏄撴768_1004澶囦唤.png",
+ "filename": "768_1004-1.png",
"size": "768x1004",
"scale": "1x",
"idiom": "ipad"
@@ -206,7 +208,7 @@
{
"orientation": "portrait",
"extent": "to-status-bar",
- "filename": "鏄撴1536_2008澶囦唤.png",
+ "filename": "1536_2008-1.png",
"size": "768x1004",
"scale": "2x",
"idiom": "ipad"
@@ -214,7 +216,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴768_1024澶囦唤.png",
+ "filename": "768_1024-3.png",
"size": "768x1024",
"scale": "1x",
"idiom": "ipad"
@@ -222,7 +224,7 @@
{
"orientation": "portrait",
"extent": "full-screen",
- "filename": "鏄撴1536_2048澶囦唤.png",
+ "filename": "1536_2048-3.png",
"size": "768x1024",
"scale": "2x",
"idiom": "ipad"
@@ -230,7 +232,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "鏄撴1024_748澶囦唤.png",
+ "filename": "1024_748-1.png",
"size": "1024x748",
"scale": "1x",
"idiom": "ipad"
@@ -238,7 +240,7 @@
{
"orientation": "landscape",
"extent": "to-status-bar",
- "filename": "鏄撴2048_1496澶囦唤.png",
+ "filename": "2048_1496-1.png",
"size": "1024x748",
"scale": "2x",
"idiom": "ipad"
@@ -246,7 +248,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴1024_768澶囦唤.png",
+ "filename": "1024_768-3.png",
"size": "1024x768",
"scale": "1x",
"idiom": "ipad"
@@ -254,7 +256,7 @@
{
"orientation": "landscape",
"extent": "full-screen",
- "filename": "鏄撴2048_1536澶囦唤.png",
+ "filename": "2048_1536-3.png",
"size": "1024x768",
"scale": "2x",
"idiom": "ipad"
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024*768.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024*768.png"
deleted file mode 100644
index 2b98c16..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024*768.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024_748\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024_748\345\244\207\344\273\275.png"
deleted file mode 100755
index a82c717..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024_748\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024_768\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024_768\345\244\207\344\273\275.png"
deleted file mode 100755
index 2b98c16..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471024_768\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471125*2436.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471125*2436.png"
deleted file mode 100644
index 9d7348a..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471125*2436.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471242*2208.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471242*2208.png"
deleted file mode 100644
index d4b9c68..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471242*2208.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471242*2688.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471242*2688.png"
deleted file mode 100644
index 147990a..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471242*2688.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536*2048.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536*2048.png"
deleted file mode 100644
index 736a3c6..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536*2048.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536_2008\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536_2008\345\244\207\344\273\275.png"
deleted file mode 100755
index 4961c22..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536_2008\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536_2048\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536_2048\345\244\207\344\273\275.png"
deleted file mode 100755
index 736a3c6..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471536_2048\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471792*828.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471792*828.png"
deleted file mode 100644
index 7f565ad..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2471792*828.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048*1536.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048*1536.png"
deleted file mode 100644
index 8c238d9..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048*1536.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048*2732.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048*2732.png"
deleted file mode 100644
index 8fcd577..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048*2732.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048_1496\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048_1496\345\244\207\344\273\275.png"
deleted file mode 100755
index db8e8de..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048_1496\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048_1536\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048_1536\345\244\207\344\273\275.png"
deleted file mode 100755
index 8c238d9..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472048_1536\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472208*1242.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472208*1242.png"
deleted file mode 100644
index 85d0525..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472208*1242.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472436*1125.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472436*1125.png"
deleted file mode 100644
index 6e31500..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472436*1125.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472688*1242.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472688*1242.png"
deleted file mode 100644
index 80784b4..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\2472688*1242.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247320_480\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247320_480\345\244\207\344\273\275.png"
deleted file mode 100755
index 6d8e60c..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247320_480\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_1136\345\244\207\344\273\275-1.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_1136\345\244\207\344\273\275-1.png"
deleted file mode 100755
index 0fbd6b4..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_1136\345\244\207\344\273\275-1.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_1136\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_1136\345\244\207\344\273\275.png"
deleted file mode 100755
index 0fbd6b4..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_1136\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_960\345\244\207\344\273\275-1.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_960\345\244\207\344\273\275-1.png"
deleted file mode 100755
index bf03de8..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_960\345\244\207\344\273\275-1.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_960\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_960\345\244\207\344\273\275.png"
deleted file mode 100755
index bf03de8..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247640_960\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247750_1334\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247750_1334\345\244\207\344\273\275.png"
deleted file mode 100755
index 95ae2bd..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247750_1334\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768*1024.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768*1024.png"
deleted file mode 100644
index 4ef3f1c..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768*1024.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768_1004\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768_1004\345\244\207\344\273\275.png"
deleted file mode 100755
index be6450b..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768_1004\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768_1024\345\244\207\344\273\275.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768_1024\345\244\207\344\273\275.png"
deleted file mode 100755
index 4ef3f1c..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247768_1024\345\244\207\344\273\275.png"
+++ /dev/null
Binary files differ
diff --git "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247828*1792.png" "b/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247828*1792.png"
deleted file mode 100644
index 907da4a..0000000
--- "a/ZigbeeApp/Home.Ios/Assets.xcassets/LaunchImage.launchimage/\346\230\223\346\254\247828*1792.png"
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 1de72cf..8885bc5 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -199,6 +199,33 @@
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048*1536-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1920_1080-1.png" />
<ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\3840_2160-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2688_XS Max-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\828_1792_XR-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2688_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1792_828-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1125_2436-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2436_1125-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1242_2208.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\750_1334-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2208_1242-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_2732.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-2.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\320_480-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_960-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\640_1136-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1004-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2008-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\768_1024-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1536_2048-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_748-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1496-1.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\1024_768-3.png" />
+ <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\2048_1536-3.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\40_40-3.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\60_60-1.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\58_58-2.png" />
@@ -223,37 +250,9 @@
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\87_87-2.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\80_80-4.png" />
<ImageAsset Include="Assets.xcassets\AppIcon.appiconset\1024_1024-2.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2688.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴828*1792.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2688*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1792*828.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1125*2436.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2436*1125.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1242*2208.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2208*1242.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*2732.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768*1024.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536*2048.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024*768.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048*1536.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴750_1334澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴320_480澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_960澶囦唤-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴640_1136澶囦唤-1.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1004澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2008澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴768_1024澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1536_2048澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_748澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1496澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴1024_768澶囦唤.png" />
- <ImageAsset Include="Assets.xcassets\LaunchImage.launchimage\鏄撴2048_1536澶囦唤.png" />
</ItemGroup>
<ItemGroup>
<BundleResource Include="Resources\Language.ini" />
- <BundleResource Include="Resources\DeviceName.ini" />
<BundleResource Include="Resources\Phone\Guide\RightIcon.png" />
<BundleResource Include="Resources\Phone\Guide\LeftIcon.png" />
<BundleResource Include="Resources\Phone\Guide\Finger.png" />
@@ -706,7 +705,6 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\withdrawal.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicaddcolor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor13.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\nightLight.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\logicclose.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\function.png" />
@@ -750,7 +748,6 @@
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor21.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\selectedsensor0.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\next.png" />
- <BundleResource Include="Resources\Phone\ZigeeLogic\iconBackgroundColor1.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\iconSelectedBackgroundColor.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\security.png" />
<BundleResource Include="Resources\Phone\ZigeeLogic\sensor44.png" />
@@ -1144,6 +1141,7 @@
<BundleResource Include="Resources\Phone\Gateway\WiredGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\WirelessGateway.png" />
<BundleResource Include="Resources\Phone\Gateway\AddGatewaySuccess.png" />
+ <BundleResource Include="Resources\DeviceName.ini" />
</ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index 97f150a..6e30abb 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.0120072301</string>
+ <string>1.1.012007061</string>
<key>CFBundleVersion</key>
- <string>2020072301</string>
+ <string>202007061</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
diff --git a/ZigbeeApp/Home.Ios/Resources/DeviceName.ini b/ZigbeeApp/Home.Ios/Resources/DeviceName.ini
index be83f7f..7a871b7 100755
--- a/ZigbeeApp/Home.Ios/Resources/DeviceName.ini
+++ b/ZigbeeApp/Home.Ios/Resources/DeviceName.ini
@@ -105,9 +105,6 @@
MGCD01/M-ZB.10 = 1306 / 鍚搁《寮忕噧姘斾紶鎰熷櫒 / 鍚搁《寮忕噧姘斾紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣�
;PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
MSPM25/M-ZB.10 = 1307 / PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� / PM2.5绌烘皵璐ㄩ噺浼犳劅鍣� / 1307 / 绌烘皵璐ㄩ噺 / 浼犳劅鍣�
-;娓╂箍搴︿紶鎰熷櫒(杩欎釜涓滆タ濂藉儚鏈変袱涓�)
-MTH01/M-ZB.10 = 1308 / 娓╂箍搴︿紶鎰熷櫒 / 娓╂箍搴︿紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣�
-MSHIM01/M-ZB.10 = 1308 / 娓╂箍搴︿紶鎰熷櫒 / 娓╂箍搴︿紶鎰熷櫒 / 1200 / 浼犳劅鍣� / 浼犳劅鍣�
;***************************************************************
; 缁х數鍣ㄨ澶�
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 3aa1b68..6c90466 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -1880,8 +1880,6 @@
16141=绱ф�ユ寜閽�
16142=闂ㄧ獥浼犳劅鍣�
16143=閽ュ寵鎵�
-16144=鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
-16145=闀挎寜姝ゆ寜閿�
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelFourButton.png b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelFourButton.png
index 91fa891..19d8078 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelFourButton.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelFourButton.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelThreeButton.png b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelThreeButton.png
index 6b9e971..96688db 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelThreeButton.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelThreeButton.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelTwoButton.png b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelTwoButton.png
index fcaef59..bd1271c 100755
--- a/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelTwoButton.png
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Instruct/PanelTwoButton.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/iconBackgroundColor1.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/iconBackgroundColor1.png
deleted file mode 100755
index cecc4ee..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/iconBackgroundColor1.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/iconSelectedBackgroundColor1.png b/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/iconSelectedBackgroundColor1.png
deleted file mode 100755
index b2c5368..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/ZigeeLogic/iconSelectedBackgroundColor1.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
old mode 100755
new mode 100644
index 44f364e..b418ae8
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,7 +42,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0120072403";
+ public static string CodeIDString = "1.1.0120072401";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
@@ -378,7 +378,7 @@
DeviceType = deviceType
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(RegIDObj);
- var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson), 4);
+ var reverObj = CommonPage.Instance.RequestHttpsZigbeeAsync("ZigbeeUsers/SignZigbeeNeedPushRegID", System.Text.Encoding.UTF8.GetBytes(requestJson));
if (reverObj == null)
{
//璋冭瘯:璁板綍鏋佸厜ID
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index a813749..b94b3e0 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -99,7 +99,7 @@
this.dicDeviceEpoint.Clear();
//鍒濆鍖栬澶囨灇涓�
- this.InitDeviceModelIdEnum();
+ this.InitDeviceModelIdEnum();
//鑾峰彇鏈湴鍏ㄩ儴鐨勮澶囨枃浠�
List<string> listFile = this.GetAllDeviceFile();
@@ -267,8 +267,22 @@
listDriveDevice.Add(device);
}
}
- //璁剧疆铏氭嫙璁惧鐨勯粯璁ゅ悕瀛�
- this.SetDriveDeviceDefultName(listDriveDevice);
+ if (listDriveDevice.Count > 0)
+ {
+ //濡傛灉铏氭嫙璁惧杩樻病鏈夊悕瀛楃殑璇�
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //濡傛灉涓嶈繖鏍锋斁鍦ㄤ竴涓嚎绋嬮噷,鏈夊彲鑳藉Dictionary浜х敓褰卞搷
+ foreach (var myDevice in listDriveDevice)
+ {
+ //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
+ var dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
+ //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
+ dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
+ this.ReName(myDevice, dName, ShowErrorMode.NO);
+ }
+ });
+ }
//鍙湁瀹屽叏鑾峰彇鐨勬椂鍊�,鎵嶄細鍘诲鐞嗗垹闄ょ殑闂
if (statu != 1)
@@ -520,42 +534,6 @@
return true;
}
- /// <summary>
- /// 璁剧疆铏氭嫙璁惧鐨勯粯璁ゅ悕瀛�
- /// </summary>
- /// <param name="listDriveDevice">铏氭嫙璁惧鍒楄〃</param>
- private void SetDriveDeviceDefultName(List<CommonDevice> listDriveDevice)
- {
- if (listDriveDevice.Count == 0)
- {
- return;
- }
- //濡傛灉铏氭嫙璁惧杩樻病鏈夊悕瀛楃殑璇�
- HdlThreadLogic.Current.RunThread(() =>
- {
- //濡傛灉涓嶈繖鏍锋斁鍦ㄤ竴涓嚎绋嬮噷,鏈夊彲鑳藉Dictionary浜х敓褰卞搷
- foreach (var myDevice in listDriveDevice)
- {
- string dName = string.Empty;
- if (this.IsMiniLight(myDevice) == true)
- {
- //Mini澶滅伅
- dName = Language.StringByID(R.MyInternationalizationString.uMiniNightLight);
- }
- else
- {
- //鏍规嵁璁惧绫诲瀷鑾峰彇鍚嶇О
- dName = this.GetDeviceObjectText(new List<CommonDevice>() { myDevice }, false);
- //鍦ㄧ鐐瑰悕瀛楃殑鍚庨潰闄勫姞銆愬洖璺�戝瓧鏍�
- dName += "(" + myDevice.DeviceEpoint + Language.StringByID(R.MyInternationalizationString.uDeviceCircuit) + ")";
- }
- this.ReName(myDevice, dName, ShowErrorMode.NO);
-
- System.Threading.Thread.Sleep(100);
- }
- });
- }
-
///<summary >
/// 淇敼璁惧mac鍚嶇О
/// <para>macName:璁惧鍚嶇О</para>
@@ -565,7 +543,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
+ return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
}
//鑾峰彇缂栬緫璁惧Mac鍚嶅瓧鐨勫懡浠ゅ瓧绗�
@@ -576,7 +554,7 @@
return null;
}
//鍔犵紦瀛�
- Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceMacName(device, macName);
+ Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceMacName(device, macName, "MacRename");
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RenameDeviceMacNameData>(result.ReceiptData);
return new CommonDevice.RenameDeviceMacNameAllData { renameDeviceMacNameData = tempData };
@@ -593,7 +571,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
+ return Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
}
//鑾峰彇缂栬緫璁惧绔偣鍚嶅瓧鐨勫懡浠ゅ瓧绗�
var sendData = this.GetReDeviceEpointNameCommandText(device.DeviceAddr, device.DeviceEpoint, deviceName);
@@ -603,7 +581,7 @@
return null;
}
//鍔犵紦瀛�
- Phone.TemplateData.TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, deviceName);
+ Phone.ModelData.DeviceModelDataLogic.Current.ReDeviceEpointName(device, deviceName, "DeviceRename");
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceRenameResponseData>(result.ReceiptData);
return new CommonDevice.DeviceRenameAllData { deviceRenameData = tempData };
@@ -869,9 +847,9 @@
//闂ㄩ攣娌℃湁瀹氫綅鍔熻兘
return false;
}
- var myTypeInfo = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
if (device.Type == DeviceType.IASZone)
{
+ var myTypeInfo = this.GetMyDeviceEnumInfo(new List<CommonDevice>() { device });
if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_Pir)
{
//浼犳劅鍣ㄩ櫎浜哖ir閮芥病鏈夊畾浣嶅姛鑳�
@@ -882,11 +860,6 @@
//鐞冨瀷绉诲姩浼犳劅鍣ㄨ櫧鐒舵槸鐢垫睜璁惧,浣嗘槸瀹冩湁瀹氫綅鍔熻兘
return true;
}
- return false;
- }
- //娓╂箍搴︿紶鎰熷櫒娌℃湁瀹氫綅鍔熻兘
- if (myTypeInfo.ConcreteType == DeviceConcreteType.Sensor_TemperatureHumidity)
- {
return false;
}
@@ -1386,16 +1359,6 @@
//闈㈡澘鐨勬俯搴︽帰澶村彨 闈㈡澘鍚嶅瓧+娓╁害
return deviceInfoType.DeviceDefultName + Language.StringByID(R.MyInternationalizationString.uTemperature);
}
- else if (((TemperatureSensor)device).SensorDiv == 1)
- {
- //娓╁害浼犳劅鍣�
- return Language.StringByID(R.MyInternationalizationString.TemperatureSensor);
- }
- else if (((TemperatureSensor)device).SensorDiv == 2)
- {
- //婀垮害浼犳劅鍣�
- return Language.StringByID(R.MyInternationalizationString.HumiditySensor);
- }
}
//鍏朵粬鎯呭喌,浣跨敤瀹冪殑榛樿鍚嶇О
return deviceInfoType.DeviceDefultName + epointNo;
@@ -1430,7 +1393,7 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="macName">Mac鍚嶅瓧</param>
/// <returns></returns>
- public void SetMacName(CommonDevice device, string macName)
+ private void SetMacName(CommonDevice device, string macName)
{
device.DeviceName = macName;
}
@@ -1441,7 +1404,7 @@
/// <param name="device">璁惧瀵硅薄</param>
/// <param name="epointName">绔偣鍚嶅瓧</param>
/// <returns></returns>
- public void SetEpointName(CommonDevice device, string epointName)
+ private void SetEpointName(CommonDevice device, string epointName)
{
device.DeviceEpointName = epointName;
}
@@ -1891,8 +1854,7 @@
info.ObjectTypeName = this.dicDeviceModelIdEnum["A418"].A绫诲瀷鍚嶅瓧;//璋冨厜妯″潡
}
else if (info.BeloneType == DeviceBeloneType.A浼犳劅鍣�
- || device.Type == DeviceType.TemperatureSensor
- || device.Type == DeviceType.FreshAirHumiditySensor)
+ || device.Type == DeviceType.TemperatureSensor)
{
//浼犳劅鍣ㄥ悎骞�
info.ConcreteType = DeviceConcreteType.Sensor;
@@ -2197,6 +2159,12 @@
//闂ㄧ獥浼犳劅鍣�
info.ConcreteType = DeviceConcreteType.Sensor_DoorWindow;
info.ConcreteText = Language.StringByID(R.MyInternationalizationString.uSensorDoorWindow);
+ }
+ else if (iasZone.IasDeviceType == 541)
+ {
+ //鐞冨瀷绉诲姩浼犳劅鍣�
+ info.ConcreteType = DeviceConcreteType.Sensor_SphericalMotion;
+ info.ConcreteText = this.dicDeviceModelIdEnum["MSPIRB-ZB.10"].A瀹樻柟鍚嶅瓧;
}
}
@@ -2739,14 +2707,15 @@
listCheck.Add(mainkeys);
//鍒锋柊涓�涓嬫湰鍦扮紦瀛�
var localDevice = this.GetDevice(mainkeys);
- var tempDevice = localDevice == null ? device : localDevice;
-
- //鍒锋柊灞炴��
- this.SetDeviceInfoToMain(tempDevice, device);
- if (this.RefreshDeviceFunctionType(tempDevice, device, false) == true)
+ if (localDevice != null)
{
- //闇�瑕佸彂閫佸姛鑳界被鍨嬬粰缃戝叧
- listFucDevice.Add(tempDevice);
+ //鍒锋柊灞炴��
+ this.SetDeviceInfoToMain(localDevice, device);
+ if (this.RefreshDeviceFunctionType(localDevice, device, false) == true)
+ {
+ //闇�瑕佸彂閫佸姛鑳界被鍨嬬粰缃戝叧
+ listFucDevice.Add(localDevice);
+ }
}
}
}
@@ -2881,8 +2850,14 @@
/// <param name="device">璁剧疆婧愯澶囧璞�</param>
public void SetDeviceInfoToMain(CommonDevice mainDevice, CommonDevice device)
{
- mainDevice.DeviceName = device.DeviceInfo.MacName;
- mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
+ if (string.IsNullOrEmpty(device.DeviceInfo.MacName) == false)
+ {
+ mainDevice.DeviceName = device.DeviceInfo.MacName;
+ }
+ if (string.IsNullOrEmpty(device.DeviceInfo.DeviceName) == false)
+ {
+ mainDevice.DeviceEpointName = device.DeviceInfo.DeviceName;
+ }
mainDevice.CurrentGateWayId = device.CurrentGateWayId;
mainDevice.ZigbeeType = device.DeviceInfo.ZigbeeType;
mainDevice.IsOnline = device.DeviceInfo.IsOnline;
@@ -3396,10 +3371,6 @@
/// PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
/// </summary>
Sensor_PMTwoPointFive = 1307,
- /// <summary>
- /// 娓╂箍搴︿紶鎰熷櫒(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
- /// </summary>
- Sensor_TemperatureHumidity = 1308,
/// <summary>
/// 杩愬姩浼犳劅鍣�
@@ -3410,7 +3381,11 @@
/// </summary>
Sensor_Keyfob = -1307,
/// <summary>
- /// 娓╁害浼犳劅鍣�(杩欎釜鍗曡瘝鎷奸敊浜�,浣嗘槸閿欎簡灏遍敊浜嗗憲,灏辫繖鏍蜂簡)
+ /// 娓╂箍搴︿紶鎰熷櫒
+ /// </summary>
+ Sensor_TemperatureHumidity = -1308,
+ /// <summary>
+ /// 娓╁害浼犳劅鍣�
/// </summary>
Sensor_Temperature = -1309,
/// <summary>
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 87e9aee..e726972 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -65,58 +65,6 @@
/// value:FloorName
/// </summary>
public Dictionary<string,string> FloorDics = new Dictionary<string,string> { };
- /// <summary>
- /// -1:鏈厤缃�(闇�瑕侀噸鏂伴�夋嫨) 1:鏃犳ā鏉挎湁璁惧 2:鏈夋ā鏉挎湁璁惧 3:鏃犳ā鏉挎棤璁惧(璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- public int TemplateMode = -1;
- /// <summary>
- /// 璇ヤ綇瀹呮槸鍚︽槸灞曠ず妯℃澘(姝ゅ彉閲忔槸缁欐煡鐪嬫ā鏉挎暟鎹椂浣跨敤鐨�,璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public bool IsShowTemplate = false;
- /// <summary>
- /// 褰撳墠浣忓畢閫夋嫨鐨勬ā鏉垮悕瀛�(璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- public string SelectTemplate = string.Empty;
- /// <summary>
- /// 鑷畾涔夊崟鍏冪殑鏍囬鍚嶇О(涓嶭istUintContent涓暟鍖归厤,璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- public List<string> ListUintName = new List<string>();
- /// <summary>
- /// 鑷畾涔夊崟鍏冪殑鍐呭(涓嶭istUintName涓暟鍖归厤,璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- public List<string> ListUintContent = new List<string>();
- /// <summary>
- /// 鏈�鍚庣紪杈戠殑浜嬩欢(2020.05.26杩藉姞) 1970/12/31 23:59鏍煎紡
- /// </summary>
- public string LastEditorTime = "1970/12/31 23:59";
- /// <summary>
- /// 鏍囪瘑姝や綇瀹呯殑鏁版嵁鏄惁宸茬粡鍙戦�佽繃妯℃澘鏁版嵁缁欑綉鍏�(鍙拡瀵筎emplateMode=2,璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- public bool SendTemplateSuccess = false;
- /// <summary>
- /// 杩欎釜浣忓畢涓嬫墍鎷ユ湁鐨勭綉鍏砳d(2020.05.26杩藉姞,null浠ｈ〃娌℃湁澶勭悊杩�,璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public List<string> listGatewayId = null;
- /// <summary>
- /// <para>鏍囪瘑浣忓畢鏁版嵁鐨勫尯鍒�(鏂囦欢璇诲彇鏃堕厤缃�,璇锋棤瑙嗚繖涓彉閲�)锛�</para>
- /// <para>1:鏈韩鑷繁鐨勬暟鎹�(鏂囦欢澶瑰悕瀛椾负浣忓畢id)</para>
- /// <para>2:鑷繁鎵嬪姩鍒涘缓鐨勪繚瀛樺湪鏈満鐨勫浠�(鏂囦欢澶瑰悕瀛椾互銆怋ackupResidenceData銆戝紑澶�)</para>
- /// <para>3:姝ゆ暟鎹粠浜戠涓嬭浇鑰屾潵(鏂囦欢澶瑰悕瀛椾互銆怐ownLoadResidenceData銆戝紑澶�)</para>
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public int HouseDataDiv = 1;
- /// <summary>
- /// 褰撳墠浣忓畢鐨勫湪绾跨姸鎬� -1:铏氭嫙 0:绂荤嚎 1:鏈湴 2:杩滅▼ 3:璇诲彇涓�(璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string NowHomeOnlineStatu = "3";
- /// <summary>
- /// 褰撳墠瀛樻斁浣忓畢鏁版嵁鐨勬枃浠跺す鍚嶅瓧(姝ゅ彉閲忔槸缁欐湰鏈哄浠�,鎴栬�呬簯绔笅杞藉浠戒娇鐢ㄧ殑,璇锋棤瑙嗚繖涓彉閲�)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string SaveDirctoryName = string.Empty;
#endregion
@@ -150,8 +98,6 @@
/// <param name="autoBackup">鏄惁澶囦唤</param>
public void Save(bool autoBackup = true)
{
- //淇敼鏃堕棿
- this.LastEditorTime = DateTime.Now.ToString("yyyy/MM/dd HH:mm");
var path = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, Id);
//濡傛灉娌℃湁瀛樺湪浣忓畢鐩綍锛屽厛鍒涘缓
if (!System.IO.Directory.Exists(path))
diff --git a/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll b/ZigbeeApp/Shared/DLL/Android/Shared.Droid.HDLWidget.dll
index ff36866..b1faab1 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 712d419..0a412cd 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/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 3c1a90e..ca045b2 100755
--- a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -844,8 +844,6 @@
var result = await HdlSceneLogic.Current.EditorSceneNameFromGateway(this.editorScene, this.cloneScene.Name);
if (result == false)
{
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
return;
}
}
@@ -853,10 +851,10 @@
{
//淇敼鍦烘櫙
var result = await HdlSceneLogic.Current.EditorSceneFromGateway(this.editorScene, this.listAdjustTarget);
+ //鍏抽棴杩涘害鏉�
+ this.CloseProgressBar();
if (result == false)
{
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
return;
}
}
@@ -905,9 +903,6 @@
//缂栬緫鍦烘櫙,涓婚〉闇�瑕侀噸鏂板埛鏂�
UserView.UserPage.Instance.RefreshAllForm = true;
-
- //鍏抽棴杩涘害鏉�
- this.CloseProgressBar();
HdlThreadLogic.Current.RunMain(() =>
{
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 2fe6c56..d30d6cd 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -78,8 +78,6 @@
this.AddNormalDeviceReportEvent();
//娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
this.AddSensorDeviceReportEvent();
- //寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
- this.StartRecoverSenorStatuThread();
}
/// <summary>
@@ -462,7 +460,6 @@
{
//鍏堟竻绌�
listView.RemoveAll();
- this.dicDeviceRowControl = new Dictionary<string, Controls.DeviceRowCommon>();
var listDevice = new List<CommonDevice>();
for (int i = 0; i < rowInfo.listDeviceKeys.Count; i++)
@@ -886,44 +883,6 @@
}
}, ShowErrorMode.NO);
- });
- }
-
- #endregion
-
- #region 鈻� 浼犳劅鍣ㄧ姸鎬佽繕鍘焈____________________
-
- /// <summary>
- /// 寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
- /// </summary>
- private void StartRecoverSenorStatuThread()
- {
- HdlThreadLogic.Current.RunThread(() =>
- {
- while (this.Parent != null)
- {
- try
- {
- var dicControl = this.dicDeviceRowControl;
- foreach (var contr in dicControl.Values)
- {
- //濡傛灉鏄紶鎰熷櫒,鍒欏埛鏂扮姸鎬�
- if (contr.device.Type == DeviceType.IASZone && contr.Parent != null
- && ((IASZone)contr.device).iASInfo == null)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //璁惧鐘舵�佸繀椤诲埛鏂�
- string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
- contr.SetDeviceStatuText(statuText);
-
- }, ShowErrorMode.NO);
- }
- }
- System.Threading.Thread.Sleep(8000);
- }
- catch { System.Threading.Thread.Sleep(3000); }
- }
});
}
diff --git a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
index 415ff8d..f087c86 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorLightRowControl.cs
@@ -47,12 +47,6 @@
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
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..af972a0 100755
--- a/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs
+++ b/ZigbeeApp/Shared/Phone/Category/Controls/DeviceRow/DeviceColorTemperatureRowControl.cs
@@ -47,12 +47,6 @@
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
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/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 746574f..3b5ffb5 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -21,14 +21,14 @@
public HorizontalScrolViewLayout roomhorizontalScrol = new HorizontalScrolViewLayout
{
Width = Application.GetRealWidth(1080 - 58),
- Height = Application.GetRealHeight(204),
+ Height = Application.GetRealHeight(200),
Y = Application.GetRealHeight(184),
X = Application.GetRealWidth(58),
};
public VerticalScrolViewLayout middle = new VerticalScrolViewLayout
{
Width = Application.GetRealWidth(1080),
- Height = Application.GetRealHeight(Method.H - 260 - 204 - 184),
+ Height = Application.GetRealHeight(Method.H - 260 - 200 - 184),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
@@ -228,31 +228,49 @@
for (int i = 0; i < RoomList.Count; i++)
{
var room = RoomList[i];
+ var fra = new FrameLayout
+ {
+ Height = Application.GetRealHeight(200),
+ Width = Application.GetRealWidth(255),
+ };
+ roomhorizontalScrol.AddChidren(fra);
- LogicView.RoomClickView roomClickView = new LogicView.RoomClickView();
- roomClickView.Show(roomhorizontalScrol);
- roomClickView.roomnameBtn.Text =room.Name;
+ var roombjBtn = new Button
+ {
+ Height = Application.GetRealHeight(158),
+ Width = Application.GetRealWidth(255),
+ UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+ SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+ Y = Application.GetRealHeight(21),
+ };
+ fra.AddChidren(roombjBtn);
+
+ var roomnameBtn = new Button
+ {
+
+ Height = Application.GetRealHeight(152 - 26 - 20),
+ Width = Application.GetRealWidth(255 - 20 - 50),
+ Text = room.Name,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Y = Application.GetRealHeight(21 + 13 + 10),
+ X = Application.GetRealWidth(10 + 25),
+
+ };
+ fra.AddChidren(roomnameBtn);
if (i == 0)
{
-
roombjButton.IsSelected = false;
- roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
- roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
- roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
- roomClickView.roombjBtn.X = Application.GetRealWidth(0);
- roombjButton = roomClickView.roombjBtn;
- roomClickView.roombjBtn.IsSelected = true;
- roomTextButton.IsSelected = false;
- roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
- roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
- roomTextButton = roomClickView.roomnameBtn;
- roomClickView.roomnameBtn.IsSelected = true;
+ roombjButton = roombjBtn;
+ roombjBtn.IsSelected = true;
+ roomTextButton.IsSelected = false;
+ roomTextButton = roomnameBtn;
+ roomnameBtn.IsSelected = true;
SceneView(room.ListSceneId);
}
-
EventHandler<MouseEventArgs> roomclick = (sender, e) =>
{
@@ -261,31 +279,17 @@
clickbutton = null;
clickbutton = new Button();
- roombjButton.Height = Application.GetRealHeight(72);
- roombjButton.Width = Application.GetRealWidth(170);
- roombjButton.Y = Application.GetRealHeight(60);
- roombjButton.X = Application.GetRealWidth(26);
roombjButton.IsSelected = false;
+ roombjButton = roombjBtn;
+ roombjBtn.IsSelected = true;
- roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
- roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
- roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
- roomClickView.roombjBtn.X = Application.GetRealWidth(0);
- roombjButton = roomClickView.roombjBtn;
- roomClickView.roombjBtn.IsSelected = true;
-
- roomTextButton.Width = Application.GetRealWidth(125);
- roomTextButton.X = Application.GetRealWidth(26 + 22);
roomTextButton.IsSelected = false;
- roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
- roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
- roomTextButton = roomClickView.roomnameBtn;
- roomClickView.roomnameBtn.IsSelected = true;
-
+ roomTextButton = roomnameBtn;
+ roomnameBtn.IsSelected = true;
SceneView(room.ListSceneId);
};
- roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
- roomClickView.roombjBtn.MouseUpEventHandler += roomclick;
+ roomnameBtn.MouseUpEventHandler += roomclick;
+ roombjBtn.MouseUpEventHandler += roomclick;
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 9412a75..426b615 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -22,7 +22,7 @@
completeView.Btntitle.Text = LocalDevice.Current.GetDeviceEpointName(common);
EventHandler<MouseEventArgs> clickcancel = (sender, e) =>
{
- if (edit)
+ if (!edit)
{
UserView.HomePage.Instance.ScrollEnabled = true;
}
@@ -323,9 +323,8 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
openView.selectedIconBtn.Visible = true;
closeView.selectedIconBtn.Visible = false;
- if (iASZonedevice.IasDeviceType == 13)
+ if (iASZonedevice.IasDeviceType == 13||iASZonedevice.IasDeviceType == 541)
{
-
closeView.selectedIconBtn.Visible = true;
}
Send.dictionary(deviceConditionsInfo, "Range", "5");
@@ -356,74 +355,13 @@
{
case 13:
{
-
- if (common.ModelIdentifier == "MSPIRB-ZB.10")
- {
- int _height = 3;
- if (edit)
- {
- _height = 2;
- }
- var view = completeView.Show(_height);
- openView.titleBtn.TextID = MyInternationalizationString.someone;
- closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
- closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- closeView.selectedIconBtn.Visible = true;
- view.AddChidren(openView.Show());
- view.AddChidren(closeView.Show());
-
- takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- takebackView.selectedIconBtn.Visible = true;
- takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
- takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- if (edit)
- {
-
- if (devices["Cluster_ID"] == "1024")
- {
- flMain.RemoveFromParent();
- var illumination = new Illumination();
- UserView.HomePage.Instance.AddChidren(illumination);
- UserView.HomePage.Instance.PageIndex += 1;
- illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
- }
- else
- {
- closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- }
- }
- else
- {
- view.AddChidren(takebackView.Show());
-
- }
-
-
- takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- SelectedDeviceStatus = "";
- openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- openView.selectedIconBtn.Visible = false;
- var illumination = new Illumination();
- UserView.HomePage.Instance.AddChidren(illumination);
- UserView.HomePage.Instance.PageIndex += 1;
- illumination.Show(common, takebackView.titleBtn.Text, 0, false);
-
- };
-
- }
- else
- {
-
- openView.titleBtn.TextID = MyInternationalizationString.someone;
- closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
- closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
- closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
- closeView.selectedIconBtn.Visible = true;
- completeView.Show(2).AddChidren(openView.Show());
- completeView.Show(2).AddChidren(closeView.Show());
-
- }
+ openView.titleBtn.TextID = MyInternationalizationString.someone;
+ closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ closeView.selectedIconBtn.Visible = true;
+ completeView.Show(2).AddChidren(openView.Show());
+ completeView.Show(2).AddChidren(closeView.Show());
}
break;
case 21:
@@ -497,6 +435,61 @@
completeView.Show(1).AddChidren(openView.Show());
}
break;
+ case 541:
+ {
+ int _height = 3;
+ if (edit)
+ {
+ _height = 2;
+ }
+ var view = completeView.Show(_height);
+ openView.titleBtn.TextID = MyInternationalizationString.someone;
+ closeView.titleBtn.TextID = MyInternationalizationString.unattendedtime1;
+ closeView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ closeView.selectedIconBtn.Visible = true;
+ view.AddChidren(openView.Show());
+ view.AddChidren(closeView.Show());
+
+ takebackView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ takebackView.selectedIconBtn.Visible = true;
+ takebackView.titleBtn.TextID = MyInternationalizationString.ambientLight;
+ takebackView.selectedIconBtn.UnSelectedImagePath = "ZigeeLogic/next.png";
+ if (edit)
+ {
+
+ if (devices["Cluster_ID"] == "1024")
+ {
+ flMain.RemoveFromParent();
+ var illumination = new Illumination();
+ UserView.HomePage.Instance.AddChidren(illumination);
+ UserView.HomePage.Instance.PageIndex += 1;
+ illumination.Show(common, takebackView.titleBtn.Text, int.Parse(devices["AttriButeData1"]), true);
+ }
+ else
+ {
+ closeView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
+ }
+ }
+ else
+ {
+ view.AddChidren(takebackView.Show());
+
+ }
+
+
+ takebackView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ SelectedDeviceStatus = "";
+ openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
+ openView.selectedIconBtn.Visible = false;
+ var illumination = new Illumination();
+ UserView.HomePage.Instance.AddChidren(illumination);
+ UserView.HomePage.Instance.PageIndex += 1;
+ illumination.Show(common,takebackView.titleBtn.Text, 0, false);
+
+ };
+ }
+ break;
default:
{
openView.titleBtn.TextID = MyInternationalizationString.callthepolice;
@@ -551,7 +544,6 @@
completeView.Show(l).AddChidren(openView.Show());
openView.titleBtn.Text = LocalDevice.Current.GetDeviceEpointName(common);
- //openView.titleBtn.Text =Language.StringByID(MyInternationalizationString.OnOffSwitch) + common.DeviceEpoint.ToString();
openView.lineBtn.BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor;
openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index f9b736b..ebc0789 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -177,40 +177,33 @@
{
case 13:
{
- if (conditions["Cluster_ID"] == "1024")
+ if (conditions.ContainsKey("IgnoreTime"))
{
- state = Language.StringByID(MyInternationalizationString.ambientLight) + "<" + conditions["AttriButeData1"] + "lux" + Language.StringByID(MyInternationalizationString.hour1);
- }
- else
- {
- if (conditions.ContainsKey("IgnoreTime"))
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
{
- int minute = int.Parse(conditions["IgnoreTime"]) / 60;
- int second = int.Parse(conditions["IgnoreTime"]) % 60;
- if (minute != 0 && second != 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
- }
- else
- {
- if (minute == 0 && second != 0)
- {
- state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
- if (minute != 0 && second == 0)
- {
- state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
-
- }
-
- }
}
else
{
- state = Language.StringByID(MyInternationalizationString.someone);
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+
}
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.someone);
}
}
@@ -298,7 +291,44 @@
}
break;
-
+ case 541:
+ {
+ if (conditions["Cluster_ID"] == "1024") {
+ state = Language.StringByID(MyInternationalizationString.ambientLight)+"<"+conditions["AttriButeData1"]+"lux"+ Language.StringByID(MyInternationalizationString.hour1);
+ }
+ else
+ {
+ if (conditions.ContainsKey("IgnoreTime"))
+ {
+ int minute = int.Parse(conditions["IgnoreTime"]) / 60;
+ int second = int.Parse(conditions["IgnoreTime"]) % 60;
+ if (minute != 0 && second != 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.minute) + second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ else
+ {
+ if (minute == 0 && second != 0)
+ {
+ state = second.ToString() + Language.StringByID(MyInternationalizationString.second) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+ if (minute != 0 && second == 0)
+ {
+ state = minute.ToString() + Language.StringByID(MyInternationalizationString.Minute) + Language.StringByID(MyInternationalizationString.unattendedtime1);
+
+ }
+
+ }
+ }
+ else
+ {
+ state = Language.StringByID(MyInternationalizationString.someone);
+ }
+ }
+ }
+ break;
default:
{
if (intvalue == "1")
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
index 9725229..fd74126 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicIfon.cs
@@ -44,7 +44,7 @@
else if (common.Type == DeviceType.IASZone)
{
var iASZonedevice = common as IASZone;
- if (iASZonedevice.ModelIdentifier == "MSPIRB-ZB.10")
+ if (iASZonedevice.IasDeviceType == 541)
{//鐞冨舰绉诲姩浼犳劅鍣�
if (Common.Logic.CurrentLogic.Conditions[i]["Cluster_ID"] == objecttype["Cluster_ID"])
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/RoomClickView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/RoomClickView.cs
deleted file mode 100755
index e6adce3..0000000
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/RoomClickView.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-锘縰sing System;
-namespace Shared.Phone.Device.Logic.LogicView
-{
- public class RoomClickView
- {
- public RoomClickView()
- {
-
- }
- /// <summary>
- /// 鐖舵帶浠�
- /// </summary>
- public FrameLayout fra = new FrameLayout
- {
- Height = Application.GetRealHeight(204),
- Width = Application.GetRealWidth(245),
- };
- /// <summary>
- /// 鑳屾櫙鍥剧墖鎺т欢
- /// </summary>
- public Button roombjBtn = new Button
- {
- Height = Application.GetRealHeight(72),
- Width = Application.GetRealWidth(170),
- UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor1.png",
- SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor1.png",
- Y = Application.GetRealHeight(60),
- X = Application.GetRealWidth(26),
- };
- /// <summary>
- /// 鎴块棿鍚嶅瓧鎺т欢
- /// </summary>
- public Button roomnameBtn = new Button
- {
- Height = Application.GetRealHeight(49),
- Width = Application.GetRealWidth(125),
- TextColor = Common.ZigbeeColor.Current.LogicBtnCancelColor,
- SelectedTextColor = Common.ZigbeeColor.Current.LogicBlankBackgroundColor,
- Y = Application.GetRealHeight(72),
- X = Application.GetRealWidth(26 + 22),
-
- };
- public void Show(HorizontalScrolViewLayout HorizontalScrolViewLayout)
- {
- HorizontalScrolViewLayout.AddChidren(fra);
- fra.AddChidren(roombjBtn);
- fra.AddChidren(roomnameBtn);
- }
-
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 7f76b73..6fba6f9 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -46,7 +46,7 @@
{
///鍖哄垎鍑鸿緭鍏ユ潯浠跺拰杈撳嚭鐩爣璁惧
var listdevicetype = GetDevice(type);
- var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype, type);
+ var listdevice = GetDeviceUIList(listAllRoom[i], listdevicetype);
if (listdevice.Count == 0)
{
///杩囨护鎺夋病鏈夎澶囩殑鎴块棿
@@ -68,9 +68,8 @@
/// </summary>
/// <param name="room">褰撳墠鎴块棿</param>
/// <param name="deviceTypelist">璁惧绫诲瀷</param>
- /// /// <param name="type">閫昏緫绫诲瀷</param>
/// <returns></returns>
- public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist,string type)
+ public static List<CommonDevice> GetDeviceUIList(Common.Room room, List<DeviceType> deviceTypelist)
{
var deviceUIlist = new List<CommonDevice>();
foreach (var deviceKey in room.ListDevice)
@@ -93,22 +92,6 @@
//鏆傛椂涓嶆敮鎸丼-one闂ㄩ攣;
//杩囨护鎺変笉鏀寔S-one闂ㄩ攣璁惧;
continue;
- }
- }
- if (type == "condition_mould")
- {
- if (device.Type == DeviceType.IASZone)
- {
- if (device.IasDeviceType != 13)
- {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
- continue;
- }
- if (device.ModelIdentifier == "MSPIRB-ZB.10")
- {
- //鑷姩鍖栨ā鏉夸笉鏀寔鍏夌収搴�
- continue;
- }
-
}
}
deviceUIlist.Add(device);
@@ -278,17 +261,8 @@
{
break;
}
-
- if (device.ModelIdentifier == "MSPIRB-ZB.10")
- {
- patm = $"ZigeeLogic/sensor541.png";
- selectedpatm = $"ZigeeLogic/selectedsensor541.png";
- }
- else
- {
- patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
- selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
- }
+ patm = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
+ selectedpatm = $"ZigeeLogic/selectedsensor{iASZonedevice.IasDeviceType}.png";
}
break;
case DeviceType.TemperatureSensor:
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
index 0bacf91..45f0f72 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/RoomAndDeviceView.cs
@@ -12,22 +12,9 @@
{
Tag = "Logic";
}
- /// <summary>
- /// 璁板綍鐐瑰嚮鎴块棿
- /// </summary>
Button roombjButton = new Button();
- /// <summary>
- /// 璁板綍鐐瑰嚮鎴块棿鍚嶇О
- /// </summary>
Button roomTextButton = new Button();
- /// <summary>
- /// 璁板綍鐐瑰嚮璁惧
- /// </summary>
- Button deviceTypeBjButton = new Button();
- /// <summary>
- /// 璁板綍鐐瑰嚮璁惧绫诲瀷
- /// </summary>
- Button deviceTypeTextButton = new Button();
+ Button devicetypeButton = new Button();
FrameLayout clickframeLayout = new FrameLayout();
Button clickbutton = new Button();
Button clicktextcolcrbutton = new Button();
@@ -40,33 +27,21 @@
/// </summary>
public HorizontalScrolViewLayout roomhorizontalScrol = new HorizontalScrolViewLayout
{
- Width = Application.GetRealWidth(1080 - 29),
- Height = Application.GetRealHeight(204),
- X = Application.GetRealWidth(29),
+ Width = Application.GetRealWidth(1080 - 58),
+ Height = Application.GetRealHeight(200),
+ X = Application.GetRealWidth(58),
Y = Application.GetRealHeight(184),
- };
- /// <summary>
- /// 鍦嗚17
- /// </summary>
- public HorizontalScrolViewLayout devicetypehorizontalScrol1 = new HorizontalScrolViewLayout
- {
- Width = Application.GetRealWidth(1080 - 52),
- Height = Application.GetRealHeight(50),
- Y = Application.GetRealHeight(184 + 204),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- X = Application.GetRealWidth(52),
-
};
/// <summary>
/// 璁惧绫诲瀷婊戝姩鐨勬帶浠�
/// </summary>
public HorizontalScrolViewLayout devicetypehorizontalScrol = new HorizontalScrolViewLayout
{
- Width = Application.GetRealWidth(1080 - 52),
+ Width = Application.GetRealWidth(1080 - 58),
Height = Application.GetRealHeight(280),
- Y = Application.GetRealHeight(184 + 204),
+ Y = Application.GetRealHeight(184 + 200),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- X = Application.GetRealWidth(52),
+ X = Application.GetRealWidth(58),
// Radius = (uint)Application.GetRealHeight(50),
};
@@ -76,8 +51,8 @@
public VerticalScrolViewLayout middle = new VerticalScrolViewLayout
{
X = Application.GetRealWidth(58),
- Y = Application.GetRealHeight(184 + 204 + 280 + 40),
- Height = Application.GetRealHeight(Method.H - 40 - 184 - 280 - 204),
+ Y = Application.GetRealHeight(184 + 200 + 280 + 40),
+ Height = Application.GetRealHeight(Method.H - 40 - 184 - 280 - 200),
BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
};
@@ -113,18 +88,15 @@
if (roomlists.Count == 0)
{
//杩斿洖娌℃湁鎴块棿闅愯棌涓嬮潰鏁村潡;
- devicetypehorizontalScrol1.Height = 0;
devicetypehorizontalScrol.Height = 0;
middle.Height = 0;
}
/// 璁惧绫诲瀷鍒楄〃
var deviceTypeList = Method.GetDevice(IfType);
this.AddChidren(roomhorizontalScrol);
- this.AddChidren(devicetypehorizontalScrol1);
this.AddChidren(devicetypehorizontalScrol);
this.AddChidren(middle);
- devicetypehorizontalScrol1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
- devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft|HDLUtils.RectCornerTopLeft);
+ devicetypehorizontalScrol.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerBottomLeft);
middle.SetCornerWithSameRadius(Application.GetRealHeight(50), HDLUtils.RectCornerTopLeft);
///妤煎眰鐐瑰嚮浜嬩欢
view.foolrclickBtn.MouseUpEventHandler += (sender, e) =>
@@ -215,13 +187,11 @@
var list = Method.GetRoomList(IfType, btnfoolrname.Tag.ToString());
if (list.Count == 0)
{
- devicetypehorizontalScrol1.Height = 0;
devicetypehorizontalScrol.Height = 0;
middle.Height = 0;
}
else
{
- devicetypehorizontalScrol1.Height = 50;
devicetypehorizontalScrol.Height = Application.GetRealHeight(280);
middle.Height = Application.GetRealHeight(1920 - 40 - 184 - 280 - 200);
}
@@ -244,64 +214,70 @@
{
var room = roomlist[i];
- LogicView.RoomClickView roomClickView = new LogicView.RoomClickView();
- roomClickView.Show(roomhorizontalScrol);
- roomClickView.roomnameBtn.Text = room.Name;
+ var fra = new FrameLayout
+ {
+ Height = Application.GetRealHeight(200),
+ Width = Application.GetRealWidth(255),
+ };
+ roomhorizontalScrol.AddChidren(fra);
+
+ var roombjBtn = new Button
+ {
+ Height = Application.GetRealHeight(158),
+ Width = Application.GetRealWidth(255),
+ UnSelectedImagePath = "ZigeeLogic/iconBackgroundColor.png",
+ SelectedImagePath = "ZigeeLogic/iconSelectedBackgroundColor.png",
+ Y = Application.GetRealHeight(21),
+ };
+ fra.AddChidren(roombjBtn);
+
+ var roomnameBtn = new Button
+ {
+
+ Height = Application.GetRealHeight(152 - 26 - 20),
+ Width = Application.GetRealWidth(255 - 20 - 50),
+ Text = room.Name,
+ TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
+ SelectedTextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
+ Y = Application.GetRealHeight(21 + 13 + 10),
+ X = Application.GetRealWidth(10 + 25),
+
+ };
+ fra.AddChidren(roomnameBtn);
if (i == 0)//榛樿閫変腑绗竴涓埧闂�
{
-
roombjButton.IsSelected = false;
- roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
- roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
- roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
- roomClickView.roombjBtn.X = Application.GetRealWidth(0);
- roombjButton = roomClickView.roombjBtn;
- roomClickView.roombjBtn.IsSelected = true;
- roomTextButton.IsSelected = false;
- roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
- roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
- roomTextButton = roomClickView.roomnameBtn;
- roomClickView.roomnameBtn.IsSelected = true;
+ roombjButton = roombjBtn;
+ roombjBtn.IsSelected = true;
- var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
+ roomTextButton.IsSelected = false;
+ roomTextButton = roomnameBtn;
+ roomnameBtn.IsSelected = true;
+
+ roombjBtn.IsSelected = true;
+ roomnameBtn.IsSelected = true;
+
+ var list = Method.GetDeviceUIList(room, deviceTypeList);
AllDeviceTypeView(list);
}
EventHandler<MouseEventArgs> roomclick = (sender, e) =>
{
- roombjButton.Height = Application.GetRealHeight(72);
- roombjButton.Width = Application.GetRealWidth(170);
- roombjButton.Y = Application.GetRealHeight(60);
- roombjButton.X = Application.GetRealWidth(26);
roombjButton.IsSelected = false;
+ roombjButton = roombjBtn;
+ roombjBtn.IsSelected = true;
- roombjButton.Height = Application.GetRealHeight(72);
- roombjButton.Width = Application.GetRealWidth(170);
- roombjButton.Y = Application.GetRealHeight(60);
- roombjButton.X = Application.GetRealWidth(26);
- roombjButton.IsSelected = false;
-
- roomClickView.roombjBtn.Height = Application.GetRealHeight(135);
- roomClickView.roombjBtn.Width = Application.GetRealWidth(245);
- roomClickView.roombjBtn.Y = Application.GetRealHeight(40);
- roomClickView.roombjBtn.X = Application.GetRealWidth(0);
- roombjButton = roomClickView.roombjBtn;
- roomClickView.roombjBtn.IsSelected = true;
-
- roomTextButton.Width = Application.GetRealWidth(125);
- roomTextButton.X = Application.GetRealWidth(26 + 22);
roomTextButton.IsSelected = false;
- roomClickView.roomnameBtn.Width = Application.GetRealWidth(245 - 60 * 2);
- roomClickView.roomnameBtn.X = Application.GetRealWidth(60);
- roomTextButton = roomClickView.roomnameBtn;
- roomClickView.roomnameBtn.IsSelected = true;
+ roomTextButton = roomnameBtn;
+ roomnameBtn.IsSelected = true;
- var list = Method.GetDeviceUIList(room, deviceTypeList, IfType);
+
+ var list = Method.GetDeviceUIList(room, deviceTypeList);
AllDeviceTypeView(list);
};
- roomClickView.roomnameBtn.MouseUpEventHandler += roomclick;
- roomClickView.roombjBtn.MouseUpEventHandler += roomclick;
+ roomnameBtn.MouseUpEventHandler += roomclick;
+ roombjBtn.MouseUpEventHandler += roomclick;
}
}
@@ -316,27 +292,30 @@
for (int i = 0; i < devicetypelist.Count; i++)
{
var devicetype = devicetypelist[i];
-
+ var spaceRowLayout = new FrameLayout();
+ devicetypehorizontalScrol.AddChidren(spaceRowLayout);
if (i == 0)
{
- var spaceRowLayout = new FrameLayout();
- devicetypehorizontalScrol.AddChidren(spaceRowLayout);
spaceRowLayout.Width = Application.GetRealWidth(37);
}
-
+ else
+ {
+ spaceRowLayout.Width = Application.GetRealWidth(80);
+ }
var deviceRowLayout = new FrameLayout
{
- Width = Application.GetRealWidth(150+75),
- Height = Application.GetRealHeight(173+52),
- Y = Application.GetRealHeight(35),
+ Width = Application.GetRealWidth(156 + 20),
+ Height = Application.GetRealHeight(280 - 30),
+ Y = Application.GetRealHeight(30),
};
devicetypehorizontalScrol.AddChidren(deviceRowLayout);
var backgroundColor = new Button
{
- Width = Application.GetMinRealAverage(150),
- Height = Application.GetMinRealAverage(173),
+ Width = Application.GetMinRealAverage(156),
+ Height = Application.GetMinRealAverage(180),
+ X = Application.GetRealWidth(10),
UnSelectedImagePath = "ZigeeLogic/deviceunselectedbackgroundcolor.png",
SelectedImagePath = "ZigeeLogic/deviceselectedbackgroundcolor.png",
};
@@ -347,22 +326,21 @@
{
Width = Application.GetMinRealAverage(84),
Height = Application.GetMinRealAverage(84),
- X = Application.GetRealWidth(35),
- Y = Application.GetRealHeight(29),
+ X = Application.GetRealWidth(46),
+ Y = Application.GetRealHeight(30),
UnSelectedImagePath =Method.GetDeviceTypeIcon(devicetype),
};
deviceRowLayout.AddChidren(devicetypeicon);
var devicetypename = new Button
{
- Width = Application.GetRealWidth(150),
- Height = Application.GetRealHeight(52),
+ Width = Application.GetRealWidth(176),
+ Height = Application.GetRealHeight(40),
Text = devicetype,
TextAlignment = TextAlignment.Center,
Y = backgroundColor.Bottom,
+ TextColor = ZigbeeColor.Current.LogicAddColor,
TextSize = 10,
- TextColor =ZigbeeColor.Current.LogicBtnSelectedColor,
- SelectedTextColor =ZigbeeColor.Current.LogicAddColor,
};
deviceRowLayout.AddChidren(devicetypename);
@@ -378,18 +356,13 @@
EventHandler<MouseEventArgs> devicetypeclick = (sender13, e13) =>
{
- deviceTypeBjButton.IsSelected = false;
- deviceTypeBjButton = backgroundColor;
+ devicetypeButton.IsSelected = false;
+ devicetypeButton = backgroundColor;
backgroundColor.IsSelected = true;
-
- deviceTypeTextButton.IsSelected = false;
- deviceTypeTextButton = devicetypename;
- devicetypename.IsSelected = true;
-
-
var list = Method.GetDeviceType(devicetypename.Text);
ConditionDeviceView(list, devicelist);
};
+ deviceRowLayout.MouseUpEventHandler += devicetypeclick;
devicetypename.MouseUpEventHandler += devicetypeclick;
devicetypeicon.MouseUpEventHandler += devicetypeclick;
backgroundColor.MouseUpEventHandler += devicetypeclick;
@@ -415,6 +388,13 @@
{
continue;
}
+ if (IfType == "condition_mould")
+ {
+ if (common.IasDeviceType != 13)
+ {//鑷姩鍖栨ā鏉垮彧鏀寔绾㈠浼犳劅鍣�
+ continue;
+ }
+ }
var deviceFramelayout = new FrameLayout
{
Height = Application.GetRealHeight(160),
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 04d882d..7502d06 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -1361,8 +1361,8 @@
/// 鍒ゆ柇瀛楀吀鏄惁瀛樺湪鐨勬柟娉�
/// </summary>
/// <param name="deviceConditionsInfo"></param>
- /// <param name="Key">閿�</param>
- /// <param name="Value">閿��</param>
+ /// <param name="Key"></param>
+ /// <param name="Value"></param>
public static void dictionary(Dictionary<string, string> deviceConditionsInfo, string Key, string Value)
{
if (deviceConditionsInfo.ContainsKey(Key))
@@ -1372,6 +1372,6 @@
deviceConditionsInfo.Add(Key, Value);
}
-
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index deb3564..0f5a797 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -10,7 +10,6 @@
{
public class SkipView:FrameLayout
{
-
/// <summary>
/// 鍏跺畠鐣岄潰璺宠繘鏉ョ殑鍏ュ彛
/// </summary>
@@ -74,19 +73,6 @@
//functionSceneAutoBodyView.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
#region ---鎺ㄨ崘妯℃澘鐨勭粍浠�
//鎺ㄨ崘妯℃澘鑳屾櫙鎺т欢
-
-
- var bjFrameLayout1 = new FrameLayout
- {
- Width = Application.GetRealWidth(1080 - 58),
- Height = Application.GetRealHeight(50),
- BackgroundColor = ZigbeeColor.Current.LogicBackgroundColor,
- X = Application.GetRealWidth(58),
- //Radius = (uint)Application.GetRealHeight(50),
- Y = Application.GetRealHeight(30),
-
- };
- functionSceneAutoBodyView.AddChidren(bjFrameLayout1);
var bjFrameLayout = new FrameLayout
{
Width = Application.GetRealWidth(1080 - 58),
@@ -95,10 +81,10 @@
X = Application.GetRealWidth(58),
//Radius = (uint)Application.GetRealHeight(50),
Y = Application.GetRealHeight(30),
+
};
functionSceneAutoBodyView.AddChidren(bjFrameLayout);
- bjFrameLayout1.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerTopLeft);
- bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft|HDLUtils.RectCornerBottomLeft);
+ bjFrameLayout.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerBottomLeft);
//鍥炬爣鎺т欢
var sigBtn = new Button
{
@@ -255,7 +241,7 @@
{
if (!Config.Instance.Home.IsVirtually)
{//铏氭嫙鐨勪笉鑾峰彇缃戝叧閫昏緫鍒楄〃
- //閲嶆柊鍒锋柊logic鍒楄〃
+ //閲嶆柊鍒锋柊logic鍒楄〃
If_once = true;
Common.Logic.LogicList.Clear();
Read(logicScrolView, no);
@@ -320,7 +306,6 @@
Common.Logic.LogicList.Add(logic);
}
}
-
}
}
}
@@ -334,7 +319,6 @@
CommonPage.Loading.Hide();
}
static RowLayout selectedRow = new RowLayout() { Tag = "0" };//璁板綍宸︽粦鐘舵��
-
/// <summary>
/// 鍔犺浇鑷姩鍖栧垪琛ㄧ晫闈�
/// </summary>
@@ -883,8 +867,6 @@
}
return false;
}
-
-
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
index 69299ed..070ceac 100755
--- a/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
+++ b/ZigbeeApp/Shared/Phone/Device/VideoIntercom/VideoMachine.cs
@@ -115,7 +115,7 @@
/// <summary>
/// 鍒ゆ柇璐﹀彿鏄惁鏀寔鍙瀵硅
/// </summary>
- /// <param name="topFrameLayout">鍙瀵硅鍥炬爣鐨勭埗鎺т欢</param>
+ /// <param name="topFrameLayout"></param>
public async static void AccountSupportVideo(FrameLayout topFrameLayout)
{
var jobject = new JObject();
@@ -166,6 +166,9 @@
}
catch { }
}
+
+
+
}
/// <summary>
/// 鑾峰彇鍙瀵硅鍒楄〃
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index 67d3581..2189dc5 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -842,7 +842,7 @@
HomePage.Instance.ShowLoginLoadView();
});
var resultRegID = Shared.Common.CommonPage.Instance.PushRegID();
- var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);
+ var homes = HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
@@ -1111,7 +1111,7 @@
Config.Instance.Save();
var resultRegID = CommonPage.Instance.PushRegID();
- var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);
+ var homes = HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
index 44324a3..38323c9 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountRegisterSuccess.cs
@@ -112,7 +112,7 @@
//缁戝畾绗笁鏂�
BindAuthUser(Config.Instance.Guid, OpenID);
}
- var homes = HdlResidenceLogic.Current.GetHomeListsFromDb(false);
+ var homes = HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
UserCenterLogic.InitUserCenterMenmoryAndThread();
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
index b935e42..098d1b9 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceAcDetailCardForm.cs
@@ -1052,8 +1052,8 @@
this.listControl[1].IsSelected = false;
this.listControl[2].IsSelected = false;
this.listControl[3].IsSelected = false;
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
}
- arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor, ZigbeeColor.Current.GXCWaveSeekBarUnSelectedColor);
//璁剧疆鐘舵�佹枃瀛� 鍏抽棴
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
return;
@@ -1068,8 +1068,8 @@
this.listControl[1].IsSelected = true;
this.listControl[2].IsSelected = true;
this.listControl[3].IsSelected = true;
+ arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
}
- arcScaleSeekBar.SetProgressBarColors(ZigbeeColor.Current.GXCArcScaleSeekBarStartColor, ZigbeeColor.Current.GXCArcScaleSeekBarEndColor);
}
this.listControl[1].SelectedImagePath = DeviceAcDetailCardMethord.GetModeSelectedImagePathByModeId(deviceAc.currentSystemMode);
this.listControl[1].UnSelectedImagePath = DeviceAcDetailCardMethord.GetModeUnSelectedImagePathByModeId(deviceAc.currentSystemMode);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
index 3634885..a4001f1 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/ControlForm/DeviceMiniLightDetailCardForm.cs
@@ -132,7 +132,6 @@
seekBarColor.SeekBarPadding = Application.GetRealWidth(60);
seekBarColor.IsProgressTextShow = true;
seekBarColor.ProgressBarColor = UserCenterColor.Current.Transparent;
- seekBarColor.ProgressBarUnEnableColor = UserCenterColor.Current.Transparent;
seekBarColor.SeekBarBackgroundColor = UserCenterColor.Current.Transparent;
seekBarColor.ProgressTextSize = 14;
seekBarColor.ProgressTextColor = UserCenterColor.Current.TextGrayColor2;
@@ -162,7 +161,6 @@
this.btnBuzzerSwitch = new IconBigViewControl(81, 81);
btnBuzzerSwitch.UnSelectedImagePath = "Item/Switch.png";
btnBuzzerSwitch.SelectedImagePath = "Item/SwitchSelected.png";
- btnBuzzerSwitch.IsSelected = ((ColorTemperatureLight)this.device).IsBuzzerRing;
frameWhiteBack.AddChidren(btnBuzzerSwitch);
btnBuzzerSwitch.InitControl();
btnBuzzerSwitch.UseClickStatu = false;
@@ -202,12 +200,6 @@
};
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) =>
@@ -355,13 +347,7 @@
{
//褰撴槸鎵撳紑鐘舵�佹椂,缃戝叧璇村畠浼氶粯璁ゆ妸浜害鍙樻垚100%
//浠ラ槻涓囦竴,杩欓噷鍐嶆璇诲彇涓�涓�
- HdlThreadLogic.Current.RunThread(() =>
- {
- ((ColorTemperatureLight)device).ReadLevel();
- System.Threading.Thread.Sleep(300);
- ((ColorTemperatureLight)device).ReadColorTemperature();
- });
-
+ ((ColorTemperatureLight)device).ReadLevel();
}
}
});
@@ -393,23 +379,24 @@
//濡傛灉浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- ((ColorTemperatureLight)this.device).IsBuzzerRing = isOpen;
- //鍒锋柊寮�鍏崇姸鎬�
- this.RefreshSwitchStatu(isOpen);
+ //((LightBase)this.device).OnOffStatus = isOpen == true ? 1 : 0;
+ ////鍒锋柊寮�鍏崇姸鎬�
+ //this.RefreshSwitchStatu(isOpen);
return;
}
//妫�娴嬫槸鍚﹁幏鍙栫綉鍏冲弽棣堢殑缁撴灉,濡傛灉缃戝叧娌℃湁鍥炲,鍒欎細寮瑰嚭娑堟伅
- this.btnBuzzerSwitch.CanClick = false;
- this.StartCheckResponeResult(new List<ButtonBase>(), (result) =>
+ this.StartCheckResponeResult(new List<ButtonBase> { this.btnBuzzerSwitch.btnIcon }, (result) =>
{
HdlThreadLogic.Current.RunMain(() =>
{
//鎺ユ敹鍒扮綉鍏冲洖澶�
- this.btnBuzzerSwitch.CanClick = true;
if (result == true)
{
this.btnBuzzerSwitch.IsSelected = isOpen;
+ //bool statu = ((LightBase)this.device).OnOffStatus == 1;
+ ////鍒锋柊寮�鍏崇姸鎬�
+ //this.RefreshSwitchStatu(statu);
}
});
});
@@ -476,13 +463,11 @@
/// <param name="isOpen">鎵撳紑鐘舵��</param>
private void RefreshSwitchStatu(bool isOpen)
{
- //鍒锋柊铚傞福鍣ㄥ紑鍏崇姸鎬�
- bool isBuzzerRing = ((ColorTemperatureLight)this.device).IsBuzzerRing;
- if (this.btnBuzzerSwitch.IsSelected != isBuzzerRing)
+ if (this.isColorProgressing == true)
{
- this.btnBuzzerSwitch.IsSelected = isBuzzerRing;
+ //濡傛灉鏄壊娓╂粦鍔ㄧ殑璇�,涓嶉渶瑕佸埛鏂扮晫闈�
+ return;
}
-
if (isOpen == true)
{
//浜害鏄繀椤昏鍒锋柊鐨� 浜害 XX
@@ -497,25 +482,13 @@
//褰撹繘搴﹀�煎湪鎵嬪姩鍙樻洿涓椂,涓嶆帴鏀舵帹閫�
seekBarColor.Progress = (int)(((ColorTemperatureLight)this.device).ColorTemperature / 100);
}
- if (this.btnMiniSwitch.IsSelected == false)
- {
- this.btnMiniSwitch.IsSelected = true;
- }
- //婊戝姩鏉″彲浠ユ粦鍔�
- seekBarLight.Enable = true;
- seekBarColor.Enable = true;
+ this.btnMiniSwitch.IsSelected = true;
}
else
{
//鍙樻洿瀛楁牱:鍏抽棴
this.SetStatuText(Language.StringByID(R.MyInternationalizationString.Close));
- if (this.btnMiniSwitch.IsSelected == true)
- {
- this.btnMiniSwitch.IsSelected = false;
- }
- //婊戝姩鏉′笉鍙互婊戝姩
- seekBarLight.Enable = false;
- seekBarColor.Enable = false;
+ this.btnMiniSwitch.IsSelected = false;
}
//鍥炲鐨勭粨鏋滆,澶勪簬鎵撳紑鐘舵�佹墠鑳藉彂閫�
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
index 8313777..0fda2b2 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorLightCardControl.cs
@@ -47,12 +47,6 @@
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
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..633c0ff 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceCard/DeviceColorTemperatureCardControl.cs
@@ -47,12 +47,6 @@
//鎵撳紑
this.SetDeviceStatuText(Language.StringByID(R.MyInternationalizationString.uOpen1));
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/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 636fc83..4e2b13b 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -85,8 +85,6 @@
this.AddNormalDeviceReportEvent();
//娣诲姞浼犳劅鍣ㄧ姸鎬佷笂鎶ヤ簨浠�
this.AddSensorDeviceReportEvent();
- //寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
- this.StartRecoverSenorStatuThread();
}
/// <summary>
@@ -546,8 +544,8 @@
bodyFrameLayout.RemoveAll();
bodyFrameLayout.Height = Application.GetRealHeight(750);
this.listBodyContr.RecoverTableHeight();
- this.dicSceneCardControl = new Dictionary<int, Controls.SceneCardControl>();
- this.dicDeviceCardControl = new Dictionary<string, Controls.DeviceCardCommon>();
+ this.dicSceneCardControl.Clear();
+ this.dicDeviceCardControl.Clear();
var listDevice = new List<CommonDevice>();
foreach (var mainkeys in HdlRoomLogic.Current.NowMainPageRoom.ListDevice)
@@ -806,8 +804,8 @@
bodyFrameLayout.RemoveAll();
bodyFrameLayout.Height = Application.GetRealHeight(750);
this.listBodyContr.RecoverTableHeight();
- this.dicSceneCardControl = new Dictionary<int, Controls.SceneCardControl>();
- this.dicDeviceCardControl = new Dictionary<string, Controls.DeviceCardCommon>();
+ this.dicSceneCardControl.Clear();
+ this.dicDeviceCardControl.Clear();
var listScene = new List<SceneUI>();
foreach (int sceneId in HdlRoomLogic.Current.NowMainPageRoom.ListSceneId)
@@ -1158,44 +1156,6 @@
}
}, ShowErrorMode.NO);
- });
- }
-
- #endregion
-
- #region 鈻� 浼犳劅鍣ㄧ姸鎬佽繕鍘焈____________________
-
- /// <summary>
- /// 寮�鍚紶鎰熷櫒鐘舵�佽繕鍘熺殑绾跨▼
- /// </summary>
- private void StartRecoverSenorStatuThread()
- {
- HdlThreadLogic.Current.RunThread(() =>
- {
- while (this.Parent != null)
- {
- try
- {
- var dicControl = this.dicDeviceCardControl;
- foreach (var contr in dicControl.Values)
- {
- //濡傛灉鏄紶鎰熷櫒,鍒欏埛鏂扮姸鎬�
- if (contr.device.Type == DeviceType.IASZone && contr.Parent != null
- && ((IASZone)contr.device).iASInfo == null)
- {
- HdlThreadLogic.Current.RunMain(() =>
- {
- //璁惧鐘舵�佸繀椤诲埛鏂�
- string statuText = HdlDeviceOtherLogic.Current.GetDeviceStatu(contr.device);
- contr.SetDeviceStatuText(statuText);
-
- }, ShowErrorMode.NO);
- }
- }
- System.Threading.Thread.Sleep(8000);
- }
- catch { System.Threading.Thread.Sleep(3000); }
- }
});
}
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
index 304eb74..b2df8fa 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
@@ -135,13 +135,6 @@
else
{
tipLayout.Visible = false;
- }
-
- if (listView.ChildrenCount > 5)
- {
- TextView textView = new TextView();
- textView.Height = Application.GetRealHeight(127 * 3);
- listView.AddChidren(textView);
}
}
catch (Exception ex)
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
deleted file mode 100755
index 4537e58..0000000
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ /dev/null
@@ -1,1846 +0,0 @@
-锘縰sing Shared.Phone.UserCenter;
-using System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.TemplateData
-{
- /// <summary>
- /// 妯℃澘鐨勫叡閫氶�昏緫绫�
- /// </summary>
- public class TemplateCommonLogic
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 妯℃澘鐨勫叡閫氶�昏緫绫�
- /// </summary>
- private static TemplateCommonLogic m_Current = null;
- /// <summary>
- /// 妯℃澘鐨勫叡閫氶�昏緫绫�
- /// </summary>
- public static TemplateCommonLogic Current
- {
- get
- {
- if (m_Current == null)
- {
- m_Current = new TemplateCommonLogic();
- }
- return m_Current;
- }
- }
- /// <summary>
- /// 妯℃澘鏁版嵁
- /// </summary>
- public TemplateMemoryData modelData = new TemplateMemoryData();
- /// <summary>
- /// 妯℃澘鏂囦欢涓� #start# 鍒� #end# 鐨勫唴瀹�(涓存椂鍙橀噺)
- /// </summary>
- private string strTempContentData = string.Empty;
- /// <summary>
- /// 鏈湴妯℃澘鏂囦欢鐨勫悕瀛�
- /// </summary>
- private const string TemplateFileName = "ModelData_Release.bin";
-
- #endregion
-
- #region 鈻� 鍔犺浇鏈湴妯℃澘缂撳瓨___________________
-
- /// <summary>
- /// 鍔犺浇鏈湴妯℃澘鏂囦欢缂撳瓨(姝ゆ柟娉曚互鏈湴缂撳瓨涓哄噯,鍒囨崲浣忓畢鏃朵娇鐢�)
- /// </summary>
- public void LoadLocalTemplateMemoryData()
- {
- this.modelData = new TemplateMemoryData();
- //淇濆瓨鐨勮矾寰�
- string saveFile = DirNameResourse.LocalTemplateDirectory;
-
- //濡傛灉褰撳墠浣忓畢鎷ユ湁閫夋嫨鐨勬ā鏉�
- if (Common.Config.Instance.Home.SelectTemplate != string.Empty)
- {
- string checkFile = System.IO.Path.Combine(saveFile, TemplateFileName);
- //濡傛灉鏈湴娌℃湁杩欎釜bin鏂囦欢
- if (System.IO.File.Exists(checkFile) == false)
- {
- //澶嶅埗妯℃澘bin鏂囦欢鍒版湰鍦扮殑妯℃澘鏂囦欢澶归噷
- this.CopyTemplateFileToLocalDirectory(Common.Config.Instance.Home.SelectTemplate);
- }
- }
-
- //鑾峰彇杩欎釜璺緞涓嬮潰鍏ㄩ儴鐨勬枃浠�
- var listFile = HdlFileLogic.Current.GetFileFromDirectory(saveFile);
-
- //妯℃澘Bin鏂囦欢
- string templateBinFile = string.Empty;
- //杩欓噷鏄鍙栦粬涓婁竴娆＄紪杈戝畬鎴愪箣鍚庣殑妯℃澘鏁版嵁(涔熷氨鏄紪杈戝埌涓�鍗婁箣鍚�,閫�鍑篈pp,涓嬩竴娆″啀缂栬緫)
- foreach (var fileName in listFile)
- {
- if (fileName == TemplateFileName)
- {
- //妯℃澘Bin鏂囦欢
- templateBinFile = fileName;
- continue;
- }
- if (fileName.StartsWith("Device_") == false)
- {
- //鍙璁惧
- continue;
- }
- string fileData = HdlFileLogic.Current.ReadFileTextContent(System.IO.Path.Combine(saveFile, fileName));
- if (fileData == null)
- {
- continue;
- }
- string deviceData = string.Empty;
- ModelDeviceSaveEnum saveDiv = ModelDeviceSaveEnum.A鏈畾涔�;
- //鏍规嵁鎹㈣绗﹀垏鍒嗘暟鎹枃鏈�
- string[] arryData = fileData.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
- foreach (string strData in arryData)
- {
- //璁惧鏁版嵁鏍囧織
- if (strData.StartsWith("===>") == true)
- {
- if (deviceData != string.Empty)
- {
- //鍙嶅簭鍒楀寲璁惧鐨勪繚瀛樻枃浠跺唴瀹�
- var tempData = this.DeserializeDeviceDataByDiv(saveDiv, deviceData);
- //灏嗚澶囨ā鏉挎暟鎹坊鍔犲叆缂撳瓨
- string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(tempData.DeviceMac, tempData.DeviceEpoint);
- this.SetTemplateDeviceDataToMemmory(tempData, deviceData, mainKey, true);
- }
- //娓呯┖
- deviceData = string.Empty;
- saveDiv = (ModelDeviceSaveEnum)Convert.ToInt32(strData.Substring(4));
- continue;
- }
- deviceData += strData;
- }
- if (deviceData != string.Empty)
- {
- //鍙嶅簭鍒楀寲璁惧鐨勪繚瀛樻枃浠跺唴瀹�
- var tempData = this.DeserializeDeviceDataByDiv(saveDiv, deviceData);
- //灏嗚澶囨ā鏉挎暟鎹坊鍔犲叆缂撳瓨
- string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(tempData.DeviceMac, tempData.DeviceEpoint);
- this.SetTemplateDeviceDataToMemmory(tempData, deviceData, mainKey, true);
- }
- }
-
- //璇诲彇妯℃澘Bin鏂囦欢
- if (templateBinFile != string.Empty)
- {
- bool hadRoom = HdlRoomLogic.Current.GetAllListRooms().Count > 1;
- //寮�濮嬭鍙栨枃浠跺唴瀹�
- this.ReadTemplateFileMethord((strData, saveDiv, deviceType) =>
- {
- //鍦ㄥ姞杞芥湰鍦扮紦瀛樼殑鍓嶆彁涓�,澶勭悊妯℃澘鏂囦欢閲岄潰鐨勭壒娈婂唴瀹�
- var result = this.AdjustTemplateBinFileContentOnLoadMemory(strData, hadRoom);
- //false浠ｈ〃瀹冧笉鏄壒娈婂唴瀹�
- if (result == false)
- {
- //澶勭悊妯℃澘鏂囦欢閲岄潰鐨勫叡閫氬唴瀹�
- //鍥犱负涓婇潰宸茬粡鍔犺浇浜嗘寚瀹氭湰鍦扮殑缂撳瓨,鎵�浠ヨ繖閲屼笉闇�瑕佹坊鍔犲叆dicDeviceTemplateData涓�
- this.AdjustTemplateBinFileCommonContent(strData, saveDiv, deviceType, false);
- }
- });
- }
- //娓呯┖瀵硅薄缂撳瓨
- this.strTempContentData = string.Empty;
-
- //鍔犺浇璁惧鍜岀綉鍏虫ā鏉块�夋嫨鐨勬暟鎹�
- this.modelData.dicDeviceTemplateSelect = new Dictionary<string, string>();
- this.modelData.dicGatewayTemplateSelect = new Dictionary<string, string>();
-
- string fileData2 = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.DeviceTemplateSelectFile);
- if (fileData2 != null)
- {
- //璁惧閫夋嫨鐨勬ā鏉垮璞�(keys:鏈湴璁惧鐨凪ac value:妯℃澘涓殑Mac)
- this.modelData.dicDeviceTemplateSelect = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(fileData2);
- }
- fileData2 = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.GatewayTemplateSelectFile);
- if (fileData2 != null)
- {
- //缃戝叧瀵硅薄閫夋嫨鐨勬ā鏉垮璞�(keys:鏈湴缃戝叧ID, value:妯℃澘涓殑缃戝叧ID)
- this.modelData.dicGatewayTemplateSelect = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(fileData2);
- }
- }
-
- /// <summary>
- /// 鍦ㄥ姞杞芥湰鍦扮紦瀛樼殑鍓嶆彁涓�,澶勭悊妯℃澘鏂囦欢閲岄潰鐨勭壒娈婂唴瀹�
- /// </summary>
- /// <param name="strData">妯℃澘鏂囦欢涓殑琛屾暟鎹�</param>
- /// <param name="hadRoom">鏄惁宸茬粡鏈変簡鎴块棿</param>
- private bool AdjustTemplateBinFileContentOnLoadMemory(string strData,bool hadRoom)
- {
- //鍦烘櫙瀵硅薄
- if (strData == "#SceneTemplate END#")
- {
- if (hadRoom == false)
- {
- //鍙垵濮嬪寲涓�娆�,鏈夋埧闂存椂浠ｈ〃宸茬粡涓嶆槸绗竴娆″姞杞戒簡
- var scene = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(this.strTempContentData);
- scene.Save();
- }
- this.strTempContentData = string.Empty;
- return true;
- }
- //妤煎眰瀵硅薄
- else if (strData == "#FloorInfo END#")
- {
- if (hadRoom == false)
- {
- //鍙垵濮嬪寲涓�娆�,鏈夋埧闂存椂浠ｈ〃宸茬粡涓嶆槸绗竴娆″姞杞戒簡
- Common.Config.Instance.Home.FloorDics = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(this.strTempContentData);
- }
- this.strTempContentData = string.Empty;
- return true;
- }
- //鎴块棿瀵硅薄
- else if (strData == "#RoomInfo END#")
- {
- var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(this.strTempContentData);
- //鍚勮嚜绔偣鎵�澶勭殑鎴块棿ID,淇濆瓨璧锋潵
- foreach (var deviceKey in room.ListDevice)
- {
- this.modelData.dicDeviceTemplateRoom[deviceKey] = room.Id;
- }
- if (hadRoom == false)
- {
- //绗竴娆″姞杞�,璁惧鍒楄〃闇�瑕佹竻绌�,閫夋嫨璁惧妯℃澘鏃�,鎵嶆坊鍔�
- room.ListDevice.Clear();
- room.Save();
- }
- this.strTempContentData = string.Empty;
- return true;
- }
- //璁惧閫夋嫨鐨勬ā鏉�
- else if (strData == "#DeviceSelectTemplate END#")
- {
- //杩欎釜涓滆タ鍦ㄨ繖涓垎鏀笅涓嶄粠鏂囦欢涓鍙�,浠庢湰鍦扮紦瀛樻枃浠跺綋涓幏鍙�
- this.strTempContentData = string.Empty;
- return true;
- }
- //缃戝叧閫夋嫨鐨勬ā鏉�
- else if (strData == "#GatewaySelectTemplate END#")
- {
- //杩欎釜涓滆タ鍦ㄨ繖涓垎鏀笅涓嶄粠鏂囦欢涓鍙�,浠庢湰鍦扮紦瀛樻枃浠跺綋涓幏鍙�
- this.strTempContentData = string.Empty;
- return true;
- }
- return false;
- }
-
- #endregion
-
- #region 鈻� 鏍规嵁妯℃澘Bin鏂囦欢鎭㈠鏁版嵁____________
-
- /// <summary>
- /// 鏍规嵁妯℃澘Bin鏂囦欢,鎭㈠鏁版嵁(鍒嗕袱涓嚱鏁板惂,澶毦鎺у埗浜�)
- /// </summary>
- public void RecoverDataByTemplateBinFile()
- {
- //閲嶆柊鍒濆鍖�
- this.modelData = new TemplateMemoryData();
-
- //寮�濮嬭鍙栨枃浠跺唴瀹�
- this.ReadTemplateFileMethord((strData, saveDiv, deviceType) =>
- {
- //鍦ㄦ仮澶嶆暟鎹殑鍓嶆彁涓�,澶勭悊妯℃澘鏂囦欢閲岄潰鐨勭壒娈婂唴瀹�
- var result = this.AdjustTemplateBinFileContentOnRecover(strData);
- //false浠ｈ〃瀹冧笉鏄壒娈婂唴瀹�
- if (result == false)
- {
- //澶勭悊妯℃澘鏂囦欢閲岄潰鐨勫叡閫氬唴瀹�
- //鍥犱负鏄互妯℃澘鏉ユ仮澶嶄綇瀹呮暟鎹�,鎵�浠ヨ繖閲岄渶瑕佹坊鍔犲叆dicDeviceTemplateData涓�
- this.AdjustTemplateBinFileCommonContent(strData, saveDiv, deviceType, true);
- }
- });
- //娓呯┖瀵硅薄缂撳瓨
- this.strTempContentData = string.Empty;
-
- //鍒犳帀杩欎袱涓繚瀛橀�夋嫨妯℃澘鐨勬枃浠�(杩欎袱涓笢瑗垮彲鑳借繕瀛樺湪)
- HdlFileLogic.Current.DeleteFile(DirNameResourse.DeviceTemplateSelectFile);
- HdlFileLogic.Current.DeleteFile(DirNameResourse.GatewayTemplateSelectFile);
-
- //鍐嶆鍒濆鍖栨埧闂�
- HdlRoomLogic.Current.InitAllRoom();
- }
-
- /// <summary>
- /// 鍦ㄦ仮澶嶆暟鎹殑鍓嶆彁涓�,澶勭悊妯℃澘鏂囦欢閲岄潰鐨勭壒娈婂唴瀹�
- /// </summary>
- /// <param name="strData">妯℃澘鏂囦欢涓殑琛屾暟鎹�</param>
- private bool AdjustTemplateBinFileContentOnRecover(string strData)
- {
- //鍦烘櫙瀵硅薄
- if (strData == "#SceneTemplate END#")
- {
- var scene = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.SceneUI>(this.strTempContentData);
- scene.Save();
- this.strTempContentData = string.Empty;
- return true;
- }
- //妤煎眰瀵硅薄
- else if (strData == "#FloorInfo END#")
- {
- Common.Config.Instance.Home.FloorDics = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(this.strTempContentData);
- this.strTempContentData = string.Empty;
- return true;
- }
- //鎴块棿瀵硅薄
- else if (strData == "#RoomInfo END#")
- {
- var room = Newtonsoft.Json.JsonConvert.DeserializeObject<Common.Room>(this.strTempContentData);
- room.Save();
- //鍚勮嚜绔偣鎵�澶勭殑鎴块棿ID,淇濆瓨璧锋潵
- foreach (var deviceKey in room.ListDevice)
- {
- this.modelData.dicDeviceTemplateRoom[deviceKey] = room.Id;
- }
- this.strTempContentData = string.Empty;
- return true;
- }
- //璁惧閫夋嫨鐨勬ā鏉�
- else if (strData == "#DeviceSelectTemplate END#")
- {
- this.modelData.dicDeviceTemplateSelect = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(this.strTempContentData);
- this.strTempContentData = string.Empty;
- return true;
- }
- //缃戝叧閫夋嫨鐨勬ā鏉�
- else if (strData == "#GatewaySelectTemplate END#")
- {
- this.modelData.dicGatewayTemplateSelect = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(this.strTempContentData);
- this.strTempContentData = string.Empty;
- return true;
- }
- return false;
- }
-
- #endregion
-
- #region 鈻� 澶勭悊妯℃澘鏂囦欢閲岄潰鐨勫叡閫氬唴瀹筥________
-
- /// <summary>
- /// 澶勭悊妯℃澘鏂囦欢閲岄潰鐨勫叡閫氬唴瀹�
- /// </summary>
- /// <param name="strData">妯℃澘鏂囦欢涓殑琛屾暟鎹�</param>
- /// <param name="saveDiv">妯℃澘璁惧淇濆瓨鐨勫尯鍒�(璁惧鏁版嵁鏃舵湁鏁�)</param>
- /// <param name="deviceType">妯℃澘涓澶囩殑deviceType(璁惧鏁版嵁鏃舵湁鏁�,鍙嶅皠鐢�)</param>
- /// <param name="addToTemplate">鏄惁娣诲姞鍒拌澶囨ā鏉跨紦瀛樹腑</param>
- private void AdjustTemplateBinFileCommonContent(string strData, ModelDeviceSaveEnum saveDiv, string deviceType, bool addToTemplate)
- {
- //妯℃澘鍩烘湰鏁版嵁
- if (strData == "#TemplateData END#")
- {
- var templateData = Newtonsoft.Json.JsonConvert.DeserializeObject<LocalModelBaseInfo>(this.strTempContentData);
- this.modelData.TemplateName = templateData.ModelName;
- this.strTempContentData = string.Empty;
- return;
- }
- //璁惧妯℃澘
- else if (strData == "#DeviceTemplate END#")
- {
- //鍙嶅簭鍒楀寲璁惧鐨勪繚瀛樻枃浠跺唴瀹�
- var tempData = this.DeserializeDeviceDataByDiv(saveDiv, this.strTempContentData);
- //灏嗚澶囨ā鏉挎暟鎹坊鍔犲叆缂撳瓨(姝ゅ鐗规畩,涓嶉渶瑕佸姞鍏ヨ澶囨ā鏉跨紦瀛樹腑)
- string mainKey = Common.LocalDevice.Current.GetDeviceMainKeys(tempData.DeviceMac, tempData.DeviceEpoint);
- this.SetTemplateDeviceDataToMemmory(tempData, this.strTempContentData, mainKey, addToTemplate);
- this.strTempContentData = string.Empty;
- return;
- }
- //璁惧瀵硅薄
- else if (strData == "#DeviceInfo END#")
- {
- //鍙嶅簭鍒楀寲璁惧
- var device = CommonDevice.CommonDeviceByByteString(deviceType, this.strTempContentData);
- if (device != null)
- {
- if (this.modelData.dicDeviceInfo.ContainsKey(device.DeviceAddr) == false)
- {
- this.modelData.dicDeviceInfo[device.DeviceAddr] = new List<CommonDevice>();
- }
- this.modelData.dicDeviceInfo[device.DeviceAddr].Add(device);
- }
- this.strTempContentData = string.Empty;
- return;
- }
- //缃戝叧瀵硅薄鏁版嵁
- else if (strData == "#GatewayInfo END#")
- {
- //鍙嶅簭鍒楀寲璁惧
- var gateway = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway>(this.strTempContentData);
- this.modelData.dicGatewayInfo[gateway.GwId] = gateway;
- this.strTempContentData = string.Empty;
- return;
- }
- //鐗╃悊璁惧鐨勬埧闂�
- else if (strData == "#DeviceTemplateRealRoom END#")
- {
- this.modelData.dicDeviceTemplateRealRoom = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(this.strTempContentData);
- this.strTempContentData = string.Empty;
- return;
- }
- //妯℃澘浣忓畢鐨勪俊鎭�(鐩墠鍦ㄨ繖閲屽熀鏈病鐢�)
- else if (strData == "#TemplateHomeInfo END#")
- {
- this.strTempContentData = string.Empty;
- return;
- }
- this.strTempContentData += strData;
- }
-
- #endregion
-
- #region 鈻� 璇诲彇妯℃澘鏂囦欢鍐呭___________________
-
- /// <summary>
- /// 璇诲彇妯℃澘鏂囦欢鍐呭
- /// </summary>
- /// <param name="AdjustAction">
- /// <para>鍙傛暟1:妯℃澘鏂囦欢涓殑琛屾暟鎹�</para>
- /// <para>鍙傛暟2:妯℃澘璁惧淇濆瓨鐨勫尯鍒�(璁惧鏁版嵁鏃舵湁鏁�)</para>
- /// <para>鍙傛暟3:鏉夸腑璁惧鐨刣eviceType(璁惧鏁版嵁鏃舵湁鏁�,鍙嶅皠鐢�)</para>
- /// </param>
- private void ReadTemplateFileMethord(Action<string, ModelDeviceSaveEnum, string> AdjustAction)
- {
- //淇濆瓨鐨勮矾寰�
- string saveFile = DirNameResourse.LocalTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, TemplateFileName);
-
- string fileData = HdlFileLogic.Current.ReadFileTextContent(saveFile);
- if (fileData == null)
- {
- AdjustAction = null;
- return;
- }
-
- var saveDiv = ModelDeviceSaveEnum.A鏈畾涔�;
- var deviceType = string.Empty;
-
- //鏍规嵁鎹㈣绗﹀垏鍒嗘暟鎹枃鏈�
- string[] arryData = fileData.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
- foreach (string strData in arryData)
- {
- if (strData == "#START#")
- {
- //鏃犻檮鍔犳暟鎹殑銆愭暟鎹爣棰樸��
- continue;
- }
- if (strData.StartsWith("#DeviceTemplate START#") == true)
- {
- //闄勫姞鏁版嵁:璁惧淇濆瓨鍖哄垎
- saveDiv = (ModelDeviceSaveEnum)Convert.ToInt32(strData.Substring(22));
- continue;
- }
- if (strData.StartsWith("#DeviceInfo START#") == true)
- {
- //闄勫姞鏁版嵁:璁惧瀵硅薄绫诲瀷
- deviceType = strData.Substring(18);
- continue;
- }
- try
- {
- //鎵ц鏁版嵁澶勭悊
- AdjustAction(strData, saveDiv, deviceType);
- }
- catch (Exception ex)
- {
- HdlLogLogic.Current.WriteLog(ex, "妯℃澘bin鏂囦欢鍑洪棶棰榎r\n" + this.strTempContentData);
- this.strTempContentData = string.Empty;
- }
- }
- }
-
- #endregion
-
- #region 鈻� 鍙嶅簭鍒楀寲璁惧鐨勪繚瀛樻枃浠跺唴瀹筥________
-
- /// <summary>
- /// 鍙嶅簭鍒楀寲璁惧鐨勪繚瀛樻枃浠跺唴瀹�
- /// </summary>
- /// <param name="saveDiv">淇濆瓨鍖哄垎</param>
- /// <param name="fileData"></param>
- /// <returns></returns>
- private TemplateDeviceDataCommon DeserializeDeviceDataByDiv(ModelDeviceSaveEnum saveDiv, string fileData)
- {
- TemplateDeviceDataCommon modelData = null;
- if (saveDiv == ModelDeviceSaveEnum.APir閰嶇疆)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPirSensorSettion>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelAcSwingModeSupport>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelAcModeSupport>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelCurtainHandPullControl>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelCurtainDirectionAndLimite>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A绔偣鍚嶇О)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceEpointNameInfo>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A璁惧鍚嶇О)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceMacNameInfo>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceBindData>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelBackLightInfo>(fileData);
- }
- else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘)
- {
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelVibrationInfo>(fileData);
- }
- return modelData;
- }
-
- /// <summary>
- /// 灏嗚澶囨ā鏉挎暟鎹坊鍔犲叆缂撳瓨
- /// </summary>
- /// <param name="modelData">妯℃澘鏁版嵁</param>
- /// <param name="fileData">璁惧淇濆瓨鍦ㄦ枃浠朵腑鐨勫唴瀹�(鍙负null)</param>
- /// <param name="mainKey">娣诲姞鐨勪富閿�</param>
- /// <param name="addToTemplate">鏄惁娣诲姞鍒拌澶囨ā鏉跨紦瀛樹腑</param>
- private void SetTemplateDeviceDataToMemmory(TemplateDeviceDataCommon modelData, string fileData, string mainKey, bool addToTemplate)
- {
- if (modelData == null)
- {
- return;
- }
-
- //浠庢ā鏉夸富鏂囦欢涓幏鍙栫殑璁惧妯℃澘淇℃伅,鏄笉闇�瑕佹坊鍔犲埌杩欎釜鍙橀噺涓殑
- //鍥犱负瀹冨彧鑳芥參鎱竴涓釜鍖归厤
- if (addToTemplate == true)
- {
- if (this.modelData.dicDeviceTemplateData.ContainsKey(mainKey) == false)
- {
- this.modelData.dicDeviceTemplateData[mainKey] = new List<TemplateDeviceDataCommon>();
- }
- this.modelData.dicDeviceTemplateData[mainKey].Add(modelData);
- }
-
- if (fileData != null)
- {
- //涓存椂缂撳瓨:妯℃澘涓悇鑷鐐规墍淇濆瓨鐨勫唴瀹�(keys:璁惧涓婚敭),璁惧閫夋嫨妯℃澘鏃�,妯℃澘鏁版嵁杩佺Щ浣跨敤,鍥犱负鏄紩鐢ㄧ被鍨�,鎵�浠ラ渶瑕侀噸鏂癗ew
- if (this.modelData.dicDeviceFileContent.ContainsKey(mainKey) == false)
- {
- this.modelData.dicDeviceFileContent[mainKey] = new List<TemplateDeviceContent>();
- }
- var fileCentent = new TemplateDeviceContent();
- fileCentent.saveDiv = modelData.DataSaveDiv;
- fileCentent.FileContent = fileData;
- fileCentent.DeviceMac = modelData.DeviceMac;
- this.modelData.dicDeviceFileContent[mainKey].Add(fileCentent);
- }
- }
-
- #endregion
-
- #region 鈻� 淇濆瓨妯℃澘鏁版嵁鍒版湰鍦扮浉鍏砡____________
-
- /// <summary>
- /// 淇濆瓨妯℃澘鏁版嵁鍒版湰鍦�
- /// </summary>
- /// <param name="backupName">澶囦唤鍚嶇О</param>
- public void SaveTemplateDataToLocation(string backupName)
- {
- //鑾峰彇鏈湴鍏ㄩ儴鐨勬ā鏉垮垪琛ㄧ殑鍩烘湰淇℃伅
- var localModel = this.GetLocalAllModelList();
- var fileName = this.GetNewTemplateFileName();
- foreach (var model in localModel)
- {
- //鍚嶅瓧涓�鏍锋椂
- if (model.ModelName == backupName)
- {
- fileName = model.FileName;
- //澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
- this.ShowMassage(ShowMsgType.Confirm, "澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?", () =>
- {
- //灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
- this.SaveTemplateDataToLocation2(fileName, backupName);
- });
- return;
- }
- }
- //灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
- this.SaveTemplateDataToLocation2(fileName, backupName);
- }
-
- /// <summary>
- /// 淇濆瓨妯℃澘鏁版嵁鍒版湰鍦�
- /// </summary>
- /// <param name="fileName">淇濆瓨鏂囦欢鐨勫悕瀛�</param>
- /// <param name="backName">妯℃澘澶囦唤鐨勫悕瀛�</param>
- private void SaveTemplateDataToLocation2(string fileName, string backupName)
- {
- HdlThreadLogic.Current.RunThread(() =>
- {
- ProgressFormBar.Current.Start();
- ProgressFormBar.Current.SetMsg("姝ｅ湪淇濆瓨妯℃澘鏁版嵁");
- System.Threading.Thread.Sleep(1500);
-
- //灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
- var fileFullName = this.SaveTemplateDataToFile(fileName, backupName);
- //鑾峰彇鍗囩骇鍥轰欢鏂囦欢
- var result = HdlFirmwareUpdateLogic.DownLoadTemplateDeviceFirmware(fileFullName, "姝ｅ湪淇濆瓨鍗囩骇鍥轰欢鏁版嵁");
- if (result == -1)
- {
- this.ShowMassage(ShowMsgType.Tip, "淇濆瓨鍗囩骇鍥轰欢鏁版嵁澶辫触");
- }
- else
- {
- //鏈湴澶囦唤淇濆瓨鎴愬姛
- this.ShowMassage(ShowMsgType.Tip, "鏈湴澶囦唤淇濆瓨鎴愬姛");
- }
- });
- }
-
- /// <summary>
- /// 鍦ㄧ敓鎴愭ā鏉挎暟鎹箣鍓�,妫�娴嬫ā鏉挎暟鎹�
- /// </summary>
- private void CheckTempLateDataBeforCreat()
- {
- //涓轰簡淇濊瘉妯℃澘閲岀殑璁惧鏁板拰鏈湴鐨勪竴鑷�,鎵�浠ユ娴嬩竴涓�
- //濡傛灉缂哄皯,鍒欐坊鍔犱慨鏀筂ac鐨勬暟鎹繘鍘�
- //鍏朵粬鐨�,濡傛灉涓嶇偣鍑诲悇鑷殑閰嶇疆鐣岄潰,鍒欏綋鍋氭槸榛樿璁惧鍘熸潵鐨勯厤缃姸鎬�
-
- //鑾峰彇鐩墠宸茬粡璁剧疆璁惧鐗╃悊鍚嶇О鐨勮澶嘙ac
- var listMac = new HashSet<string>();
- foreach (var listData in this.modelData.dicDeviceTemplateData.Values)
- {
- if (listData.Count > 0 && listMac.Contains(listData[0].DeviceMac) == true)
- {
- //宸茬粡鍔犱簡
- continue;
- }
- foreach (var data in listData)
- {
- if (data.DataSaveDiv == ModelDeviceSaveEnum.A璁惧鍚嶇О)
- {
- listMac.Add(data.DeviceMac);
- }
- }
- }
- var listDevice = Common.LocalDevice.Current.listAllDevice;
- foreach (var device in listDevice)
- {
- if (listMac.Contains(device.DeviceAddr) == false)
- {
- listMac.Add(device.DeviceAddr);
- //閲嶆柊娣诲姞Mac鍚嶅瓧缂撳瓨
- TemplateDeviceDataLogic.Current.ReDeviceMacName(device, Common.LocalDevice.Current.GetDeviceMacName(device));
- }
- //閲嶆柊娣诲姞绔偣鍚嶅瓧缂撳瓨
- TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, Common.LocalDevice.Current.GetDeviceEpointName(device));
- }
- }
-
- /// <summary>
- /// 鑾峰彇鏈湴鍏ㄩ儴鐨勬ā鏉垮垪琛ㄧ殑鍩烘湰淇℃伅
- /// </summary>
- /// <returns></returns>
- public List<LocalModelBaseInfo> GetLocalAllModelList()
- {
- var dicData = new Dictionary<string, List<LocalModelBaseInfo>>();
- var listTime = new List<string>();
-
- var strPath = DirNameResourse.AllResidenceTemplateDirectory;
- //鑾峰彇鍏ㄩ儴鏂囦欢
- var arryFile = System.IO.Directory.GetFiles(strPath, "ModelData_*");
- foreach (string modelFile in arryFile)
- {
- //璇诲彇鏂囦欢鍐呭
- var textValue = HdlFileLogic.Current.ReadFileTextContent(modelFile);
- if (textValue == null)
- {
- continue;
- }
- //浠庢枃浠朵腑鑾峰彇鎸囧畾鐨勫唴瀹�
- string modelBaseInfo = this.GetDataFromFileContent(textValue, "#START#", "#TemplateData END#");
- if (modelBaseInfo != string.Empty)
- {
- var myModel = Newtonsoft.Json.JsonConvert.DeserializeObject<LocalModelBaseInfo>(modelBaseInfo);
- myModel.FileName = modelFile.Substring(strPath.Length + 1);
- if (dicData.ContainsKey(myModel.EditorTime) == false)
- {
- dicData[myModel.EditorTime] = new List<LocalModelBaseInfo>();
- listTime.Add(myModel.EditorTime);
- }
- dicData[myModel.EditorTime].Add(myModel);
-
- string homeData = this.GetDataFromFileContent(textValue, "#START#", "#TemplateHomeInfo END#");
- if (homeData != string.Empty)
- {
- var homeInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<TemplateHomeInfo>(homeData);
- myModel.ListUintContent.AddRange(homeInfo.ListUintContent);
- myModel.ResidenceAddressName = homeInfo.ResidenceAddressName;
- }
- }
- }
- //鎸夋椂闂存帓搴�
- listTime.Sort();
-
- var listData = new List<LocalModelBaseInfo>();
- for (int i = listTime.Count - 1; i >= 0; i--)
- {
- listData.AddRange(dicData[listTime[i]]);
- }
- return listData;
- }
-
- /// <summary>
- /// 鑾峰彇涓�涓柊鐨勬ā鏉夸繚瀛樻枃浠跺悕
- /// </summary>
- /// <returns></returns>
- public string GetNewTemplateFileName()
- {
- return "ModelData_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
- }
-
- #endregion
-
- #region 鈻� 鐢熸垚妯℃澘鏁版嵁鐩稿叧___________________
-
- /// <summary>
- /// 淇濆瓨妯℃澘鏁版嵁鍒版枃浠�(杩斿洖淇濆瓨鏂囦欢鐨勫叏璺緞)
- /// </summary>
- /// <param name="fileName">淇濆瓨鏂囦欢鐨勫悕瀛�(鏂板缓鏃剁敤 GetNewTemplateFileName鍑芥暟鏂板缓)</param>
- /// <param name="backName">妯℃澘澶囦唤鐨勫悕瀛�</param>
- public string SaveTemplateDataToFile(string fileName, string backUpName)
- {
- //鍐欏叆鏂囦欢鐨勫唴瀹�
- string writeText = string.Empty;
-
- //鍦ㄧ敓鎴愭ā鏉挎暟鎹箣鍓�,妫�娴嬫ā鏉挎暟鎹�
- this.CheckTempLateDataBeforCreat();
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愭ā鏉垮熀鏈暟鎹��
- this.CreatWriteTemplateBaseData(ref writeText, backUpName);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愭ā鏉夸綇瀹呬俊鎭暟鎹��
- this.CreatWriteTemplateHomeData(ref writeText);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愯澶囨ā鏉挎暟鎹��
- this.CreatWriteDeviceTemplateData(ref writeText);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愯澶囧璞℃暟鎹��
- this.CreatWriteCommonDeviceData(ref writeText);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愮綉鍏冲璞℃暟鎹��
- this.CreatWriteGatewayData(ref writeText);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愬満鏅ā鏉挎暟鎹��
- this.CreatWriteSceneData(ref writeText);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愭埧闂存ā鏉挎暟鎹��
- this.CrearWriteRoomTemplateData(ref writeText);
-
- //鐢熸垚鍐欏叆鏂囦欢鐨勩�愯澶囧拰缃戝叧閫夋嫨鐨勬ā鏉跨殑鏁版嵁銆�
- this.CrearWriteDeviceSelectTemplateData(ref writeText);
-
- //鍐欏叆鍐呭
- string saveFile = DirNameResourse.AllResidenceTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, fileName);
-
- HdlFileLogic.Current.SaveTextToFile(saveFile, writeText);
-
- return saveFile;
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愭ā鏉垮熀鏈暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CreatWriteTemplateBaseData(ref string writeText, string backUpName)
- {
- var modelData = new LocalModelBaseInfo();
- modelData.EditorTime = DateTime.Now.ToString("yyyy.MM.dd HH:mm");
- modelData.ModelName = backUpName;
- modelData.ListUintContent.AddRange(Common.Config.Instance.Home.ListUintContent);
- modelData.FloorCount = Common.Config.Instance.Home.FloorDics.Count;
- modelData.DeviceCount = this.modelData.dicDeviceTemplateData.Count;
- //鍔熻兘鏁�
- int funcCount = 0;
- foreach (var listData in this.modelData.dicDeviceTemplateData.Values)
- {
- if (listData.Count > 0)
- {
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(listData[0].DeviceMac, false);
- funcCount += listDevice.Count;
- }
- }
- modelData.FunctionCount = funcCount;
-
- writeText += "#START#\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(modelData);
- writeText += dataInfo + "\r\n";
- writeText += "#TemplateData END#\r\n\r\n";
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愭ā鏉夸綇瀹呬俊鎭暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CreatWriteTemplateHomeData(ref string writeText)
- {
- var homeData = new TemplateHomeInfo();
- homeData.ResidenceAddressName = Common.Config.Instance.Home.ResidenceAddressName;
- homeData.ListUintContent.AddRange(Common.Config.Instance.Home.ListUintContent);
-
- writeText += "#START#\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(homeData);
- writeText += dataInfo + "\r\n";
- writeText += "#TemplateHomeInfo END#\r\n\r\n";
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愯澶囨ā鏉挎暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CreatWriteDeviceTemplateData(ref string writeText)
- {
- foreach (var list in this.modelData.dicDeviceTemplateData.Values)
- {
- foreach (var data in list)
- {
- writeText += "#DeviceTemplate START#" + (int)data.DataSaveDiv + "\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(data);
- writeText += dataInfo + "\r\n";
- writeText += "#DeviceTemplate END#\r\n\r\n";
- }
- }
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愯澶囧璞℃暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CreatWriteCommonDeviceData(ref string writeText)
- {
- var listDevice = Common.LocalDevice.Current.listAllDevice;
- var listCheck = new HashSet<string>();
- foreach (var device in listDevice)
- {
- //璁惧绔偣
- writeText += "#DeviceInfo START#" + device.Type.ToString() + "\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(device);
- writeText += dataInfo + "\r\n";
- writeText += "#DeviceInfo END#\r\n\r\n";
-
- //娣诲姞Ota璁惧瀵硅薄鐨勭紦瀛�
- if (listCheck.Contains(device.DeviceAddr) == false)
- {
- listCheck.Add(device.DeviceAddr);
- var otaDevice = Common.LocalDevice.Current.GetOTADevice(device.DeviceAddr);
- if (otaDevice != null)
- {
- writeText += "#DeviceInfo START#" + otaDevice.Type.ToString() + "\r\n";
- string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(otaDevice);
- writeText += dataInfo2 + "\r\n";
- writeText += "#DeviceInfo END#\r\n\r\n";
- }
- }
- }
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愮綉鍏冲璞℃暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CreatWriteGatewayData(ref string writeText)
- {
- var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
- foreach (var gateway in listGateway)
- {
- //璁惧绔偣
- writeText += "#START#\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(gateway);
- writeText += dataInfo + "\r\n";
- writeText += "#GatewayInfo END#\r\n\r\n";
- }
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愬満鏅暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CreatWriteSceneData(ref string writeText)
- {
- //鍏ㄩ儴鐨勫満鏅�
- var listScene = HdlSceneLogic.Current.GetAllLocalScene();
-
- foreach (var scene in listScene)
- {
- writeText += "#START#\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(scene);
- writeText += dataInfo + "\r\n";
- writeText += "#SceneTemplate END#\r\n\r\n";
- }
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愭埧闂存ā鏉挎暟鎹��
- /// </summary>
- /// <param name="writeText"></param>
- private void CrearWriteRoomTemplateData(ref string writeText)
- {
- //妤煎眰鏁版嵁
- writeText += "#START#\r\n";
- string dataInfo1 = Newtonsoft.Json.JsonConvert.SerializeObject(Common.Config.Instance.Home.FloorDics);
- writeText += dataInfo1 + "\r\n";
- writeText += "#FloorInfo END#\r\n\r\n";
-
- //鎴块棿鏁版嵁
- 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";
- }
- }
- //鐗╃悊缃戝叧鎵�鍦ㄧ殑鎴块棿
- var dicRealRoom = new Dictionary<string, string>();
- var listGateway = HdlGatewayLogic.Current.GetAllLocalGateway();
- foreach (var gateway in listGateway)
- {
- dicRealRoom[gateway.GwId] = gateway.RoomId;
- }
- //鑾峰彇鍏ㄩ儴鐗╃悊璁惧鎵�灞炴埧闂寸殑璁板綍
- var dicDeviceRoom = Common.LocalDevice.Current.GetAllRealDeviceRoomData();
- foreach (var strMac in dicDeviceRoom.Keys)
- {
- dicRealRoom[strMac] = dicDeviceRoom[strMac];
- }
-
- writeText += "#START#\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(dicRealRoom);
- writeText += dataInfo + "\r\n";
- writeText += "#DeviceTemplateRealRoom END#\r\n\r\n";
- }
-
- /// <summary>
- /// 鐢熸垚鍐欏叆鏂囦欢鐨勩�愯澶囧拰缃戝叧閫夋嫨鐨勬ā鏉跨殑鏁版嵁銆�
- /// </summary>
- /// <param name="writeText"></param>
- private void CrearWriteDeviceSelectTemplateData(ref string writeText)
- {
- //璁惧閫夋嫨妯℃澘鐨勬暟鎹�
- writeText += "#START#\r\n";
- string dataInfo1 = Newtonsoft.Json.JsonConvert.SerializeObject(this.modelData.dicDeviceTemplateSelect);
- writeText += dataInfo1 + "\r\n";
- writeText += "#DeviceSelectTemplate END#\r\n\r\n";
-
- //缃戝叧閫夋嫨妯℃澘鐨勬暟鎹�
- writeText += "#START#\r\n";
- string dataInfo2 = Newtonsoft.Json.JsonConvert.SerializeObject(this.modelData.dicGatewayTemplateSelect);
- writeText += dataInfo2 + "\r\n";
- writeText += "#GatewaySelectTemplate END#\r\n\r\n";
- }
-
- #endregion
-
- #region 鈻� 寮哄埗鎵ц鐨勭壒娈婂嚱鏁癬________________
-
- /// <summary>
- /// 寮哄埗浠庣紦瀛樺綋涓敓鎴愯澶囧拰缃戝叧鏂囦欢
- /// </summary>
- public void CreatDeviceAndGatewayFileFromMemoryByForce()
- {
- //鍘熸潵鐨勭姸鎬�
- bool oldShowTemplate = Common.Config.Instance.Home.IsShowTemplate;
- //璁╁畠鍙互鐢熸垚鏂囦欢
- Common.Config.Instance.Home.IsShowTemplate = false;
-
- //鐢熸垚璁惧鏂囦欢
- foreach (var listDevice in this.modelData.dicDeviceInfo.Values)
- {
- foreach (var device in listDevice)
- {
- device.ReSave();
- }
- }
- //鐢熸垚缃戝叧鏂囦欢
- foreach (var gateway in this.modelData.dicGatewayInfo.Values)
- {
- gateway.ReSave();
- }
- //杩樺師鐘舵��
- Common.Config.Instance.Home.IsShowTemplate = oldShowTemplate;
- }
-
- #endregion
-
- #region 鈻� 璁惧鍜岀綉鍏虫ā鏉块�夋嫨鐩稿叧_____________
-
- /// <summary>
- /// 娣诲姞/淇敼 璁惧妯℃澘閫夋嫨鐩爣
- /// </summary>
- /// <param name="sourceMac">璁惧Mac瀵硅薄</param>
- /// <param name="targetMac">鐩爣Mac瀵硅薄</param>
- public void AddDeviceTemplateSelect(string sourceMac, string targetMac)
- {
- //鑾峰彇鏈湴鎸囧畾鐨凪ac鐨勫叏閮ㄨ澶�
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(sourceMac, false);
-
- foreach (var device in listDevice)
- {
- //妯℃澘閫夋嫨鐨勬椂鍊�,浠栦滑鐨勭鐐规槸涓�鑷寸殑
- string localDeviceKey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- string templateDeviceKey = Common.LocalDevice.Current.GetDeviceMainKeys(targetMac, device.DeviceEpoint);
-
- if (this.modelData.dicDeviceTemplateRoom.ContainsKey(templateDeviceKey) == true)
- {
- //濡傛灉妯℃澘閲岄潰,杩欎釜绔偣璁剧疆鏈夋埧闂寸殑璇�
- HdlRoomLogic.Current.ChangedRoom(device, this.modelData.dicDeviceTemplateRoom[templateDeviceKey], false);
- }
- //濡傛灉杩欎釜绔偣鏈夋ā鏉挎暟鎹殑璇�
- if (this.modelData.dicDeviceFileContent.ContainsKey(templateDeviceKey) == true)
- {
- //濡傛灉鍘熸潵瀹冮�夋嫨鏈夋ā鏉挎暟鎹殑璇�
- if (this.modelData.dicDeviceTemplateData.ContainsKey(localDeviceKey) == true)
- {
- //鍒犻櫎杩欎釜璁惧鐨勬ā鏉夸繚瀛樻枃浠�
- HdlFileLogic.Current.DeleteFile(System.IO.Path.Combine(DirNameResourse.LocalTemplateDirectory, device.FilePath));
- //绉婚櫎褰撳墠绔偣淇濆瓨鐨勬ā鏉挎暟鎹�
- this.modelData.dicDeviceTemplateData.Remove(localDeviceKey);
- }
-
- //鍙嶅簭鍒楀寲璁惧鏁版嵁
- foreach (var strCentent in this.modelData.dicDeviceFileContent[templateDeviceKey])
- {
- var tempData = this.DeserializeDeviceDataByDiv(strCentent.saveDiv, strCentent.FileContent);
- //杩欓噷闇�瑕佹浛鎹㈡帀Mac
- tempData.DeviceMac = sourceMac;
- //娣诲姞缂撳瓨(涓婚敭涓烘湰鍦拌澶囩殑涓婚敭)
- this.SetTemplateDeviceDataToMemmory(tempData, null, localDeviceKey, true);
- //淇敼绔偣缂撳瓨鍚嶅瓧
- if (tempData.DataSaveDiv == ModelDeviceSaveEnum.A绔偣鍚嶇О)
- {
- Common.LocalDevice.Current.SetEpointName(device, ((ModelDeviceEpointNameInfo)tempData).deviceEpointName);
- }
- else if (tempData.DataSaveDiv == ModelDeviceSaveEnum.A璁惧鍚嶇О)
- {
- Common.LocalDevice.Current.SetMacName(device, ((ModelDeviceMacNameInfo)tempData).deviceMacName);
- }
- }
- }
- //涓嶇濡備綍,閮介渶瑕佸垯閲嶆柊淇濆瓨鎴愭枃浠�
- this.SaveDeviceMemmoryData(device);
- //杩樺師鍙婂彉鏇村満鏅殑鎵ц鐩爣
- //this.RecoverAndChangedSceneAdjustTarget(device, targetMac);
- }
- //鏇存敼鐗╃悊璁惧鎵�鍦ㄧ殑鎴块棿
- if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetMac) == true)
- {
- Common.LocalDevice.Current.SaveRealDeviceRoomId(listDevice, this.modelData.dicDeviceTemplateRealRoom[targetMac], false);
- }
-
- //璁板綍缂撳瓨
- this.modelData.dicDeviceTemplateSelect[sourceMac] = targetMac;
- //淇濆瓨鐨勮矾寰�
- string fileData = Newtonsoft.Json.JsonConvert.SerializeObject(this.modelData.dicDeviceTemplateSelect);
- HdlFileLogic.Current.SaveTextToFile(DirNameResourse.DeviceTemplateSelectFile, fileData);
- }
-
- /// <summary>
- /// 杩樺師鍙婂彉鏇村満鏅殑鎵ц鐩爣
- /// </summary>
- /// <param name="device">鏈湴璁惧瀵硅薄</param>
- /// <param name="targetMac">闇�瑕佸彉鏇寸殑妯℃澘璁惧鐨凪ac</param>
- private void RecoverAndChangedSceneAdjustTarget(CommonDevice device, string targetMac)
- {
- //濡傛灉杩欎釜璁惧鏄浛鎹㈤�夋嫨鐨勬ā鏉跨殑璇�
- if (this.modelData.dicDeviceTemplateSelect.ContainsKey(device.DeviceAddr) == false)
- {
- return;
- }
- //鍏ㄩ儴鐨勫満鏅�
- var listScene = HdlSceneLogic.Current.GetAllLocalScene();
-
- //杩樻病鏈夋墽琛屽彉鏇村墠,瀹冪洰鍓嶉�夋嫨鐨勬ā鏉跨殑Mac
- string oldTemplateMac = this.modelData.dicDeviceTemplateSelect[device.DeviceAddr];
- //灏嗗満鏅璞′腑,杩欎釜鍥炶矾鐨勪富閿�,鏇挎崲鍥炲師鏉ユā鏉夸腑鐨凪ac+绔彛
- foreach (var scene in listScene)
- {
- bool save = false;
- for (int i = 0; i < scene.AdjustTargetList.Count; i++)
- {
- if (scene.AdjustTargetList[i].Type != 0)
- {
- //鍙鐞嗚澶囩粦瀹氱洰鏍�
- continue;
- }
- //濡傛灉鏄綋鍓嶅洖璺�
- if (scene.AdjustTargetList[i].DeviceAddr == device.DeviceAddr &&
- scene.AdjustTargetList[i].Epoint == device.DeviceEpoint)
- {
- //鏇挎崲鎺塎ac
- scene.AdjustTargetList[i].DeviceAddr = oldTemplateMac;
- save = true;
- continue;
- }
- //濡傛灉鏄ā鏉跨洰鏍囧洖璺�
- if (targetMac != null &&
- scene.AdjustTargetList[i].DeviceAddr == targetMac &&
- scene.AdjustTargetList[i].Epoint == device.DeviceEpoint)
- {
- //灏嗙洰鏍囩殑Mac鍙樻洿涓哄綋鍓嶈澶囩殑Mac
- scene.AdjustTargetList[i].DeviceAddr = device.DeviceAddr;
- save = true;
- continue;
- }
- }
- if (save == true)
- {
- //淇濆瓨缂撳瓨
- scene.Save();
- }
- }
- }
-
- /// <summary>
- /// 鑾峰彇璁惧宸茬粡閫夋嫨浜嗙殑妯℃澘鐩爣鐨勮澶囩殑Mac(娌℃湁鐩爣鏃�,杩斿洖null)
- /// </summary>
- /// <param name="sourceMac">璁惧鐨凪ac</param>
- /// <returns></returns>
- public string GetDeviceTemplateSelectMac(string sourceMac)
- {
- if (this.modelData.dicDeviceTemplateSelect.ContainsKey(sourceMac) == true)
- {
- return this.modelData.dicDeviceTemplateSelect[sourceMac];
- }
- return null;
- }
-
- /// <summary>
- /// 鑾峰彇璁惧宸茬粡閫夋嫨浜嗙殑妯℃澘鐩爣鐨勮澶囩殑Mac鍚嶅瓧(娌℃湁鐩爣鏃�,杩斿洖null)
- /// </summary>
- /// <param name="sourceMac">璁惧鐨凪ac</param>
- /// <returns></returns>
- public string GetDeviceTemplateSelectName(string sourceMac)
- {
- if (this.modelData.dicDeviceTemplateSelect.ContainsKey(sourceMac) == true)
- {
- string tempMac = this.modelData.dicDeviceTemplateSelect[sourceMac];
- foreach (var listData in this.modelData.dicDeviceFileContent.Values)
- {
- foreach (var data in listData)
- {
- if (data.DeviceMac != tempMac || data.saveDiv != ModelDeviceSaveEnum.A璁惧鍚嶇О)
- {
- continue;
- }
- var tempModel = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceMacNameInfo>(data.FileContent);
- return tempModel.deviceMacName;
- }
- }
- }
- return null;
- }
-
- /// <summary>
- /// 鍙栨秷璁惧妯℃澘鐨勯�夋嫨鐩爣
- /// </summary>
- /// <param name="sourceMac">璁惧鐨凪ac</param>
- public void RemoveDeviceTemplateSelect(string sourceMac)
- {
- ////鑾峰彇鏈湴鎸囧畾鐨凪ac鐨勫叏閮ㄨ澶�
- //var listDevice = Common.LocalDevice.Current.GetDevicesByMac(sourceMac, false);
- //foreach (var device in listDevice)
- //{
- // //杩樺師鍦烘櫙鐨勬墽琛岀洰鏍�
- // this.RecoverAndChangedSceneAdjustTarget(device, null);
- //}
-
- //璁板綍缂撳瓨
- this.modelData.dicDeviceTemplateSelect.Remove(sourceMac);
- //淇濆瓨鐨勮矾寰�
- string fileData = Newtonsoft.Json.JsonConvert.SerializeObject(this.modelData.dicDeviceTemplateSelect);
- HdlFileLogic.Current.SaveTextToFile(DirNameResourse.DeviceTemplateSelectFile, fileData);
- }
-
- /// <summary>
- /// 娣诲姞/淇敼 缃戝叧妯℃澘閫夋嫨鐩爣
- /// </summary>
- /// <param name="sourceGwid">缃戝叧id</param>
- /// <param name="targetGwid">鐩爣缃戝叧id(妯℃澘)</param>
- public void AddGatewayTemplateSelect(string sourceGwid, string targetGwid)
- {
- //璁板綍缂撳瓨
- this.modelData.dicGatewayTemplateSelect[sourceGwid] = targetGwid;
- //淇濆瓨鐨勮矾寰�
- string fileData = Newtonsoft.Json.JsonConvert.SerializeObject(this.modelData.dicGatewayTemplateSelect);
- HdlFileLogic.Current.SaveTextToFile(DirNameResourse.GatewayTemplateSelectFile, fileData);
-
- //鍙樻洿缃戝叧鎴块棿
- if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(targetGwid) == true)
- {
- HdlGatewayLogic.Current.ChangedGatewayRoom(sourceGwid, this.modelData.dicDeviceTemplateRealRoom[targetGwid]);
- }
- //鍙樻洿缃戝叧鍚嶅瓧
- if (this.modelData.dicGatewayInfo.ContainsKey(targetGwid) == true)
- {
- var localGateway = HdlGatewayLogic.Current.GetLocalGateway(sourceGwid);
- string gwName = HdlGatewayLogic.Current.GetGatewayName(this.modelData.dicGatewayInfo[targetGwid]);
- HdlGatewayLogic.Current.ReName(localGateway, gwName);
- }
- }
-
- /// <summary>
- /// 鍙栨秷缃戝叧妯℃澘閫夋嫨鐩爣
- /// </summary>
- /// <param name="sourceGwid">缃戝叧id</param>
- /// <param name="targetGwid">鐩爣缃戝叧id</param>
- public void RemoveGatewayTemplateSelect(string sourceGwid)
- {
- //璁板綍缂撳瓨
- this.modelData.dicGatewayTemplateSelect.Remove(sourceGwid);
- //淇濆瓨鐨勮矾寰�
- string fileData = Newtonsoft.Json.JsonConvert.SerializeObject(this.modelData.dicGatewayTemplateSelect);
- HdlFileLogic.Current.SaveTextToFile(DirNameResourse.GatewayTemplateSelectFile, fileData);
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧宸茬粡閫夋嫨浜嗙殑妯℃澘鐩爣鐨勭綉鍏崇殑鍚嶅瓧(娌℃湁鐩爣鏃�,杩斿洖null)
- /// </summary>
- /// <param name="sourceMac">缃戝叧id</param>
- /// <returns></returns>
- public string GetGatewayTemplateSelectName(string sourceGwid)
- {
- if (this.modelData.dicGatewayTemplateSelect.ContainsKey(sourceGwid) == true)
- {
- string tempMac = this.modelData.dicGatewayTemplateSelect[sourceGwid];
- if (this.modelData.dicGatewayInfo.ContainsKey(tempMac) == true)
- {
- string gwName = HdlGatewayLogic.Current.GetGatewayName(this.modelData.dicGatewayInfo[tempMac]);
- return gwName;
- }
- }
- return null;
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧宸茬粡閫夋嫨浜嗙殑妯℃澘鐩爣鐨勭綉鍏崇殑鍚嶅瓧(娌℃湁鐩爣鏃�,杩斿洖null)
- /// </summary>
- /// <param name="sourceMac">缃戝叧id</param>
- /// <returns></returns>
- public string GetGatewayTemplateSelectId(string sourceGwid)
- {
- if (this.modelData.dicGatewayTemplateSelect.ContainsKey(sourceGwid) == true)
- {
- return this.modelData.dicGatewayTemplateSelect[sourceGwid];
- }
- return null;
- }
-
- /// <summary>
- /// 鑾峰彇妯℃澘涓叏閮ㄧ綉鍏崇殑鍚嶅瓧
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, string> GetAllGatewayTemplateName()
- {
- var dic = new Dictionary<string, string>();
- foreach (string gwId in this.modelData.dicGatewayInfo.Keys)
- {
- string gwName = HdlGatewayLogic.Current.GetGatewayName(this.modelData.dicGatewayInfo[gwId]);
- dic[gwId] = gwName;
- }
- return dic;
- }
-
- /// <summary>
- /// 鑾峰彇鎸囧畾缃戝叧鑳藉閫夋嫨鐨勬ā鏉垮悕瀛�
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, string> GetGatewayCanSelectTemplateName(ZbGateway zbGateway)
- {
- var dic = new Dictionary<string, string>();
- foreach (var zbway in this.modelData.dicGatewayInfo.Values)
- {
- if (zbGateway.LinuxImageType == zbway.LinuxImageType)
- {
- string gwName = HdlGatewayLogic.Current.GetGatewayName(zbway);
- dic[zbway.GwId] = gwName;
- }
- }
- return dic;
- }
-
- /// <summary>
- /// 娓呴櫎鍏ㄩ儴宸茬粡宸茬粡閫夋嫨濂戒簡妯℃澘瀵硅薄鐨勮澶囧拰缃戝叧
- /// </summary>
- public void ClearAllSelectDeviceAndGateway()
- {
- //閲嶆柊鍒濆鍖�
- this.modelData.dicDeviceTemplateSelect = new Dictionary<string, string>();
- this.modelData.dicGatewayTemplateSelect = new Dictionary<string, string>();
- //鍒犳帀杩欎袱涓繚瀛橀�夋嫨妯℃澘鐨勬枃浠�
- HdlFileLogic.Current.DeleteFile(DirNameResourse.DeviceTemplateSelectFile);
- HdlFileLogic.Current.DeleteFile(DirNameResourse.GatewayTemplateSelectFile);
- }
-
- #endregion
-
- #region 鈻� 鑾峰彇鑳藉閫夋嫨鐨勬ā鏉縚________________
-
- /// <summary>
- /// 鑾峰彇鑳藉閫夋嫨鐨勬ā鏉�
- /// </summary>
- /// <param name="localDevice">鏈湴璁惧</param>
- /// <returns></returns>
- public List<TemplateCanSelectContent> GetCanSelectDeviceTemplate(CommonDevice localDevice)
- {
- var listCanSelect = new List<TemplateCanSelectContent>();
- if (this.modelData.dicGatewayTemplateSelect.ContainsKey(localDevice.CurrentGateWayId) == false)
- {
- //璇ョ綉鍏虫病鏈夊尮閰嶆ā鏉�,涓嶆彁渚涙ā鏉块�夋嫨
- return listCanSelect;
- }
- var listHadSelect = new HashSet<string>();
- foreach (var localMac in this.modelData.dicDeviceTemplateSelect.Keys)
- {
- //瀹冭嚜宸辩殑璇�,鍙互鏄剧ず(鍥犱负鏈変釜鍙栨秷缁戝畾鐨勫姛鑳�)
- if (localMac != localDevice.DeviceAddr)
- {
- //鐩墠宸茬粡琚�夋嫨浜嗙殑妯℃澘Mac
- listHadSelect.Add(this.modelData.dicDeviceTemplateSelect[localMac]);
- }
- }
-
- var listCheck = new HashSet<string>();
- //璁惧鐨勬ā鍧桰D
- string modelId = this.GetDeviceModelId(localDevice.DeviceAddr);
- //妯℃澘涓殑缃戝叧ID
- string gatewayTemplateId = this.modelData.dicGatewayTemplateSelect[localDevice.CurrentGateWayId];
- foreach (var listData in this.modelData.dicDeviceFileContent.Values)
- {
- foreach (var data in listData)
- {
- if (data.saveDiv != ModelDeviceSaveEnum.A璁惧鍚嶇О)
- {
- //鍙幏鍙栬澶噈ac鍚嶇О鐨勬ā鏉挎暟鎹�
- continue;
- }
- if (listHadSelect.Contains(data.DeviceMac) == true
- || listCheck.Contains(data.DeviceMac) == true)
- {
- //濡傛灉杩欎釜妯℃澘宸茬粡琚叾浠栬澶囬�夋嫨浜�,鎴栬�呰繖涓狹ac宸茬粡澶勭悊浜�,鍒檅reak
- break;
- }
- if (this.modelData.dicDeviceInfo.ContainsKey(data.DeviceMac) == false
- || this.modelData.dicDeviceInfo[data.DeviceMac][0].CurrentGateWayId != gatewayTemplateId
- || this.modelData.dicDeviceInfo[data.DeviceMac][0].ModelIdentifier != modelId)
- {
- //璇ユā鏉夸笉鏄繖涓綉鍏崇殑,鎴栬�呮ā鍧桰D涓嶄竴鏍风殑
- break;
- }
- listCheck.Add(data.DeviceMac);
-
- var info = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceMacNameInfo>(data.FileContent);
- var selectData = new TemplateCanSelectContent();
- selectData.DeviceMac = data.DeviceMac;
- selectData.DeviceName = info.deviceMacName;
-
- Common.Room room = null;
- if (this.modelData.dicDeviceTemplateRealRoom.ContainsKey(data.DeviceMac) == true)
- {
- room = HdlRoomLogic.Current.GetRoomById(this.modelData.dicDeviceTemplateRealRoom[data.DeviceMac]);
- }
- selectData.RoomName = HdlRoomLogic.Current.GetRoomName(room);
-
- listCanSelect.Add(selectData);
- }
- }
- return listCanSelect;
- }
-
- #endregion
-
- #region 鈻� 鍒犻櫎璁惧___________________________
-
- /// <summary>
- /// 鍒犻櫎璁惧
- /// </summary>
- /// <param name="device"></param>
- public void DeleteDevice(CommonDevice device)
- {
- //鍒犻櫎淇濆瓨鏂囦欢
- string saveFile = DirNameResourse.LocalTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, device.FilePath);
- HdlFileLogic.Current.DeleteFile(saveFile);
-
- //绉婚櫎妯℃澘缂撳瓨
- this.modelData.dicDeviceTemplateData.Remove(Common.LocalDevice.Current.GetDeviceMainKeys(device));
- //绉婚櫎璁惧閫夋嫨缂撳瓨
- if (this.modelData.dicDeviceTemplateSelect.ContainsKey(device.DeviceAddr) == true)
- {
- this.modelData.dicDeviceTemplateSelect.Remove(device.DeviceAddr);
- HdlFileLogic.Current.SaveFileContent(DirNameResourse.DeviceTemplateSelectFile, this.modelData.dicDeviceTemplateSelect);
- }
- }
-
- #endregion
-
- #region 鈻� 淇濆瓨璁惧缂撳瓨_______________________
-
- /// <summary>
- /// 淇濆瓨璁惧缂撳瓨
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- public void SaveDeviceMemmoryData(CommonDevice device)
- {
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
- if (this.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == false)
- {
- return;
- }
-
- //淇濆瓨璺緞
- string saveFile = DirNameResourse.LocalTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, device.FilePath);
-
- var listData = this.modelData.dicDeviceTemplateData[mainkey];
- if (listData.Count == 0)
- {
- //鍒犻櫎鎺夎繖涓枃浠�
- HdlFileLogic.Current.DeleteFile(saveFile);
- return;
- }
- //鍐欏叆鏂囦欢鐨勫唴瀹�
- string writeText = string.Empty;
- foreach (var data in listData)
- {
- writeText += "===>" + (int)data.DataSaveDiv + "\r\n";
- string dataInfo = Newtonsoft.Json.JsonConvert.SerializeObject(data);
- writeText += dataInfo + "\r\n";
- }
- //鍐欏叆鍐呭
- HdlFileLogic.Current.SaveTextToFile(saveFile, writeText);
- }
-
- #endregion
-
- #region 鈻� 鑾峰彇闇�瑕佸崌绾х殑璁惧瀵硅薄_____________
-
- /// <summary>
- /// 鑾峰彇闇�瑕佸崌绾х殑璁惧瀵硅薄,鎸夌綉鍏冲垎缁�(key:缃戝叧ID value鐨刱ey:鏈湴Ota璁惧鐨凪ac value:鍗囩骇鍥轰欢鍦板潃)
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, Dictionary<string, string>> GetNeedToUpdateDevice()
- {
- var dicGatewayDevice = new Dictionary<string, Dictionary<string, string>>();
- //寰幆璁惧鍖归厤鐨勬ā鏉�
- foreach (var localMac in this.modelData.dicDeviceTemplateSelect.Keys)
- {
- string tempMac = this.modelData.dicDeviceTemplateSelect[localMac];
- if (this.modelData.dicDeviceInfo.ContainsKey(tempMac) == false)
- {
- //搴旇涓嶄細杩涙潵,鍗充娇杩涙潵,鎴戜篃涓嶇煡閬撲负浠�涔�
- continue;
- }
- //鍙栨湰鍦癘ta璁惧瀵硅薄
- var localOta = Common.LocalDevice.Current.GetOTADevice(localMac);
- if (localOta == null)
- {
- //搴旇涓嶄細杩涙潵,鍗充娇杩涙潵,鎴戜篃涓嶇煡閬撲负浠�涔�
- continue;
- }
- foreach (var tempDevice in this.modelData.dicDeviceInfo[tempMac])
- {
- //鍙栨ā鏉縊ta璁惧瀵硅薄
- if (tempDevice is OTADevice)
- {
- //鍙涓よ�呯殑鍥轰欢鐗堟湰涓嶄竴鏍�,骞朵笖鏈湴鏈夎繖涓崌绾у浐浠�,鍒欓兘闇�瑕佸崌绾�
- if (localOta.ImgVersion != tempDevice.ImgVersion
- && HdlFirmwareUpdateLogic.IsEsixtDeviceFirmwareFile((OTADevice)tempDevice) == true)
- {
- //鎸夌綉鍏冲垎缁�
- if (dicGatewayDevice.ContainsKey(localOta.CurrentGateWayId) == false)
- {
- dicGatewayDevice[localOta.CurrentGateWayId] = new Dictionary<string, string>();
- }
- var dicDevice = dicGatewayDevice[localOta.CurrentGateWayId];
- dicDevice[localMac] = HdlFirmwareUpdateLogic.GetDeviceFirmwareFile((OTADevice)tempDevice);
- }
- break;
- }
- }
- }
-
- return dicGatewayDevice;
- }
-
- /// <summary>
- /// 鑾峰彇闇�瑕佸崌绾х殑缃戝叧瀵硅薄(key:鏈湴缃戝叧鐨刬d value:鍗囩骇鍥轰欢鍦板潃,绗竴浣嶆槸Linux,绗簩浣嶆槸鍗忚皟鍣�,涔嬪悗閮芥槸铏氭嫙椹卞姩)
- /// </summary>
- /// <returns></returns>
- public Dictionary<string, List<string>> GetNeedToUpdateGateway()
- {
- var dicGateway = new Dictionary<string, List<string>>();
- //寰幆缃戝叧鍖归厤鐨勬ā鏉�
- foreach (var localId in this.modelData.dicGatewayTemplateSelect.Keys)
- {
- string tempId = this.modelData.dicGatewayTemplateSelect[localId];
- if (this.modelData.dicGatewayInfo.ContainsKey(tempId) == false)
- {
- //搴旇涓嶄細杩涙潵,鍗充娇杩涙潵,鎴戜篃涓嶇煡閬撲负浠�涔�
- continue;
- }
- //鍙栨湰鍦扮綉鍏冲璞�
- var localGateway = HdlGatewayLogic.Current.GetLocalGateway(localId);
- if (localGateway == null)
- {
- //搴旇涓嶄細杩涙潵,鍗充娇杩涙潵,鎴戜篃涓嶇煡閬撲负浠�涔�
- continue;
- }
- var tempGateway = this.modelData.dicGatewayInfo[tempId];
- //鍒濆鍖栧鍣�
- dicGateway[localId] = new List<string>() { null, null };
-
- //Linux鐗堟湰姣旇緝
- if (tempGateway.LinuxFirmwareVersion != localGateway.LinuxFirmwareVersion)
- {
- //Linux鍗囩骇鍥轰欢鏂囦欢鍏ㄨ矾寰�
- string updateFile = HdlFirmwareUpdateLogic.GetGatewayLinuxFirmwareFile(tempGateway);
- if (System.IO.File.Exists(updateFile) == true)
- {
- //濡傛灉瀛樺湪鐨勮瘽
- dicGateway[localId][0] = updateFile;
- }
- }
- //鍗忚皟鍣ㄧ増鏈瘮杈�
- if (tempGateway.CoordinatorFirmwareVersion != localGateway.CoordinatorFirmwareVersion)
- {
- //鍗忚皟鍣ㄥ崌绾у浐浠舵枃浠跺叏璺緞
- string updateFile = HdlFirmwareUpdateLogic.GetGatewayCoordinatorFirmwareFile(tempGateway);
- if (System.IO.File.Exists(updateFile) == true)
- {
- //濡傛灉瀛樺湪鐨勮瘽
- dicGateway[localId][1] = updateFile;
- }
- }
- //铏氭嫙椹卞姩姣旇緝
- if (localGateway.LinuxImageType != 6)
- {
- foreach (var localCode in localGateway.DriveCodeList)
- {
- foreach (var tempCode in tempGateway.DriveCodeList)
- {
- //闃叉瀹冩斁鐨勯『搴忎笉鏍�
- if (localCode.DriveId == tempCode.DriveId && localCode.DriveFwVersion != tempCode.DriveFwVersion)
- {
- //铏氭嫙椹卞姩鍗囩骇鍥轰欢鏂囦欢鍏ㄨ矾寰�
- string updateFile = HdlFirmwareUpdateLogic.GetGatewayDriveCodeFirmwareFile(tempCode);
- if (System.IO.File.Exists(updateFile) == true)
- {
- //濡傛灉瀛樺湪鐨勮瘽
- dicGateway[localId].Add(updateFile);
- }
- }
- }
- }
- }
- }
-
- return dicGateway;
- }
-
- #endregion
-
- #region 鈻� 浠庢ā鏉挎枃浠朵腑鑾峰彇瀵硅薄(澶栭儴璋冪敤)_____
-
- /// <summary>
- /// 浠庢ā鏉挎枃浠朵腑,鑾峰彇璁惧鍜岀綉鍏冲璞�
- /// </summary>
- /// <param name="fullFileName">妯℃澘鏂囦欢鐨勫叏璺緞</param>
- /// <param name="listDevice">ota璁惧鍒楄〃</param>
- /// <param name="listGateway">缃戝叧鍒楄〃</param>
- public void GetDeviceObjectFromTemplate(string fullFileName, ref List<OTADevice> listDevice, ref List<ZbGateway> listGateway)
- {
- var fileData = HdlFileLogic.Current.ReadFileTextContent(fullFileName);
- if (fileData == null)
- {
- return;
- }
- var deviceType = string.Empty;
- var strTempContentData = string.Empty;
-
- //鏍规嵁鎹㈣绗﹀垏鍒嗘暟鎹枃鏈�
- string[] arryData = fileData.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
- foreach (string strData in arryData)
- {
- if (strData == "#START#")
- {
- //鏃犻檮鍔犳暟鎹殑銆愭暟鎹爣棰樸��
- strTempContentData = string.Empty;
- continue;
- }
- if (strData.StartsWith("#DeviceInfo START#") == true)
- {
- //闄勫姞鏁版嵁:璁惧瀵硅薄绫诲瀷
- deviceType = strData.Substring(18);
- strTempContentData = string.Empty;
- continue;
- }
- try
- {
- //璁惧瀵硅薄
- if (strData == "#DeviceInfo END#")
- {
- //鍙嶅簭鍒楀寲璁惧
- if (deviceType == "OtaDevice" || deviceType == "OtaPanelDevice")
- {
- var device = Newtonsoft.Json.JsonConvert.DeserializeObject<OTADevice>(strTempContentData);
- if (device != null)
- {
- listDevice.Add(device);
- }
- }
-
- strTempContentData = string.Empty;
- continue;
- }
- //缃戝叧瀵硅薄鏁版嵁
- else if (strData == "#GatewayInfo END#")
- {
- //鍙嶅簭鍒楀寲璁惧
- var gateway = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway>(strTempContentData);
- if (gateway != null)
- {
- listGateway.Add(gateway);
- }
- strTempContentData = string.Empty;
- return;
- }
- strTempContentData += strData;
- }
- catch (Exception ex)
- {
- HdlLogLogic.Current.WriteLog(ex, "妯℃澘bin鏂囦欢鍑洪棶棰榎r\n" + strTempContentData);
- strTempContentData = string.Empty;
- }
- }
- }
-
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 澶嶅埗妯℃澘bin鏂囦欢鍒版湰鍦扮殑妯℃澘鏂囦欢澶归噷
- /// </summary>
- /// <param name="templateFileName">妯℃澘鏂囦欢鐨勫悕瀛�(鍏ㄤ綇瀹呭瓨鏀剧殑妯℃澘)</param>
- public void CopyTemplateFileToLocalDirectory(string templateFileName)
- {
- string sourceFile = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, templateFileName);
-
- this.CopyTemplateFileToLocalDirectory2(sourceFile);
- }
-
- /// <summary>
- /// 澶嶅埗妯℃澘bin鏂囦欢鍒版湰鍦扮殑妯℃澘鏂囦欢澶归噷
- /// </summary>
- /// <param name="fullTemplateName">妯℃澘鏂囦欢鐨勫叏璺緞</param>
- public void CopyTemplateFileToLocalDirectory2(string fullTemplateName)
- {
- if (System.IO.File.Exists(fullTemplateName) == false)
- {
- return;
- }
-
- //淇濆瓨鐨勮矾寰�
- string targetFile = DirNameResourse.LocalTemplateDirectory;
- targetFile = System.IO.Path.Combine(targetFile, TemplateFileName);
-
- try { System.IO.File.Copy(fullTemplateName, targetFile, true); }
- catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex, "澶嶅埗妯℃澘bin鏂囦欢澶辫触"); }
- }
-
- /// <summary>
- /// 鍒犻櫎鏈湴鍏ㄩ儴鐨勬ā鏉跨紦瀛樻枃浠�
- /// </summary>
- public void DeleteAllLocalFile()
- {
- //鑾峰彇杩欎釜璺緞涓嬮潰鍏ㄩ儴鐨勬枃浠�
- var listFile = HdlFileLogic.Current.GetFileFromDirectory(DirNameResourse.LocalTemplateDirectory, false); ;
- foreach (var file in listFile)
- {
- HdlFileLogic.Current.DeleteFile(file);
- }
- }
-
- /// <summary>
- /// 鑾峰彇妯℃澘涓殑璁惧鏁�
- /// </summary>
- /// <returns></returns>
- public int GetTemplateDeviceCount()
- {
- return this.modelData.dicDeviceInfo.Count;
- }
-
- /// <summary>
- /// 妫�娴嬭澶囨ā鏉挎暟鍜屽綋鍓嶈澶囬�夋嫨鐨勬ā鏉挎暟鏄惁涓�鑷�
- /// </summary>
- /// <returns></returns>
- public bool CheckTemplateDeviceCountAndSelectCountIsEqual()
- {
- return this.modelData.dicDeviceInfo.Count == this.modelData.dicDeviceTemplateSelect.Count;
- }
-
- /// <summary>
- /// 鑾峰彇鏂囦欢閲屾寚瀹氱殑鍐呭
- /// </summary>
- /// <param name="fileContrnt">鏂囦欢鏂囨湰</param>
- /// <param name="startFlage">寮�濮嬪瓧绗�</param>
- /// <param name="endFlage">缁撴潫瀛楃</param>
- /// <returns></returns>
- private string GetDataFromFileContent(string fileContrnt, string startFlage, string endFlage)
- {
- string[] arryValue = fileContrnt.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
- string modelBaseInfo = string.Empty;
- bool getData = false;
- bool success = false;
- foreach (var strValue in arryValue)
- {
- //寮�濮�
- if (strValue == startFlage)
- {
- getData = true;
- //鍚屼竴寮�濮嬪瓧绗︾殑涓滆タ寰堝
- modelBaseInfo = string.Empty;
- continue;
- }
- //缁撴潫
- if (strValue == endFlage)
- {
- success = true;
- break;
- }
- if (getData == true)
- {
- modelBaseInfo += strValue;
- }
- }
- return success == true ? modelBaseInfo : string.Empty;
- }
-
- /// <summary>
- /// 鑾峰彇妯″潡ID
- /// </summary>
- /// <param name="deviceMac"></param>
- /// <returns></returns>
- private string GetDeviceModelId(string deviceMac)
- {
- var listDevice = Common.LocalDevice.Current.GetDevicesByMac(deviceMac);
- foreach (var device in listDevice)
- {
- if (device.ModelIdentifier != string.Empty)
- {
- return device.ModelIdentifier;
- }
- }
- return string.Empty;
- }
-
- /// <summary>
- /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="saveEnum"></param>
- /// <returns></returns>
- public TemplateDeviceDataCommon GetDeviceModelDataClass(CommonDevice device, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
- {
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
-
- //鍒涘缓瀛樺偍绌洪棿
- if (this.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == false)
- {
- this.modelData.dicDeviceTemplateData[mainkey] = new List<TemplateDeviceDataCommon>();
- }
- foreach (var data in this.modelData.dicDeviceTemplateData[mainkey])
- {
- //濡傛灉鏄凡缁忓瓨鍦ㄤ簡鐨�
- if (data.DataSaveDiv == saveEnum)
- {
- return data;
- }
- }
- //鏂板缓涓�涓柊鐨勫璞�
- newClass.DataSaveDiv = saveEnum;
- newClass.DeviceEpoint = device.DeviceEpoint;
- newClass.DeviceMac = device.DeviceAddr;
-
- //榛樿鍒涘缓涓�涓储寮曚綅
- newClass.ListReceiveResult.Add(string.Empty);
- newClass.ListReceiveTopic.Add(string.Empty);
- newClass.ListSendTopic.Add(string.Empty);
-
- this.modelData.dicDeviceTemplateData[mainkey].Add(newClass);
-
- return newClass;
- }
-
- /// <summary>
- /// 鏄剧ず淇℃伅妗�
- /// </summary>
- /// <param name="msgType">淇℃伅绫诲瀷</param>
- /// <param name="msg">淇℃伅</param>
- /// <param name="action">鍗曞嚮纭鍚庢墽琛岀殑鍥炶皟鍑芥暟</param>
- /// <param name="buttonText">鎸夐挳鐨勬枃鏈�</param>
- private void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null)
- {
- //绌哄璞℃椂锛屼笉鏄剧ず
- if (string.IsNullOrEmpty(msg))
- {
- return;
- }
- Application.RunOnMainThread(() =>
- {
- var alert = new ShowMsgControl(msgType, msg, buttonText);
- if (action != null)
- {
- alert.ConfirmClickEvent += () =>
- {
- try
- {
- //鍥炶皟鍑芥暟
- action?.Invoke();
- }
- catch (Exception ex)
- {
- //鍑虹幇鏈煡閿欒,鏁版嵁涓㈠け
- this.ShowMassage(ShowMsgType.Error, Language.StringByID(R.MyInternationalizationString.uUnKnownError));
-
- //Log鍑哄姏
- HdlLogLogic.Current.WriteLog(ex);
- }
- action = null;
- };
- }
- alert.Show();
- });
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
deleted file mode 100755
index ec0d985..0000000
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
+++ /dev/null
@@ -1,738 +0,0 @@
-锘縰sing Shared.Phone.UserCenter;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace Shared.Phone.TemplateData
-{
- #region 鈻� 鍏遍�氭ā鏉挎暟鎹畾涔塤__________________
-
- /// <summary>
- /// 妯℃澘缂撳瓨鏁版嵁
- /// </summary>
- public class TemplateMemoryData
- {
- //鈽� 銉嗐兂銉椼儸銉笺儓銉曘偂銈ゃ儷銇繚瀛樸仌銈屻仧銉戙儵銉°兗銈裤兗 鈽� 鈫�
- /// <summary>
- /// 妯℃澘鐨勫悕瀛�
- /// </summary>
- public string TemplateName = string.Empty;
- /// <summary>
- /// 鍏ㄩ儴鐨勮澶囬厤缃紦瀛樻暟鎹�(涓婚敭鏄湰鍦拌澶囩殑涓婚敭)
- /// </summary>
- public Dictionary<string, List<TemplateDeviceDataCommon>> dicDeviceTemplateData = new Dictionary<string, List<TemplateDeviceDataCommon>>();
- /// <summary>
- /// 缃戝叧瀵硅薄鏁版嵁
- /// </summary>
- public Dictionary<string, ZigBee.Device.ZbGateway> dicGatewayInfo = new Dictionary<string, ZigBee.Device.ZbGateway>();
- /// <summary>
- /// 璁惧瀵硅薄鏁版嵁(key锛氳澶嘙ac)
- /// </summary>
- public Dictionary<string, List<ZigBee.Device.CommonDevice>> dicDeviceInfo = new Dictionary<string, List<ZigBee.Device.CommonDevice>>();
- /// <summary>
- /// 妯℃澘涓澶囧悇鑷湡瀹炶澶囧搴旂殑鎴块棿(keys:璁惧Mac鎴栬�呯綉鍏矷D, value:鎴块棿ID)
- /// </summary>
- public Dictionary<string, string> dicDeviceTemplateRealRoom = new Dictionary<string, string>();
- //鈽� 銉嗐兂銉椼儸銉笺儓銇繚瀛樸仌銈屻仧銉戙儵銉°兗銈裤兗 鈽� 鈫�
-
-
- /// <summary>
- /// 涓存椂缂撳瓨:妯℃澘涓悇鑷鐐规墍澶勭殑鎴块棿(keys:璁惧涓婚敭 value:鎴块棿ID) 鏃ㄥ湪閽堝璁惧鏉ュ洖閫夋嫨妯℃澘鐨勬儏鍐�
- /// </summary>
- public Dictionary<string, string> dicDeviceTemplateRoom = new Dictionary<string, string>();
- /// <summary>
- /// 涓存椂缂撳瓨:妯℃澘涓悇鑷鐐规墍淇濆瓨鐨勫唴瀹�(keys:妯℃澘涓澶囦富閿�),璁惧閫夋嫨妯℃澘鏃�,妯℃澘鏁版嵁杩佺Щ浣跨敤,鍥犱负鏄紩鐢ㄧ被鍨�,鎵�浠ラ渶瑕侀噸鏂癗ew
- /// </summary>
- public Dictionary<string, List<TemplateDeviceContent>> dicDeviceFileContent = new Dictionary<string, List<TemplateDeviceContent>>();
-
-
- //鈽� 鍒ャ伄銉曘偂銈ゃ儷銇繚瀛樸仌銈屻仧銉戙儵銉°兗銈裤兗 鈽� 鈫�
- /// <summary>
- /// 璁惧閫夋嫨鐨勬ā鏉垮璞�(keys:鏈湴璁惧鐨凪ac value:妯℃澘涓殑Mac)
- /// </summary>
- public Dictionary<string, string> dicDeviceTemplateSelect = new Dictionary<string, string>();
- /// <summary>
- /// 缃戝叧瀵硅薄閫夋嫨鐨勬ā鏉垮璞�(keys:鏈湴缃戝叧ID, value:妯℃澘涓殑缃戝叧ID)
- /// </summary>
- public Dictionary<string, string> dicGatewayTemplateSelect = new Dictionary<string, string>();
- //鈽� 鍒ャ伄銉曘偂銈ゃ儷銇繚瀛樸仌銈屻仧銉戙儵銉°兗銈裤兗 鈽� 鈫�
- }
-
- /// <summary>
- /// 涓�涓澶囩殑妯℃澘鏁版嵁鐨勫叡閫�
- /// </summary>
- public class TemplateDeviceDataCommon
- {
- /// <summary>
- /// 璁惧Mac鍦板潃
- /// </summary>
- public string DeviceMac = string.Empty;
- /// <summary>
- /// 璁惧绔偣
- /// </summary>
- public int DeviceEpoint = -1;
- /// <summary>
- /// 鍙戦�侀渶瑕佺殑澶ф鏃堕棿(绉�)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public int SendTime { get { return this.GetSendTime(); } }
- /// <summary>
- /// 鏁版嵁淇濆瓨鐨勫尯鍒�(涓嶉渶瑕佸啀娆¤缃�)
- /// </summary>
- public ModelDeviceSaveEnum DataSaveDiv = ModelDeviceSaveEnum.A鏈畾涔�;
- /// <summary>
- /// 鎺ユ敹鐨勪富棰�(鑰冭檻澶氭潯鍛戒护,姝ｅ父閮芥槸1鏉″懡浠�)
- /// </summary>
- public List<string> ListReceiveTopic = new List<string>();
- /// <summary>
- /// 鎺ユ敹鐨勭粨鏋�(鑰冭檻澶氭潯鍛戒护,姝ｅ父閮芥槸1鏉″懡浠�)
- /// </summary>
- public List<string> ListReceiveResult = new List<string>();
- /// <summary>
- /// 鍙戦�佺殑涓婚(鑰冭檻澶氭潯鍛戒护,姝ｅ父閮芥槸1鏉″懡浠�)
- /// </summary>
- public List<string> ListSendTopic = new List<string>();
-
- /// <summary>
- /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�(鑰冭檻澶氭潯鍛戒护,姝ｅ父閮芥槸1鏉″懡浠�)
- /// </summary>
- /// <returns></returns>
- public virtual List<string> GetSendGatewayValue()
- {
- return new List<string>();
- }
-
- /// <summary>
- /// 鍙戦�侀渶瑕佺殑澶ф鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public virtual int GetSendTime()
- {
- return 0;
- }
- }
-
- /// <summary>
- /// 妯℃澘璁惧鐨勭増鏈俊鎭�
- /// </summary>
- public class TemplateDeviceVersionInfo
- {
- //鐩墠鍙湁 鐗堟湰鍙橀噺
- /// <summary>
- /// 褰撳墠鐗堟湰
- /// </summary>
- public int Version = -1;
- }
-
- /// <summary>
- /// 妯℃澘璁惧鍦ㄦ枃浠朵腑鐨勫唴瀹�
- /// </summary>
- public class TemplateDeviceContent
- {
- /// <summary>
- /// 淇濆瓨鍖哄垎 鍙傜収:ModelDeviceSaveEnum
- /// </summary>
- public ModelDeviceSaveEnum saveDiv = ModelDeviceSaveEnum.A鏈畾涔�;
- /// <summary>
- /// 鏈夌偣鐢ㄥ
- /// </summary>
- public string DeviceMac = string.Empty;
- /// <summary>
- /// 鏂囦欢涓繚瀛樼殑鍐呭
- /// </summary>
- public string FileContent = string.Empty;
- }
-
- /// <summary>
- /// 鍙�夋ā鏉跨殑鍐呭
- /// </summary>
- public class TemplateCanSelectContent
- {
- /// <summary>
- /// 璁惧Mac
- /// </summary>
- public string DeviceMac = string.Empty;
- /// <summary>
- /// 璁惧Mac鍚嶅瓧
- /// </summary>
- public string DeviceName = string.Empty;
- /// <summary>
- /// 璇ヨ澶囨墍鍦ㄧ殑鎴块棿
- /// </summary>
- public string RoomName = string.Empty;
- }
-
- /// <summary>
- /// 鏈湴妯℃澘鐨勫熀鏈俊鎭�
- /// </summary>
- public class LocalModelBaseInfo
- {
- /// <summary>
- /// <para>淇濆瓨鏁版嵁鐨勬枃浠跺悕瀛�(涓嶉渶瑕佷繚瀛樺埌鏂囦欢澶逛腑)</para>
- /// <para>ModelData_Local_yyyyMMdd_HHmmss.bin -> 鏈湴妯℃澘</para>
- /// <para>ModelData_Cloud_yyyyMMdd_HHmmss.bin -> 鏈湴妯℃澘</para>
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string FileName = string.Empty;
- /// <summary>
- /// 鏄惁鏄湰鍦版ā鏉�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public bool IsLocalTemplate
- {
- get { return FileName.StartsWith("ModelData_Local"); }
- }
- /// <summary>
- /// 鍗曞厓鍚嶇О(杩欎釜鐩墠鏄粰鏌ョ湅妯℃澘浣跨敤鐨�)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public List<string> ListUintContent = new List<string>();
- /// <summary>
- /// 褰撳墠浣忓畢鐨勫湴鍥句綅缃悕绉�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public string ResidenceAddressName = string.Empty;
-
- /// <summary>
- /// 妯℃澘鍚嶅瓧
- /// </summary>
- public string ModelName = string.Empty;
- /// <summary>
- /// 缂栬緫鏃堕棿 2020.01.04 19:55鏍煎紡
- /// </summary>
- public string EditorTime = string.Empty;
- /// <summary>
- /// 妤煎眰鏁�
- /// </summary>
- public int FloorCount = 0;
- /// <summary>
- /// 璁惧鏁�
- /// </summary>
- public int DeviceCount = 0;
- /// <summary>
- /// 鍔熻兘鏁�
- /// </summary>
- public int FunctionCount = 0;
- }
-
- /// <summary>
- /// 妯℃澘浣忓畢鐨勪俊鎭�
- /// </summary>
- public class TemplateHomeInfo
- {
- /// <summary>
- /// 鍗曞厓鍚嶇О
- /// </summary>
- public List<string> ListUintContent = new List<string>();
- /// <summary>
- /// 褰撳墠浣忓畢鐨勫湴鍥句綅缃悕绉�
- /// </summary>
- public string ResidenceAddressName = string.Empty;
- }
-
- #endregion
-
- #region 鈻� 绐楀笜妯℃澘鏁版嵁瀹氫箟___________________
-
- /// <summary>
- /// 绐楀笜鎵嬫媺鎺у埗妯℃澘瀹氫箟
- /// </summary>
- public class ModelCurtainHandPullControl : TemplateDeviceDataCommon
- {
- /// <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>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
- return 5;
- }
- }
-
- /// <summary>
- /// 绐楀笜闄愪綅妯℃澘瀹氫箟
- /// </summary>
- public class ModelCurtainDirectionAndLimite : TemplateDeviceDataCommon
- {
- /// <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 };
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
- return 5;
- }
- }
-
- #endregion
-
- #region 鈻� 绌鸿皟妯℃澘鏁版嵁瀹氫箟___________________
-
- /// <summary>
- /// 绌鸿皟鑷畾涔夋ā寮忔ā鏉挎暟鎹畾涔�
- /// </summary>
- public class ModelAcModeSupport : TemplateDeviceDataCommon
- {
- /// <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>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
- return 5;
- }
- }
-
- /// <summary>
- /// 绌鸿皟鎽嗛妯″紡妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelAcSwingModeSupport : TemplateDeviceDataCommon
- {
- /// <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>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
- return 5;
- }
- }
-
- #endregion
-
- #region 鈻� 璁惧缁戝畾妯℃澘鏁版嵁瀹氫箟_______________
-
- /// <summary>
- /// 璁惧缁戝畾妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelDeviceBindData : TemplateDeviceDataCommon
- {
- /// <summary>
- /// 鎸夐敭鐨勫姛鑳芥ā寮�
- /// </summary>
- public ZigBee.Device.Panel.KeyMode keyMode = ZigBee.Device.Panel.KeyMode.Default;
- /// <summary>
- /// 鎸夐敭鐨勫姛鑳芥ā寮忕殑闀濱D
- /// </summary>
- public int keyModeClusterID = -1;
- /// <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;
-
- //褰撳墠閫夋嫨鐨勬ā鏉垮璞�
- var dicChangedMac = new Dictionary<string, string>();
- var dicNowSelect = TemplateCommonLogic.Current.modelData.dicDeviceTemplateSelect;
- foreach (var localMac in dicNowSelect.Keys)
- {
- dicChangedMac[dicNowSelect[localMac]] = localMac;
- }
- foreach (var data in BindList)
- {
- //鍦烘櫙
- if (data.BindType == 2)
- {
- var addData = new ZigBee.Device.BindObj.AddBindListObj();
- addBindData.BindList.Add(addData);
- addData.BindCluster = data.BindCluster;
- addData.BindScenesId = data.BindScenesId;
- addData.BindType = 1;
- }
- //璁惧
- else
- {
- if (dicChangedMac.ContainsKey(data.BindMacAddr) == false)
- {
- //杩欎釜涓滆タ娌℃湁閫夋嫨妯℃澘,鍒欎笉鎵ц
- continue;
- }
- var addData = new ZigBee.Device.BindObj.AddBindListObj();
- addBindData.BindList.Add(addData);
- addData.BindCluster = data.BindCluster;
- addData.BindEpoint = data.BindEpoint;
- //鏇挎崲mac
- addData.BindMacAddr = dicChangedMac[data.BindMacAddr];
- addData.BindType = 0;
- }
- }
- var listCommand = new List<string>();
- //娓呯┖缁戝畾
- var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", this.DeviceMac }, { "Epoint", this.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };
- listCommand.Add(jObject.ToString());
-
- //鍔熻兘閰嶇疆
- listCommand.Add(string.Empty);
- if (keyModeClusterID != -1)
- {
- var command1 = HdlDeviceBindLogic.Current.GetConfigureHdlKeyCommandText(this.DeviceMac, this.DeviceEpoint, keyMode, keyModeClusterID);
- listCommand[1] = command1;
- }
-
- //缁戝畾鍒楄〃
- listCommand.Add(string.Empty);
- if (addBindData.BindList.Count > 0)
- {
- var command2 = HdlDeviceBindLogic.Current.GetAddDeviceListBindCommandText(addBindData);
- listCommand[2] = command2;
- }
- return listCommand;
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�15绉�
- return 15;
- }
- }
-
- #endregion
-
- #region 鈻� Pir浼犳劅鍣ㄦā鏉挎暟鎹畾涔塤_____________
-
- /// <summary>
- /// Pir浼犳劅鍣ㄦā鏉挎暟鎹畾涔�
- /// </summary>
- public class ModelPirSensorSettion : TemplateDeviceDataCommon
- {
- /// <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 };
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
- return 5;
- }
- }
-
- #endregion
-
- #region 鈻� 闈㈡澘妯℃澘鏁版嵁瀹氫箟___________________
-
- /// <summary>
- /// 闈㈡澘闇囧姩鍔熻兘妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelPanelVibrationInfo : TemplateDeviceDataCommon
- {
- /// <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>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
- return 5;
- }
- }
-
- /// <summary>
- /// 闈㈡澘鑳屽厜鐏ā鏉挎暟鎹畾涔�
- /// </summary>
- public class ModelPanelBackLightInfo : TemplateDeviceDataCommon
- {
- /// <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);
- //鎸夐敭鎸囩ず鐏鑹�
- var command3 = HdlDevicePanelLogic.Current.GetPanelColorCommandText(DeviceMac, keyColorData, KeyNum);
-
- return new List<string>() { command1, command2, command3 };
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
- return 8;
- }
- }
-
- /// <summary>
- /// 鎸夐敭鎸囩ず鐏潰鏉垮紑鍏充寒搴﹂厤缃洖澶�
- /// </summary>
- public class ModelPanelSwitchLevelInfo
- {
- /// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
- /// </summary>
- public int panelDirectionsLevel = -1;
-
- /// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
- /// </summary>
- public int panelBacklightLevel = -1;
- }
-
- #endregion
-
- #region 鈻� 璁惧鍚嶇О妯℃澘鏁版嵁瀹氫箟_______________
-
- /// <summary>
- /// 璁惧绔偣鍚嶇О妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelDeviceEpointNameInfo : TemplateDeviceDataCommon
- {
- /// <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>
- /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�3绉�
- return 3;
- }
- }
-
- /// <summary>
- /// 璁惧Mac鍚嶇О妯℃澘鏁版嵁瀹氫箟
- /// </summary>
- public class ModelDeviceMacNameInfo : TemplateDeviceDataCommon
- {
- /// <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 };
- }
-
- /// <summary>
- /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
- /// </summary>
- /// <returns></returns>
- public override int GetSendTime()
- {
- //鎵ц杩欎釜鍛戒护澶х害闇�瑕�3绉�
- return 3;
- }
- }
-
- #endregion
-
- #region 鈻� 鑷畾涔夋灇涓綺________________________
-
- /// <summary>
- /// 妯℃澘璁惧淇濆瓨鐨勫尯鍒�
- /// </summary>
- public enum ModelDeviceSaveEnum
- {
- A鏈畾涔� = -1,
- /// <summary>
- /// 瀵硅薄绫�:ModelDeviceMacNameInfo
- /// </summary>
- A璁惧鍚嶇О = 1,
- /// <summary>
- /// 瀵硅薄绫�:ModelDeviceEpointNameInfo
- /// </summary>
- A绔偣鍚嶇О = 2,
- /// <summary>
- /// 瀵硅薄绫�:ModelPirSensorSettion
- /// </summary>
- APir閰嶇疆 = 3,
- /// <summary>
- /// 瀵硅薄绫�:ModelCurtainDirectionAndLimite
- /// </summary>
- A绐楀笜鏂瑰悜鍙婇檺浣� = 8,
- /// <summary>
- /// 瀵硅薄绫�:ModelCurtainHandPullControl
- /// </summary>
- A绐楀笜鎵嬫媺鎺у埗 = 9,
- /// <summary>
- /// 瀵硅薄绫�:ModelAcModeSupport
- /// </summary>
- A绌鸿皟鑷畾涔夋ā寮� = 10,
- /// <summary>
- /// 瀵硅薄绫�:ModelPanelVibrationInfo
- /// </summary>
- A闈㈡澘闇囧姩鍔熻兘 = 11,
- /// <summary>
- /// 瀵硅薄绫�:ModelAcSwingModeSupport
- /// </summary>
- A绌鸿皟鎽嗛鍔熻兘 = 12,
- /// <summary>
- /// 瀵硅薄绫�:ModelDeviceBindData
- /// </summary>
- A璁惧缁戝畾鍒楄〃 = 14,
- /// <summary>
- /// 瀵硅薄绫�:ModelPanelBackLightInfo
- /// </summary>
- A闈㈡澘鑳屽厜鐏� = 15
- }
-
- /// <summary>
- /// 鍙戦�佹ā鏉挎暟鎹殑鍖哄垎
- /// </summary>
- public enum ModelDataSendEnum
- {
- A鏈畾涔� = -1,
- A绉佹湁灞炴�� = 1,
- A绉佹湁鍗忚 = 2,
- A閫忎紶鏁版嵁 = 3
- }
-
- #endregion
-}
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
deleted file mode 100755
index fbf9219..0000000
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
+++ /dev/null
@@ -1,890 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.TemplateData
-{
- /// <summary>
- /// 璁惧妯℃澘鏁版嵁鐨勯�昏緫
- /// </summary>
- public class TemplateDeviceDataLogic
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 璁惧妯℃澘鏁版嵁鐨勯�昏緫
- /// </summary>
- private static TemplateDeviceDataLogic m_Current = null;
- /// <summary>
- /// 璁惧妯℃澘鏁版嵁鐨勯�昏緫
- /// </summary>
- public static TemplateDeviceDataLogic Current
- {
- get
- {
- if (m_Current == null)
- {
- m_Current = new TemplateDeviceDataLogic();
- }
- return m_Current;
- }
- }
-
- #endregion
-
- #region 鈻� 绐楀笜鎵嬫媺鎺у埗_______________________
-
- /// <summary>
- /// 娣诲姞绐楀笜鎵嬫媺鎺у埗缂撳瓨
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="bolStatu">鎵嬫媺鎺у埗鐘舵��</param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- public void SetCurtainHandPullControl(CommonDevice device, bool bolStatu, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainHandPullControl();
- var memoryData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
-
- memoryData.Statu = bolStatu;
- memoryData.ListSendTopic[0] = "SetWritableValue";
- memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
- memoryData.ListReceiveResult[0] = receiveResult;
- //淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
- }
-
- /// <summary>
- /// 鑾峰彇绐楀笜鎵嬫媺鎺у埗鐘舵��(铏氭嫙浣跨敤)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public bool GetCurtainHandPullControl(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainHandPullControl();
- var memoryData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
-
- return memoryData.Statu;
- }
-
- #endregion
-
- #region 鈻� 绐楀笜鏂瑰悜___________________________
-
- /// <summary>
- /// 璁剧疆绐楀笜鐨勬柟鍚�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="isDirectionReversed"></param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public CommonDevice.SetWritableValueResponAllData SetCurtainDirection(CommonDevice device, bool isDirectionReversed, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainDirectionAndLimite();
- var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
-
- memoryData.Direction = isDirectionReversed;
- memoryData.ListSendTopic[0] = "SetWritableValue";
- memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
- memoryData.ListReceiveResult[0] = receiveResult;
- //淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(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="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public bool SetCurtainLimitPoint(CommonDevice rollershade,int upLimit, int downLimit, int curtainLength, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainDirectionAndLimite();
- var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
- memoryData.curtainLength = curtainLength;
- memoryData.downLimit = downLimit;
- memoryData.upLimit = upLimit;
-
- memoryData.ListSendTopic[0] = "SetWritableValue";
- memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
- memoryData.ListReceiveResult[0] = receiveResult;
-
- return true;
- }
-
- /// <summary>
- /// 鑾峰彇寮�鍚堝笜鐨勯檺浣�
- /// </summary>
- /// <param name="rollershade"></param>
- /// <returns></returns>
- public ModelCurtainDirectionAndLimite GetCurtainLimitPoint(CommonDevice rollershade)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelCurtainDirectionAndLimite();
- var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
-
- return memoryData;
- }
-
- #endregion
-
- #region 鈻� 绌鸿皟鑷畾涔夋ā寮廮____________________
-
- /// <summary>
- /// 娣诲姞绌鸿皟鑷畾涔夋ā寮忕紦瀛�
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="data">鍊�</param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- public void SetAcModeSupport(CommonDevice device, int data, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcModeSupport();
- var memoryData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
-
- memoryData.data = data;
- memoryData.ListSendTopic[0] = "SetWritableValue";
- memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
- memoryData.ListReceiveResult[0] = receiveResult;
- //淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
- }
-
- /// <summary>
- /// 鑾峰彇绌鸿皟鑷畾涔夋ā寮�(铏氭嫙浣跨敤)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public int GetAcModeSupport(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcModeSupport();
- var memoryData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
-
- return memoryData.data;
- }
-
- #endregion
-
- #region 鈻� 绌鸿皟鎽嗛妯″紡_______________________
-
- /// <summary>
- /// 娣诲姞绌鸿皟鎽嗛妯″紡缂撳瓨
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <param name="data">鍊�</param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- public void SetAcSwingModeSupport(CommonDevice device, int data, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcSwingModeSupport();
- var memoryData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
-
- memoryData.data = data;
- memoryData.ListSendTopic[0] = "SetWritableValue";
- memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
- memoryData.ListReceiveResult[0] = receiveResult;
- //淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
- }
-
- /// <summary>
- /// 鑾峰彇绌鸿皟鎽嗛妯″紡(铏氭嫙浣跨敤)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public int GetAcSwingModeSupport(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelAcSwingModeSupport();
- var memoryData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
-
- return memoryData.data;
- }
-
- #endregion
-
- #region 鈻� 璁惧缁戝畾___________________________
-
- /// <summary>
- /// 鑾峰彇璁惧缁戝畾鍒楄〃鐨勭紦瀛�
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- public List<BindObj.BindListResponseObj> GetDeviceBindList(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
-
- return memoryData.BindList;
- }
-
- /// <summary>
- /// 娣诲姞璁惧缁戝畾鍒楄〃鐨勭紦瀛�
- /// </summary>
- /// <param name="addBindData"></param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public BindObj.AddedDeviceBindResponseAllData AddDeviceBindList(BindObj.AddBindData addBindData, string receiveResult)
- {
- var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
- if (memoryData.ListReceiveResult.Count == 1)
- {
- //璁惧缁戝畾鏈変笁鏉″懡浠� 绗竴鏉′负娓呯┖
- memoryData.ListReceiveResult.Insert(0, "{" + SetDouMarks("Result") + ": 0," + SetDouMarks("ResultRemark") + ": " + SetDouMarks("Success") + " }");
- memoryData.ListReceiveTopic.Insert(0, "Bind/ClearBindInfo_Respon");
- memoryData.ListSendTopic.Insert(0, "Bind/ClearBindInfo");
-
- memoryData.ListReceiveResult.Add(string.Empty);
- memoryData.ListReceiveTopic.Add(string.Empty);
- memoryData.ListSendTopic.Add(string.Empty);
- }
- memoryData.ListSendTopic[2] = "Bind/SetBind";
- memoryData.ListReceiveTopic[2] = "Bind/SetBind_Respon";
- memoryData.ListReceiveResult[2] = receiveResult;
-
- 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 < memoryData.BindList.Count; i++)
- {
- var bindData = memoryData.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();
- memoryData.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.SaveDeviceMemmoryData(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();
- var memoryData = (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 < memoryData.BindList.Count; i++)
- {
- var bindData = memoryData.BindList[i];
- //濡傛灉鏄澶�
- if (bindData.BindType == 0 && data.BindType == 0
- && bindData.BindMacAddr == data.BindMacAddr
- && bindData.BindEpoint == data.BindEpoint
- && bindData.BindCluster == data.BindCluster)
- {
- //绉婚櫎缂撳瓨
- memoryData.BindList.RemoveAt(i);
- break;
- }
- //濡傛灉鏄満鏅�
- if (bindData.BindType == 2 && data.BindType == 1
- && bindData.BindScenesId == data.BindScenesId
- && bindData.BindCluster == data.BindCluster)
- {
- //绉婚櫎缂撳瓨
- memoryData.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.SaveDeviceMemmoryData(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 (TemplateCommonLogic.Current.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == true)
- {
- //绉婚櫎鍏ㄩ儴鐨� 璁惧缁戝畾鍒楄〃 鏁版嵁
- var listBind = TemplateCommonLogic.Current.modelData.dicDeviceTemplateData[mainkey];
- for (int i = 0; i < listBind.Count; i++)
- {
- if (listBind[i].DataSaveDiv == ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃)
- {
- ((ModelDeviceBindData)listBind[i]).BindList.Clear();
- }
- }
- }
- this.SaveDeviceMemmoryData(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>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public CommonDevice.SetWritableValueResponAllData ConfigurePanelKeyModel(CommonDevice device, Panel.KeyMode value, int clusterID, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
- memoryData.keyMode = value;
- memoryData.keyModeClusterID = clusterID;
-
- if (memoryData.ListReceiveResult.Count == 1)
- {
- if (memoryData.ListReceiveResult.Count == 1)
- {
- //璁惧缁戝畾鏈変笁鏉″懡浠� 绗竴鏉′负娓呯┖
- memoryData.ListReceiveResult.Insert(0, "{" + SetDouMarks("Result") + ": 0," + SetDouMarks("ResultRemark") + ": " + SetDouMarks("Success") + " }");
- memoryData.ListReceiveTopic.Insert(0, "Bind/ClearBindInfo_Respon");
- memoryData.ListSendTopic.Insert(0, "Bind/ClearBindInfo");
-
- memoryData.ListReceiveResult.Add(string.Empty);
- memoryData.ListReceiveTopic.Add(string.Empty);
- memoryData.ListSendTopic.Add(string.Empty);
- }
- }
- memoryData.ListSendTopic[1] = "SetWritableValue";
- memoryData.ListReceiveTopic[1] = "SetWritableValue_Respon";
- memoryData.ListReceiveResult[1] = receiveResult;
-
- this.SaveDeviceMemmoryData(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();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
-
- var data = new Panel.PanelConfigureInfoResponAllData();
- data.deviceStatusReportData = new CommonDevice.DeviceStatusReportData { CluterID = memoryData.keyModeClusterID };
-
- var dataAttri = new CommonDevice.AttributeDataObj();
- dataAttri.AttriButeData = (int)memoryData.keyMode;
- data.deviceStatusReportData.AttriBute.Add(dataAttri);
-
- return data;
- }
-
- #endregion
-
- #region 鈻� Pir浼犳劅鍣╛_________________________
-
- /// <summary>
- /// 鑾峰彇Pir浼犳劅鍣ㄧ殑閰嶇疆
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public IASZone.ParamatesInfo GetPirSensorLightSettion(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPirSensorSettion();
- var memoryData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.APir閰嶇疆, classData);
-
- var localData = new IASZone.ParamatesInfo();
- localData.configureParamates = new IASZone.ConfigureParamates();
- localData.configureParamates.controlDevEnable = memoryData.pirConfigure.controlDevEnable;
- localData.configureParamates.dimmerLevel = memoryData.pirConfigure.dimmerLevel;
- localData.configureParamates.dimmerOffTime = memoryData.pirConfigure.dimmerOffTime;
- localData.configureParamates.dimmerOnTime = memoryData.pirConfigure.dimmerOnTime;
- localData.configureParamates.iasReportPeriod = memoryData.pirConfigure.iasReportPeriod;
- localData.configureParamates.levelEnable = memoryData.pirConfigure.levelEnable;
- localData.configureParamates.levelSize = memoryData.pirConfigure.levelSize;
- localData.configureParamates.mode = memoryData.pirConfigure.mode;
- localData.configureParamates.transitionTime = memoryData.pirConfigure.transitionTime;
- localData.configureParamates.type = memoryData.pirConfigure.type;
-
- return localData;
- }
-
- /// <summary>
- /// 璁剧疆Pir浼犳劅鍣ㄧ殑閰嶇疆
- /// </summary>
- /// <param name="device"></param>
- /// <param name="configureParamates"></param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public IASZone.ResponseAllData SetPirSensorLightSettion(CommonDevice device, IASZone.ConfigureParamates configureParamates, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPirSensorSettion();
- var memoryData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.APir閰嶇疆, classData);
-
- memoryData.pirConfigure = configureParamates;
-
- memoryData.ListSendTopic[0] = "ClientDataPassthrough";
- memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
- memoryData.ListReceiveResult[0] = receiveResult;
-
- this.SaveDeviceMemmoryData(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();
- var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
-
- var data = new UserCenter.HdlDevicePanelLogic.PanelVibrationInfo();
- data.A闇囧姩浣胯兘 = memoryData.vibrationInfo.A闇囧姩浣胯兘;
- data.A闇囧姩寮哄害 = memoryData.vibrationInfo.A闇囧姩寮哄害;
- data.A闇囧姩鏃堕棿 = memoryData.vibrationInfo.A闇囧姩鏃堕棿;
-
- return data;
- }
-
- /// <summary>
- /// 璁剧疆闈㈡澘闇囧姩鍔熻兘
- /// </summary>
- /// <param name="device"></param>
- /// <param name="datainfo"></param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public bool SetPanelVibrationInfo(CommonDevice device, UserCenter.HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelVibrationInfo();
- var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
- memoryData.vibrationInfo = datainfo;
-
- memoryData.ListSendTopic[0] = "ClientDataPassthrough";
- memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
- memoryData.ListReceiveResult[0] = receiveResult;
-
- this.SaveDeviceMemmoryData(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)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceMacNameInfo();
- var memoryData = (ModelDeviceMacNameInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧鍚嶇О, classData);
- memoryData.deviceMacName = macName;
-
- //璁惧杩斿洖鐨勭粨鏋�
- var receiveResult = "{"
- + SetDouMarks("DeviceAddr") + ": " + SetDouMarks(device.DeviceAddr) + ","
- + SetDouMarks("Data_ID") + ": 100,"
- + SetDouMarks("Data") + ": {"
- + SetDouMarks("Result") + ": 0,"
- + SetDouMarks("MacName") + ":" + macName+ "}"
- + "}";
-
- memoryData.ListSendTopic[0] = "MacRename";
- memoryData.ListReceiveTopic[0] = "MacRename_Respon";
- memoryData.ListReceiveResult[0] = receiveResult;
-
- this.SaveDeviceMemmoryData(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)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelDeviceEpointNameInfo();
- var memoryData = (ModelDeviceEpointNameInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绔偣鍚嶇О, classData);
- memoryData.deviceEpointName = deviceName;
-
- //璁惧杩斿洖鐨勭粨鏋�
- var receiveResult = "{"
- + SetDouMarks("Device_ID") + ": 2,"
- + SetDouMarks("DeviceAddr") + ": " + SetDouMarks(device.DeviceAddr) + ","
- + SetDouMarks("Epoint") + ": " + device.DeviceEpoint + ","
- + SetDouMarks("Data_ID") + ": 96,"
- + SetDouMarks("Data") + ": {"
- + SetDouMarks("Result") + ": 0,"
- + SetDouMarks("DeviceName") + ":" + deviceName + "}"
- + "}";
-
- memoryData.ListSendTopic[0] = "DeviceRename";
- memoryData.ListReceiveTopic[0] = "DeviceRenameRespon";
- memoryData.ListReceiveResult[0] = receiveResult;
-
- this.SaveDeviceMemmoryData(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();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- var data = new Panel.PanelSwitchLevelInfo();
- data.panelBacklightLevel = memoryData.linghtLevelInfo.panelBacklightLevel == -1 ? 0 : memoryData.linghtLevelInfo.panelBacklightLevel;
- data.panelDirectionsLevel = memoryData.linghtLevelInfo.panelDirectionsLevel == -1 ? 0 : memoryData.linghtLevelInfo.panelDirectionsLevel;
- return data;
- }
-
- /// <summary>
- /// 璁剧疆璁惧浜害锛坲i鍙寒搴﹁皟鑺傦級
- /// </summary>
- /// <param name="panel">璁惧瀵硅薄</param>
- /// <param name="directionsLevel">0-100(杩欎釜鏄偣鍑诲悗鐨勫��)</param>
- /// <param name="backlightLevel">0-100(杩欎釜鏄偣鍑诲墠鐨勫��)</param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public bool SetDeviceLightSettion(CommonDevice device, int directionsLevel, int backlightLevel, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
- memoryData.linghtLevelInfo.panelBacklightLevel = backlightLevel;
- memoryData.linghtLevelInfo.panelDirectionsLevel = directionsLevel;
- //鑳屽厜鐏湁涓変釜涓滆タ
- if (memoryData.ListSendTopic.Count == 1)
- {
- memoryData.ListSendTopic.Add(string.Empty);
- memoryData.ListSendTopic.Add(string.Empty);
-
- memoryData.ListReceiveTopic.Add(string.Empty);
- memoryData.ListReceiveTopic.Add(string.Empty);
-
- memoryData.ListReceiveResult.Add(string.Empty);
- memoryData.ListReceiveResult.Add(string.Empty);
- }
- memoryData.ListSendTopic[0] = "ClientDataPassthrough";
- memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
- memoryData.ListReceiveResult[0] = receiveResult;
-
- this.SaveDeviceMemmoryData(device);
-
- return true;
- }
-
- /// <summary>
- /// 鑾峰彇璁惧鑺傝兘妯″紡鐨勯厤缃姸鎬�(ui鍙妭鑳芥ā寮�)
- /// </summary>
- /// <param name="device"></param>
- /// <returns></returns>
- public Panel.PanelSaveEnergyModeInfo GetDeviceEnergyConservationMode(CommonDevice device)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- var data = new Panel.PanelSaveEnergyModeInfo();
- data.enable = memoryData.energyModeInfo.enable;
- data.level = memoryData.energyModeInfo.level == -1 ? 0 : memoryData.energyModeInfo.level;
- data.time = memoryData.energyModeInfo.time == -1 ? 0 : memoryData.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>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public bool SetDeviceEnergyConservationMode(CommonDevice device, bool modeEnable, int modeTime, int level,string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
- memoryData.energyModeInfo.enable = modeEnable;
- memoryData.energyModeInfo.time = modeTime;
- memoryData.energyModeInfo.level = level;
-
- //鑳屽厜鐏湁涓変釜涓滆タ
- if (memoryData.ListSendTopic.Count == 1)
- {
- memoryData.ListSendTopic.Add(string.Empty);
- memoryData.ListSendTopic.Add(string.Empty);
-
- memoryData.ListReceiveTopic.Add(string.Empty);
- memoryData.ListReceiveTopic.Add(string.Empty);
-
- memoryData.ListReceiveResult.Add(string.Empty);
- memoryData.ListReceiveResult.Add(string.Empty);
- }
- memoryData.ListSendTopic[1] = "ClientDataPassthrough";
- memoryData.ListReceiveTopic[1] = "ZbDataPassthrough";
- memoryData.ListReceiveResult[1] = receiveResult;
-
- this.SaveDeviceMemmoryData(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();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- var data = new Panel.KeyColorDataResponseAllData();
- data.keyColorData = new Panel.KeyColorData();
- data.keyColorData.CloseColorB = string.IsNullOrEmpty(memoryData.keyColorData.CloseColorB) == true ? "0" : memoryData.keyColorData.CloseColorB;
- data.keyColorData.CloseColorG = string.IsNullOrEmpty(memoryData.keyColorData.CloseColorG) == true ? "0" : memoryData.keyColorData.CloseColorG;
- data.keyColorData.CloseColorR = string.IsNullOrEmpty(memoryData.keyColorData.CloseColorR) == true ? "0" : memoryData.keyColorData.CloseColorR;
- data.keyColorData.OpenColorB = string.IsNullOrEmpty(memoryData.keyColorData.OpenColorB) == true ? "0" : memoryData.keyColorData.OpenColorB;
- data.keyColorData.OpenColorG = string.IsNullOrEmpty(memoryData.keyColorData.OpenColorG) == true ? "0" : memoryData.keyColorData.OpenColorG;
- data.keyColorData.OpenColorR = string.IsNullOrEmpty(memoryData.keyColorData.OpenColorR) == true ? "0" : memoryData.keyColorData.OpenColorR;
- data.keyColorData.keyNum = keyNum;
-
- return data;
- }
-
- /// <summary>
- /// 閰嶇疆鎸夐敭鎸囩ず鐏鑹�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="keyColorData"></param>
- /// <param name="keyNumStatus"></param>
- /// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
- /// <returns></returns>
- public CommonDevice.ResponseAllData SetPanelColorInfo(CommonDevice device, Panel.KeyColorData keyColorData, Panel.KeyNumStatus keyNumStatus, string receiveResult)
- {
- //鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
-
- memoryData.keyColorData.keyNum = keyColorData.keyNum;
- memoryData.keyColorData.OpenColorB = keyColorData.OpenColorB;
- memoryData.keyColorData.OpenColorG = keyColorData.OpenColorG;
- memoryData.keyColorData.OpenColorR = keyColorData.OpenColorR;
- memoryData.keyColorData.CloseColorB = keyColorData.CloseColorB;
- memoryData.keyColorData.CloseColorG = keyColorData.CloseColorG;
- memoryData.keyColorData.CloseColorR = keyColorData.CloseColorR;
-
- memoryData.KeyNum.Key1 = keyNumStatus.Key1;
- memoryData.KeyNum.Key2 = keyNumStatus.Key2;
- memoryData.KeyNum.Key3 = keyNumStatus.Key3;
- memoryData.KeyNum.Key4 = keyNumStatus.Key4;
- memoryData.KeyNum.Key5 = keyNumStatus.Key5;
- memoryData.KeyNum.Key6 = keyNumStatus.Key6;
- memoryData.KeyNum.Key7 = keyNumStatus.Key7;
- memoryData.KeyNum.Key8 = keyNumStatus.Key8;
- memoryData.KeyNum.Key9 = keyNumStatus.Key9;
- memoryData.KeyNum.Key10 = keyNumStatus.Key10;
- memoryData.KeyNum.Key11 = keyNumStatus.Key11;
- memoryData.KeyNum.Key12 = keyNumStatus.Key12;
- memoryData.KeyNum.Key13 = keyNumStatus.Key13;
- memoryData.KeyNum.Key14 = keyNumStatus.Key14;
- memoryData.KeyNum.Key15 = keyNumStatus.Key15;
- memoryData.KeyNum.Key16 = keyNumStatus.Key16;
-
- //鑳屽厜鐏湁涓変釜涓滆タ
- if (memoryData.ListSendTopic.Count == 1)
- {
- memoryData.ListSendTopic.Add(string.Empty);
- memoryData.ListSendTopic.Add(string.Empty);
-
- memoryData.ListReceiveTopic.Add(string.Empty);
- memoryData.ListReceiveTopic.Add(string.Empty);
-
- memoryData.ListReceiveResult.Add(string.Empty);
- memoryData.ListReceiveResult.Add(string.Empty);
- }
- memoryData.ListSendTopic[2] = "ClientDataPassthrough";
- memoryData.ListReceiveTopic[2] = "ZbDataPassthrough";
- memoryData.ListReceiveResult[2] = receiveResult;
-
- this.SaveDeviceMemmoryData(device);
-
- return new CommonDevice.ResponseAllData
- {
- responseData = new CommonDevice.ResponseData
- { status = 0 }
- };
- }
-
- #endregion
-
- #region 鈻� 淇濆瓨璁惧缂撳瓨_______________________
-
- /// <summary>
- /// 淇濆瓨璁惧缂撳瓨
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- public void SaveDeviceMemmoryData(CommonDevice device)
- {
- //浠ｇ爜绉诲姩鍒板埆鐨勬枃浠朵腑浜�
- TemplateCommonLogic.Current.SaveDeviceMemmoryData(device);
- }
-
- #endregion
-
- #region 鈻� 涓�鑸柟娉昣__________________________
-
- /// <summary>
- /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�
- /// </summary>
- /// <param name="device"></param>
- /// <param name="saveEnum"></param>
- /// <returns></returns>
- private TemplateDeviceDataCommon GetDeviceModelDataClass(CommonDevice device, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
- {
- //浠ｇ爜绉诲姩鍒板埆鐨勬枃浠朵腑浜�
- return TemplateCommonLogic.Current.GetDeviceModelDataClass(device, saveEnum, newClass);
- }
-
- /// <summary>
- /// 娣诲姞鍙屽紩鍙�
- /// </summary>
- /// <param name="i_text"></param>
- /// <returns></returns>
- private string SetDouMarks(string i_text)
- {
- return UserCenter.UserCenterResourse.douMarks + i_text + UserCenter.UserCenterResourse.douMarks;
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
index fa84e94..c0e1669 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/IMessageCommon.cs
@@ -676,7 +676,7 @@
//鍦ㄥ唽鐨凪sg
return Language.StringByID(dicMsg[requestName][statuCode]);
}
- return null;
+ return "Error:" + statuCode;
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
index a6bd03a..e99ab65 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterCommon.cs
@@ -1400,17 +1400,13 @@
/// </summary>
public int ErrorMsgDiv = 1;
/// <summary>
- /// 鎺ユ敹鐨凞ata鏁版嵁
+ /// 鎺ユ敹鐨勬暟鎹�
/// </summary>
public string ReceiptData = null;
/// <summary>
/// 鎺ユ敹鐨勬暟鎹�(澶氫釜杩斿洖涓婚涓撶敤)
/// </summary>
public string[] listReceiptData = null;
- /// <summary>
- /// 杩欎釜鏄綉鍏冲洖澶嶇殑鏁翠釜json鏁版嵁,涓暟涓巐istReceiptData涓�鑷�
- /// </summary>
- public string[] JsonData = null;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
index c4572c8..6d11849 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
@@ -16,27 +16,13 @@
/// </summary>
private NormalViewControl btnLineTemp = null;
/// <summary>
- /// 鑱斿姩搴曠嚎(鍏夋爣杩涙潵涔嬪悗,绾跨殑棰滆壊浼氬彉)
+ /// 鑱斿姩搴曠嚎(鍊艰緭鍏ヤ箣鍚�,绾跨殑棰滆壊浼氬彉)
/// </summary>
public NormalViewControl btnLine
{
set
{
this.btnLineTemp = value;
- }
- }
- /// <summary>
- /// 鑱斿姩澶栨
- /// </summary>
- private NormalFrameLayout frameBorder = null;
- /// <summary>
- /// 鑱斿姩澶栨(鍏夋爣杩涙潵涔嬪悗,澶栨鐨勯鑹蹭細鍙�)
- /// </summary>
- public NormalFrameLayout FrameBorder
- {
- set
- {
- this.frameBorder = value;
}
}
@@ -191,10 +177,6 @@
{
btnLineTemp.BackgroundColor = UserCenterColor.Current.ButtomLine;
}
- if (frameBorder != null)
- {
- frameBorder.BorderColor = 0xffcccccc;
- }
if (m_UseFocusColor == true)
{
//鐏拌壊瀛椾綋
@@ -206,10 +188,6 @@
if (btnLineTemp != null)
{
btnLineTemp.BackgroundColor = UserCenterColor.Current.TextFrameSelectColor;
- }
- if (frameBorder != null)
- {
- frameBorder.BorderColor = UserCenterColor.Current.TextFrameSelectColor;
}
if (m_UseFocusColor == true)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
index eba0af0..1882d5f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/SeekBarControl.cs
@@ -11,18 +11,7 @@
{
#region 鈻� 鍙橀噺澹版槑___________________________
- /// <summary>
- /// 杩涘害鏉″彲鐢ㄦ椂鐨勮儗鏅壊
- /// </summary>
- private uint ProgressBarEnableColor = 0;
- /// <summary>
- /// 杩涘害鏉′笉鍙敤鏃剁殑鑳屾櫙鑹�(榛樿鐏拌壊)
- /// </summary>
- public uint ProgressBarUnEnableColor = 0xffe8e8e8;
- /// <summary>
- /// 褰撳墠鍙敤鐘舵��
- /// </summary>
- private bool nowEnable = true;
+ private uint nowProgressBarColor = 0;
/// <summary>
/// 鎺т欢鑳藉惁浣跨敤
/// </summary>
@@ -30,20 +19,16 @@
{
set
{
- //鐘舵�佹病鏈夋敼鍙�
- if (nowEnable == value) { return; }
- nowEnable = value;
-
this.IsClickable = value;
if (value == true)
{
//鍘熸潵鐨勯鑹�
- base.ProgressBarColor = ProgressBarEnableColor;
+ base.ProgressBarColor = nowProgressBarColor;
}
else
{
//鐏拌壊
- base.ProgressBarColor = ProgressBarUnEnableColor;
+ base.ProgressBarColor = 0xffe8e8e8;
}
}
}
@@ -55,7 +40,7 @@
{
set
{
- ProgressBarEnableColor = value;
+ nowProgressBarColor = value;
base.ProgressBarColor = value;
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
index 9ae4829..342b670 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/NormalControls/MessageManagementControl.cs
@@ -69,7 +69,7 @@
var pra = new MessageInfoPra();
pra.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", false, pra, new List<string>() { "NotCheck" }, false);
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("MessageCenter/GetMessageCenterPagger", false, pra, new List<string>() { "NotCheck" });
if (string.IsNullOrEmpty(result) == true)
{
//鍑洪敊锛岄渶瑕侀噸鏂拌鍙�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index e396d32..fffeefb 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -244,14 +244,6 @@
string fullDir = string.Empty;
if (upPath == string.Empty)
{
- //灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
- var templateName = TemplateData.TemplateCommonLogic.Current.GetNewTemplateFileName();
- var templateFile = TemplateData.TemplateCommonLogic.Current.SaveTemplateDataToFile(templateName, "HomeTemplate");
-
- //灏嗘ā鏉縝in鏂囦欢绉诲姩鍒板浠芥枃浠跺す涓�
- try { System.IO.File.Move(templateFile, System.IO.Path.Combine(Config.Instance.FullPath, templateName)); }
- catch (Exception ex) { HdlLogLogic.Current.WriteLog(ex, "绉诲姩妯℃澘澶辫触"); }
-
//鑾峰彇鏈湴鏂囦欢
listAllFile = HdlFileLogic.Current.GetRootPathListFile();
fullDir = Common.Config.Instance.FullPath;
@@ -273,11 +265,6 @@
foreach (string fileName in listAllFile)
{
- //鍒ゆ柇鎸囧畾鏂囦欢鏄惁闇�瑕佷笂浼�(鏍圭洰褰曠殑鎵嶅垽鏂�)
- if (upPath == string.Empty && this.IsNotUpLoadFile(fileName) == true)
- {
- continue;
- }
if (fileName.EndsWith(".png") == true
|| fileName.EndsWith(".bin") == true)
{
@@ -315,6 +302,11 @@
Shared.Common.CommonPage.BackKeyCanClick = true;
UserCenterResourse.AccountOption.AppCanSignout = true;
return false;
+ }
+ //鍒ゆ柇鏄惁鏄簲璇ヤ笂浼犵殑鏂囦欢
+ if (IsNotUpLoadFile(file) == true && upPath == string.Empty)
+ {
+ continue;
}
//鏁寸悊鏁版嵁
var datainfo = new FileInfoData();
@@ -792,15 +784,8 @@
//鍏抽棴杩涘害鏉�
ProgressFormBar.Current.Close();
- //娓呯┖鍏ㄩ儴鎴块棿
- HdlRoomLogic.Current.DeleteAllRoom();
- //娓呯┖鏈湴鍏ㄩ儴鐨勫満鏅暟鎹�
- HdlSceneLogic.Current.DeleteAllLocalScene();
//濡傛灉璇诲彇鍒扮殑鏂囦欢瀹屽叏娌℃湁闂锛屽垯娓呯悊鏈湴鐨勬枃浠�
HdlFileLogic.Current.DeleteAllLocationFile(false);
-
- //娓呯悊鏈湴鐨勬ā鏉挎枃浠�
- TemplateData.TemplateCommonLogic.Current.DeleteAllLocalFile();
//娌℃湁閿欒鐨勮瘽锛屽垯绉诲姩鍒板綋鍓嶄綇瀹呮枃浠跺す涓嬮潰
HdlFileLogic.Current.MoveDirectoryFileToHomeDirectory(tempDirectory, true);
@@ -844,14 +829,11 @@
/// </summary>
/// <param name="file"></param>
/// <returns></returns>
- private bool IsNotUpLoadFile(string file)
+ public bool IsNotUpLoadFile(string file)
{
- if (file.StartsWith("Device_") == true
- || file.StartsWith("Gateway_") == true
- || file.StartsWith("Room_") == true
- || file.StartsWith("Scene_") == true)
+ if (file == "Config.json")
{
- //璁惧,缃戝叧,鎴块棿,鍦烘櫙鏂囦欢涓嶉渶瑕佷笂浼�,瀹冨凡缁忎繚瀛樺湪bin妯℃澘鏂囦欢涓�
+ //涓嶈兘瑕嗙洊Config鏂囦欢
return true;
}
return false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index 2193c34..27d0ccd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
@@ -125,7 +125,7 @@
if (Common.Config.Instance.Home.IsVirtually == true)
{
//鐩存帴娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetAcModeSupport(device, data, null);
+ ModelData.DeviceModelDataLogic.Current.SetAcModeSupport(device, data, "SetWritableValue");
return true;
}
//鍙戦�佹暟鎹�
@@ -155,9 +155,6 @@
return false;
}
- //娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetAcModeSupport(device, data, result.JsonData[0]);
-
return true;
}
@@ -177,7 +174,7 @@
if (Common.Config.Instance.Home.IsVirtually == true)
{
//鐩存帴娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetAcSwingModeSupport(device, data, null);
+ ModelData.DeviceModelDataLogic.Current.SetAcSwingModeSupport(device, data, "SetWritableValue");
return true;
}
//鍙戦�佹暟鎹�
@@ -206,9 +203,6 @@
this.ShowTipMsg(msg);
return false;
}
-
- //娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetAcSwingModeSupport(device, data, result.JsonData[0]);
return true;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
index ec80f72..9c94480 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
@@ -375,7 +375,7 @@
/// 鍙戦�佽幏鍙栫伅鍏夌姸鎬佸懡浠�
/// </summary>
/// <param name="device">绐楀笜</param>
- public void SendLevelStatuComand(CommonDevice device)
+ private void SendLevelStatuComand(CommonDevice device)
{
if (device == null)
{
@@ -422,12 +422,6 @@
colorDevice.ReadLevel();
System.Threading.Thread.Sleep(300);
colorDevice.ReadColorTemperature();
- if (LocalDevice.Current.IsMiniLight(device) == true)
- {
- //mini澶滅伅闇�瑕佽鍙栬渹楦ｅ櫒鐘舵��
- System.Threading.Thread.Sleep(300);
- colorDevice.ReadBuzzerStatu();
- }
})
{ IsBackground = true }.Start();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index f5ac6ec..24b9780 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -76,7 +76,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- var listBind = TemplateData.TemplateDeviceDataLogic.Current.GetDeviceBindList(device);
+ var listBind = ModelData.DeviceModelDataLogic.Current.GetDeviceBindList(device, "Bind/GetDeviceBind");
return new BindObj.GetDeviceBindResponseAllData()
{
getAllBindResponseData = new BindObj.GetDeviceBindResponseData
@@ -177,7 +177,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, null);
+ return ModelData.DeviceModelDataLogic.Current.AddDeviceBindList(addBindData, "Bind/GetDeviceBind");
}
var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
@@ -191,7 +191,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.AddDeviceBindList(addBindData, result.JsonData[0]);
+ ModelData.DeviceModelDataLogic.Current.AddDeviceBindList(addBindData, "Bind/GetDeviceBind");
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.AddedDeviceBindResponseData>(result.ReceiptData);
return new BindObj.AddedDeviceBindResponseAllData() { addedDeviceBindResponseData = tempData };
@@ -420,7 +420,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
+ return ModelData.DeviceModelDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
}
var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
//鑾峰彇闇�瑕佸彂閫佺殑鏁版嵁
@@ -447,7 +447,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
+ ModelData.DeviceModelDataLogic.Current.DeleteDeviceBindList(delDeviceBindData);
return responseData;
}
@@ -460,7 +460,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);
+ return ModelData.DeviceModelDataLogic.Current.ClearDeviceAllBind(device);
}
var jObject = new JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", device.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };
@@ -472,7 +472,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.ClearDeviceAllBind(device);
+ ModelData.DeviceModelDataLogic.Current.ClearDeviceAllBind(device);
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<BindObj.ClearBindInfoResponseData>(result.ReceiptData);
return new BindObj.ClearBindInfoResponseAllData { clearBindInfoResponseData = tempData };
@@ -660,7 +660,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, null);
+ return ModelData.DeviceModelDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, "SetWritableValue");
}
//鑾峰彇鍙戦�佹暟鎹�
var sendData = this.GetConfigureHdlKeyCommandText(device.DeviceAddr, device.DeviceEpoint, value, clusterID);
@@ -671,7 +671,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, result.JsonData[0]);
+ ModelData.DeviceModelDataLogic.Current.ConfigurePanelKeyModel(device, value, clusterID, "SetWritableValue");
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.SetWritableValueResponData>(result.ReceiptData);
return new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = tempData };
@@ -685,7 +685,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.ReadPanelConfigureKeyModel(device);
+ return ModelData.DeviceModelDataLogic.Current.ReadPanelConfigureKeyModel(device);
}
var JObject = new JObject {{ "DeviceAddr",device.DeviceAddr },{ "Epoint", device.DeviceEpoint },
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
index e92d774..02d698c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCommonLogic.cs
@@ -67,8 +67,6 @@
{
var reResult = new ReceiptGatewayResult();
reResult.listReceiptData = new string[listReceiptTopic.Count];
- reResult.JsonData = new string[listReceiptTopic.Count];
-
var myGateway = device.Gateway;
if (myGateway == null)
{
@@ -122,12 +120,6 @@
return;
}
reResult.listReceiptData[i] = jobject["Data"].ToString();
- if (jobject.Property("Time") != null)
- {
- //闇�瑕佺Щ闄ime杩欎釜瀛楁
- jobject.Remove("Time");
- }
- reResult.JsonData[i] = jobject.ToString();
receiptCount++;
}
}
@@ -159,6 +151,7 @@
{
//濡傛灉鍙湁涓�涓富棰�,鍒欐浛鎹㈠彉閲�
reResult.ReceiptData = reResult.listReceiptData[0];
+ reResult.listReceiptData = null;
}
}
@@ -249,13 +242,6 @@
if (command == receiptCommand)
{
reResult.ReceiptData = responseData.PassData;
- reResult.JsonData = new string[1];
- if (jobject.Property("Time") != null)
- {
- //闇�瑕佺Щ闄ime杩欎釜瀛楁
- jobject.Remove("Time");
- }
- reResult.JsonData[0] = jobject.ToString();
}
}
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
index a3af533..8a29182 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceCurtainLogic.cs
@@ -1,6 +1,6 @@
锘縰sing Newtonsoft.Json;
using Newtonsoft.Json.Linq;
-using Shared.Phone.TemplateData;
+using Shared.Phone.ModelData;
using System;
using System.Collections.Generic;
using System.Text;
@@ -51,7 +51,7 @@
if (Common.Config.Instance.Home.IsVirtually == true)
{
//娣诲姞缂撳瓨
- TemplateDeviceDataLogic.Current.SetCurtainHandPullControl(device, bolStatu, null);
+ DeviceModelDataLogic.Current.SetCurtainHandPullControl(device, bolStatu, "SetWritableValue");
return true;
}
//鑾峰彇鍙戦�佺殑鍛戒护瀛楃
@@ -81,9 +81,6 @@
this.ShowTipMsg(msg);
return false;
}
- //娣诲姞缂撳瓨
- TemplateDeviceDataLogic.Current.SetCurtainHandPullControl(device, bolStatu, result.JsonData[0]);
-
return true;
}
@@ -153,7 +150,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateDeviceDataLogic.Current.SetCurtainDirection(device, isDirectionReversed, null);
+ return ModelData.DeviceModelDataLogic.Current.SetCurtainDirection(device, isDirectionReversed, "SetWritableValue");
}
//鑾峰彇缂栬緫绐楀笜鏂瑰悜鐨勫懡浠ゅ瓧绗�
var sendData = this.GetCurtainDirectionCommadText(device.DeviceAddr, device.DeviceEpoint, isDirectionReversed);
@@ -162,9 +159,6 @@
{
return null;
}
-
- //娣诲姞缂撳瓨
- TemplateDeviceDataLogic.Current.SetCurtainDirection(device, isDirectionReversed, result.JsonData[0]);
var tempData = JsonConvert.DeserializeObject<CommonDevice.SetWritableValueResponData>(result.ReceiptData);
return new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = tempData };
@@ -205,7 +199,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetCurtainLimitPoint(rollershade, upLimit, downLimit, curtainLength, null);
+ return ModelData.DeviceModelDataLogic.Current.SetCurtainLimitPoint(rollershade, upLimit, downLimit, curtainLength, "SetWritableValue");
}
//鑾峰彇缂栬緫寮�鍚堝笜闄愪綅鐨勫懡浠ゅ瓧绗�
var sendData = this.GetAutoOpenCurtainLimitPointCommandText(rollershade.DeviceAddr, rollershade.DeviceEpoint, upLimit, downLimit);
@@ -227,9 +221,6 @@
this.ShowTipMsg(msg);
return false;
}
-
- //娣诲姞缂撳瓨
- TemplateDeviceDataLogic.Current.SetCurtainLimitPoint(rollershade, upLimit, downLimit, curtainLength, result.JsonData[0]);
return true;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
index 20fa781..ff85b85 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceOtherLogic.cs
@@ -313,7 +313,7 @@
//鐑熼浘
if (ias.iASInfo?.Alarm1 == 1)
{
- return Language.StringByID(R.MyInternationalizationString.uSmogAlarm);
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
}
return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
}
@@ -322,9 +322,9 @@
//pir
if (ias.iASInfo?.Alarm1 == 1)
{
- return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
}
- return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Safe);
}
else if (info.ConcreteType == DeviceConcreteType.Sensor_Keyfob)
{
@@ -340,9 +340,9 @@
//杩愬姩浼犳劅鍣�
if (ias.iASInfo?.Alarm1 == 1)
{
- return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_HavePerson);
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Alarm);
}
- return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_NoPerson);
+ return Language.StringByID(R.MyInternationalizationString.IASZone_Statu_Normal);
}
else if (info.ConcreteType == DeviceConcreteType.Sensor_EmergencyButton)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
index 603dce4..d1eddb8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
@@ -118,7 +118,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetPanelColorInfo(device, keyNum);
+ return ModelData.DeviceModelDataLogic.Current.GetPanelColorInfo(device, keyNum);
}
//鍙戦�佹暟鎹� keyNum杞负16杩涘埗 鑼冨洿锛�01~10
var passData = "0504040101" + Convert.ToString((int)keyNum, 16).ToUpper().PadLeft(2, '0');
@@ -215,7 +215,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, null);
+ return ModelData.DeviceModelDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, "ZbDataPassthrough");
}
//鑾峰彇閰嶇疆鎸夐敭鎸囩ず鐏鑹茬殑鍛戒护瀛楃
var sendData = this.GetPanelColorCommandText(device.DeviceAddr, keyColorData, keyNumStatus);
@@ -228,10 +228,6 @@
var tempD = new CommonDevice.ResponseData();
tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
-
- //娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, result.JsonData[0]);
-
return new CommonDevice.ResponseAllData { responseData = tempD };
}
@@ -390,7 +386,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceLightSettion(device);
+ return ModelData.DeviceModelDataLogic.Current.GetDeviceLightSettion(device);
}
//鑾峰彇鍙戦�佺殑鍛戒护瀛楃
var passData = "050604010101";
@@ -426,7 +422,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, null);
+ return ModelData.DeviceModelDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, "ZbDataPassthrough");
}
//鑾峰彇淇敼闈㈡澘鐨勪寒搴﹁皟鑺傜殑鍛戒护瀛楃
var sendData = this.GetPanelLevelCommadText(device.DeviceAddr, directionsLevel, backlightLevel);
@@ -460,7 +456,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, result.JsonData[0]);
+ ModelData.DeviceModelDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, "ZbDataPassthrough");
return true;
}
@@ -615,7 +611,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceEnergyConservationMode(device);
+ return ModelData.DeviceModelDataLogic.Current.GetDeviceEnergyConservationMode(device);
}
//鍙戦�佸懡浠�
string passData = "050804010101";
@@ -681,7 +677,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, null);
+ return ModelData.DeviceModelDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, "ZbDataPassthrough");
}
//鑾峰彇璁剧疆璁惧鐨勮妭鑳芥ā寮忕殑鍛戒护瀛楃
var sendData = this.GetDeviceEnergyConservationModeCommandText(device.DeviceAddr, modeEnable, modeTime, level);
@@ -711,7 +707,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, result.JsonData[0]);
+ ModelData.DeviceModelDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, "ZbDataPassthrough");
return true;
}
@@ -1052,7 +1048,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetPanelVibrationInfo(device);
+ return ModelData.DeviceModelDataLogic.Current.GetPanelVibrationInfo(device);
}
//鍙戦�佹暟鎹�
var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", 200 }, { "Cluster_ID", 64513 }, { "Command", 0 } };
@@ -1087,7 +1083,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device, datainfo, null);
+ return ModelData.DeviceModelDataLogic.Current.SetPanelVibrationInfo(device, datainfo, "ClientDataPassthrough");
}
//鑾峰彇缂栬緫闈㈡澘闇囧姩鍔熻兘鐨勫懡浠ゅ瓧绗�
var sendData = this.GetPanelVibrationCommandText(device.DeviceAddr, datainfo);
@@ -1100,9 +1096,6 @@
this.ShowTipMsg(errorMsg);
return false;
}
- //娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device, datainfo, result.JsonData[0]);
-
return true;
}
@@ -1265,6 +1258,7 @@
private void LoadDryContactFunctionFromLocaltion()
{
this.dicDryContactFunction = new Dictionary<string, DryContactFunctionInfo>();
+
byte[] filebyte = HdlFileLogic.Current.ReadFileByteContent(DirNameResourse.DryContactFunctionFile);
if (filebyte == null)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
index 81552d6..ab171e6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
@@ -133,7 +133,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetPirSensorLightSettion(device);
+ return ModelData.DeviceModelDataLogic.Current.GetPirSensorLightSettion(device);
}
var sendData = this.GetPirSensorParamateCommadText(device.DeviceAddr);
var result = HdlDeviceCommonLogic.Current.SendJobjectDataToGateway2(device, sendData, "0302", 34, 9);
@@ -225,7 +225,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device, configureParamates, null);
+ return ModelData.DeviceModelDataLogic.Current.SetPirSensorLightSettion(device, configureParamates, "ClientDataPassthrough");
}
//鍙戦�佹暟鎹�
var sendData = this.GetPirSensorSettionCommandText(device.DeviceAddr, configureParamates);
@@ -238,9 +238,6 @@
var tempD = new IASZone.ResponseData();
tempD.command = data[12].ToString() + data[13].ToString() + data[10].ToString() + data[11].ToString();
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
-
- //娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device, configureParamates, result.JsonData[0]);
return new CommonDevice.ResponseAllData { responseData = tempD };
}
@@ -261,10 +258,10 @@
return jObject.ToString();
}
- /// <summary>
- /// 鑾峰彇淇敼PIR浼犳劅鍣ㄩ厤缃殑鍛戒护瀛楃
- /// </summary>
- private string GetPIRSensorSettionPassData(IASZone.ConfigureParamates configureParamates)
+ /// <summary>
+ /// 鑾峰彇淇敼PIR浼犳劅鍣ㄩ厤缃殑鍛戒护瀛楃
+ /// </summary>
+ private string GetPIRSensorSettionPassData(IASZone.ConfigureParamates configureParamates)
{
string data = "";
string dataLength = "10";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
index db14cc1..640cb70 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFileLogic.cs
@@ -60,10 +60,6 @@
//LOG鍑哄姏銆愭枃浠跺す銆�
this.CreateDirectory(DirNameResourse.LogDirectory);
- //妯℃澘缂撳瓨瀛樻斁鐨勩�愭枃浠跺す銆�
- this.CreateDirectory(DirNameResourse.LocalTemplateDirectory);
- this.CreateDirectory(DirNameResourse.AllResidenceTemplateDirectory);
-
//鐢ㄦ埛鍥剧墖鐩綍璺緞銆愭枃浠跺す銆�
if (UserCenterResourse.AccountOption.UserPictruePath != string.Empty)
{
@@ -280,12 +276,6 @@
var rootPath = Common.Config.Instance.FullPath;
foreach (var file in listFile)
{
- if (file.StartsWith("ModelData_") == true)
- {
- //澶嶅埗妯℃澘鏁版嵁鏂囦欢鍒版寚瀹氭枃浠跺す
- TemplateData.TemplateCommonLogic.Current.CopyTemplateFileToLocalDirectory2(System.IO.Path.Combine(fulldirectory, file));
- continue;
- }
string oldFile = System.IO.Path.Combine(fulldirectory, file);
string newFile = System.IO.Path.Combine(rootPath, file);
//绉诲姩鏂囦欢
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
index 2bdb33a..285c6f6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlFirmwareUpdateLogic.cs
@@ -1,7 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
using System.Text;
-using ZigBee.Device;
namespace Shared.Phone.UserCenter
{
@@ -134,7 +133,7 @@
private static int GetFirmwareVersionAndSetToMemmory(FirmwareLevelType levelType, GetFirmwareVersionPra pra)
{
var listCheck = new List<string> { "NotCheck" };
- string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("FirmwareMana/DetectionPlatformUploadFirmware", false, pra, listCheck, false);
+ string resultValue = UserCenterLogic.GetResponseDataByRequestHttps("FirmwareMana/DetectionPlatformUploadFirmware", false, pra, listCheck);
if (string.IsNullOrEmpty(resultValue) == true)
{
return -1;
@@ -311,45 +310,6 @@
#endregion
- #region 鈻� 鑾峰彇鎸囧畾鍥轰欢鐗堟湰淇℃伅_______________
-
- /// <summary>
- /// 鑾峰彇鎸囧畾鍥轰欢鐨勭増鏈俊鎭�(濡傛灉杩斿洖Null,鍒欒〃绀烘病鏈夎繖涓浐浠�)
- /// </summary>
- /// <param name="levelType">鍥轰欢闃剁骇鍒嗙被</param>
- /// <param name="HardwareVersion">纭欢鐗堟湰</param>
- /// <param name="imgType">闀滃儚绫诲瀷</param>
- /// <param name="nowVersion">鐜板湪鐨勭増鏈�</param>
- /// <returns></returns>
- public static FirmwareVersionInfo GetFirmwareVersionInfo(FirmwareLevelType levelType, string HardwareVersion, string imgType, int nowVersion)
- {
- //闀滃儚绫诲瀷
- var listdata = GetFirmwareVersionListInfo(levelType, HardwareVersion, imgType);
- foreach (var verInfo in listdata)
- {
- if (verInfo.Name.EndsWith(".bin") == true)
- {
- //瀹冧笉鏄崌绾у浐浠�, .bin鏄壒娈婄殑
- continue;
- }
- int testVersion = Convert.ToInt32(verInfo.FirmwareVersion.ToString().PadLeft(6, '0').Substring(2, 2));
- if (testVersion % 2 != 0)
- {
- //涓棿閭ｄ釜byte涓哄鏁版椂锛屼唬琛ㄦ槸娴嬭瘯鐗堟湰,鍦ㄦ樉绀烘渶鏂扮増鏈椂,涓嶉渶瑕佹樉绀猴紝浣嗘槸鍦ㄥ巻鍙茬増鏈偅閲屽彲浠ユ樉绀�
- //涓棿閭ｄ釜byte涓哄伓鏁版椂,浠ｈ〃鏄寮忕増鏈�
- continue;
- }
-
- if (verInfo.FirmwareVersion == nowVersion)
- {
- return verInfo;
- }
- }
- return null; ;
- }
-
- #endregion
-
#region 鈻� 鍥轰欢瀛樺湪妫�娴媉______________________
/// <summary>
@@ -377,262 +337,6 @@
return false;
}
return true;
- }
-
- /// <summary>
- /// 妫�娴嬭Ota璁惧鐨勫崌绾у浐浠舵槸鍚﹀瓨鍦�
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- public static bool IsEsixtDeviceFirmwareFile(OTADevice device)
- {
- var fileFullName = GetDeviceFirmwareFile(device);
- return System.IO.File.Exists(fileFullName);
- }
-
- /// <summary>
- /// 鑾峰彇ota鎸囧畾鐨勫崌绾у浐浠跺悕瀛�(鍏ㄨ矾寰�)
- /// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- /// <returns></returns>
- public static string GetDeviceFirmwareFile(OTADevice device)
- {
- //纭欢鐗堟湰_闀滃儚ID_鍥轰欢鐗堟湰
- string fileName = device.HwVersion + "_" + device.ImgTypeId + "_" + device.ImgVersion;
- return System.IO.Path.Combine(DirNameResourse.FirmwareUpdateDirectory, "Device_" + fileName + ".ota");
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧Linux鐨勫崌绾у浐浠跺悕瀛�(鍏ㄨ矾寰�)
- /// </summary>
- /// <param name="zbGateway">缃戝叧瀵硅薄</param>
- /// <returns></returns>
- public static string GetGatewayLinuxFirmwareFile(ZbGateway zbGateway)
- {
- string fileName = zbGateway.LinuxHardVersion + "_" + zbGateway.LinuxImageType + "_" + zbGateway.LinuxFirmwareVersion;
- return System.IO.Path.Combine(DirNameResourse.FirmwareUpdateDirectory, "Linux_" + fileName + ".ota");
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧鍗忚皟鍣ㄧ殑鍗囩骇鍥轰欢鍚嶅瓧(鍏ㄨ矾寰�)
- /// </summary>
- /// <param name="zbGateway">缃戝叧瀵硅薄</param>
- /// <returns></returns>
- public static string GetGatewayCoordinatorFirmwareFile(ZbGateway zbGateway)
- {
- string fileName = zbGateway.CoordinatorHardVersion + "_" + zbGateway.CoordinatorImageId + "_" + zbGateway.CoordinatorFirmwareVersion;
- return System.IO.Path.Combine(DirNameResourse.FirmwareUpdateDirectory, "Coordinator_" + fileName + ".ota");
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧铏氭嫙椹卞姩鐨勫崌绾у浐浠跺悕瀛�(鍏ㄨ矾寰�)
- /// </summary>
- /// <param name="codeObj">铏氭嫙椹卞姩鏁版嵁</param>
- /// <returns></returns>
- public static string GetGatewayDriveCodeFirmwareFile(ZbGatewayData.DriveCodeObj codeObj)
- {
- string fileName = codeObj.DriveHwVersion + "_" + codeObj.DriveImageType + "_" + codeObj.DriveFwVersion;
- return System.IO.Path.Combine(DirNameResourse.FirmwareUpdateDirectory, "DriveCode_" + fileName + ".ota");
- }
-
- #endregion
-
- #region 鈻� 涓嬭浇妯℃澘鍥轰欢_______________________
-
- /// <summary>
- /// 涓嬭浇妯℃澘涓綉鍏冲拰璁惧鐨勫浐浠�
- /// </summary>
- /// <param name="fullFileName"></param>
- /// <param name="i_Msg"></param>
- public static int DownLoadTemplateDeviceFirmware(string fullFileName, string i_Msg)
- {
- //浠庢ā鏉垮綋涓幏鍙栬澶囧拰缃戝叧瀵硅薄
- var listTempDevice = new List<OTADevice>();
- var listTempGateway = new List<ZbGateway>();
- TemplateData.TemplateCommonLogic.Current.GetDeviceObjectFromTemplate(fullFileName, ref listTempDevice, ref listTempGateway);
-
- //鑾峰彇闇�瑕佷笅杞界殑鍥轰欢鏁版嵁
- var listVersion = GetNeedToDownLoadVersionData(listTempDevice, listTempGateway);
- if (listVersion.Count == 0)
- {
- return 0;
- }
- //鎵撳紑杩涘害鏉�
- ProgressFormBar.Current.Start();
- ProgressFormBar.Current.SetMsg(i_Msg);
- ProgressFormBar.Current.SetValue(0, 1);
-
- System.Threading.Thread.Sleep(1000);
-
- var dicFirmwareName = new Dictionary<string, string>();
- var fileData = HdlFileLogic.Current.ReadFileTextContent(DirNameResourse.FirmwareUpdateList);
- if (fileData != null)
- {
- //鏈湴瀛樻斁鐨勫浐浠跺師鏉ョ殑鍚嶅瓧(鍥犱负璁惧鍗囩骇鏃�,瀹冮渶瑕佽瘑鍒枃浠跺悕瀛楅噷闈㈠寘鍚殑鐗规畩瀛楃)
- //key:纭欢鐗堟湰_闀滃儚ID_鍥轰欢鐗堟湰 value:鍥轰欢鍘熸潵鐨勫悕瀛�
- dicFirmwareName = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<string, string>>(fileData);
- }
-
- //鍥轰欢瀛樺偍璺緞
- string firmwareDir = DirNameResourse.FirmwareUpdateDirectory;
- int nowCount = 0;
- foreach (var versionData in listVersion)
- {
- nowCount++;
- //鑾峰彇鍗囩骇鍥轰欢淇℃伅
- var result = AddFirmwareVersionInfo(versionData.levelType, versionData.HwVersion, versionData.ImageType);
- if (result == -1)
- {
- ProgressFormBar.Current.Close();
- return -1;
- }
- //鑾峰彇褰撳墠杩欎釜鐗堟湰鐨勫浐浠朵俊鎭�
- var versionFirmware = GetFirmwareVersionInfo(versionData.levelType, versionData.HwVersion, versionData.ImageType, versionData.FirmwareVersion);
- if (versionFirmware == null)
- {
- //浜戠娌℃湁杩欎釜鐗堟湰 杩涘害鍊�
- ProgressFormBar.Current.SetValue(nowCount, listVersion.Count);
- continue;
- }
- //鍘讳笅杞借繖涓浐浠�
- var pra = new { RequestVersion = Common.CommonPage.RequestVersion, DistributedMark = versionFirmware.DistributedMark };
- var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("FirmwareMana/DownloadPlatformUploadFirmware", false, pra, null, true);
- if (byteData == null)
- {
- ProgressFormBar.Current.Close();
- return -1;
- }
- //淇濆瓨鍥轰欢
- var saveFile = System.IO.Path.Combine(firmwareDir, versionData.FileDiv + versionData.HwVersion + "_" + versionData.ImageType + "_" + versionData.FirmwareVersion + ".ota");
- HdlFileLogic.Current.SaveTextToFile(saveFile, Encoding.UTF8.GetString(byteData));
- dicFirmwareName[saveFile] = versionFirmware.Name;
-
- //杩涘害鍊�
- ProgressFormBar.Current.SetValue(nowCount, listVersion.Count);
- }
- //淇濆瓨鍒楄〃鍚嶅瓧
- HdlFileLogic.Current.SaveFileContent(DirNameResourse.FirmwareUpdateList, dicFirmwareName);
- ProgressFormBar.Current.Close();
-
- return 1;
- }
-
- /// <summary>
- /// 鑾峰彇闇�瑕佷笅杞界殑鍥轰欢鏁版嵁
- /// </summary>
- /// <param name="listDevice">璁惧鍒楄〃</param>
- /// <param name="listGateway">缃戝叧鍒楄〃</param>
- /// <returns></returns>
- private static List<TemplateDeviceVersion> GetNeedToDownLoadVersionData(List<OTADevice> listDevice, List<ZbGateway> listGateway)
- {
- //瀛樺偍璺緞
- string firmwareDir = DirNameResourse.FirmwareUpdateDirectory;
- HdlFileLogic.Current.CreateDirectory(firmwareDir);
-
- var listVersion = new List<TemplateDeviceVersion>();
- var listCheck = new HashSet<string>();
- foreach (var device in listDevice)
- {
- //璁惧鐨勫崌绾у浐浠跺悕瀛�
- var fileFullName = GetDeviceFirmwareFile(device);
- if (System.IO.File.Exists(fileFullName) == false && listCheck.Contains(fileFullName) == false)
- {
- listCheck.Add(fileFullName);
- //璁惧
- listVersion.Add(new TemplateDeviceVersion
- {
- FileDiv = "Device_",
- levelType = FirmwareLevelType.ZigbeeDevice,
- HwVersion = device.HwVersion.ToString(),
- ImageType = device.ImgTypeId.ToString(),
- FirmwareVersion = device.ImgVersion
- });
- }
- }
- foreach (var gateway in listGateway)
- {
- //Linux鐨勫崌绾у浐浠跺悕瀛�
- var fileFullName = GetGatewayLinuxFirmwareFile(gateway);
- if (System.IO.File.Exists(fileFullName) == false && listCheck.Contains(fileFullName) == false)
- {
- listCheck.Add(fileFullName);
- //Linux
- listVersion.Add(new TemplateDeviceVersion
- {
- FileDiv = "Linux_",
- levelType = FirmwareLevelType.Linux,
- HwVersion = gateway.LinuxHardVersion.ToString(),
- ImageType = gateway.LinuxImageType.ToString(),
- FirmwareVersion = gateway.LinuxFirmwareVersion
- });
- }
- //鍗忚皟鍣ㄧ殑鍗囩骇鍥轰欢鍚嶅瓧
- fileFullName = GetGatewayCoordinatorFirmwareFile(gateway);
- if (System.IO.File.Exists(fileFullName) == false && listCheck.Contains(fileFullName) == false)
- {
- listCheck.Add(fileFullName);
- //鍗忚皟鍣�
- listVersion.Add(new TemplateDeviceVersion
- {
- FileDiv = "Coordinator_",
- levelType = FirmwareLevelType.Coordinator,
- HwVersion = gateway.CoordinatorHardVersion.ToString(),
- ImageType = gateway.CoordinatorImageId.ToString(),
- FirmwareVersion = gateway.CoordinatorFirmwareVersion
- });
- }
- //杩欎釜缃戝叧闇�瑕佹湁铏氭嫙椹卞姩杩欎釜涓滆タ鎵嶈
- if (gateway.LinuxImageType != 6)
- {
- //铏氭嫙椹卞姩鍙�
- foreach (var data in gateway.DriveCodeList)
- {
- //铏氭嫙椹卞姩鍙风殑鍗囩骇鍥轰欢鍚嶅瓧
- fileFullName = GetGatewayDriveCodeFirmwareFile(data);
- if (System.IO.File.Exists(fileFullName) == false && listCheck.Contains(fileFullName) == false)
- {
- listCheck.Add(fileFullName);
- //铏氭嫙椹卞姩鍙�
- listVersion.Add(new TemplateDeviceVersion
- {
- FileDiv = "DriveCode_",
- levelType = FirmwareLevelType.VirtualDevice,
- HwVersion = data.DriveHwVersion.ToString(),
- ImageType = data.DriveImageType.ToString(),
- FirmwareVersion = data.DriveFwVersion
- });
- }
- }
- }
- }
- return listVersion;
- }
-
- /// <summary>
- /// 妯℃澘璁惧鐨勭増鏈俊鎭�
- /// </summary>
- private class TemplateDeviceVersion
- {
- /// <summary>
- /// 鏂囦欢鍖哄垎
- /// </summary>
- public string FileDiv = string.Empty;
- /// <summary>
- /// 鍥轰欢闃剁骇鍖哄垎
- /// </summary>
- public FirmwareLevelType levelType;
- /// <summary>
- /// 纭欢鐗堟湰
- /// </summary>
- public string HwVersion = string.Empty;
- /// <summary>
- /// 闀滃儚ID
- /// </summary>
- public string ImageType = string.Empty;
- /// <summary>
- /// 鍥轰欢鐗堟湰
- /// </summary>
- public int FirmwareVersion = 0;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
index 605bbc4..fc831b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayLogic.cs
@@ -196,7 +196,7 @@
/// </summary>
/// <param name="zbGateway">缃戝叧</param>
/// <param name="mode">鏄惁鏄剧ず閿欒</param>
- public bool AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
+ public async Task<bool> AddNewGateway(ZbGateway zbGateway, ShowErrorMode mode)
{
//璁剧疆缃戝叧鐨勭粡绾害
bool falge = this.SetGatewaySite(zbGateway, Common.Config.Instance.Home.Longitude, Common.Config.Instance.Home.Latitude, ShowErrorMode.NO);
@@ -205,7 +205,7 @@
return falge;
}
//鎵ц娣诲姞缃戝叧鍒板唴瀛�
- var result = this.DoAddGatewayToMemory(zbGateway, mode);
+ var result = await this.DoAddGatewayToMemory(zbGateway, mode);
//鍓嶇殑缃戝叧缁戝畾鍦ㄤ簡褰撳墠璐﹀彿涓嬬殑涓嶅悓浣忓畢閲岄潰
if (result == 0)
{
@@ -250,7 +250,7 @@
/// <param name="zbGateway">缃戝叧瀵硅薄</param>
/// <param name="mode">鏄惁鏄剧ず閿欒</param>
/// <returns></returns>
- private int DoAddGatewayToMemory(ZbGateway zbGateway, ShowErrorMode mode)
+ private async Task<int> DoAddGatewayToMemory(ZbGateway zbGateway, ShowErrorMode mode)
{
if (zbGateway == null)
{
@@ -278,7 +278,7 @@
//璁剧疆浣忓畢ID鍒扮綉鍏�
if (result.HomeId != Common.Config.Instance.HomeId)
{
- bool flage2 = this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, mode);
+ bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, mode);
if (flage2 == false)
{
if (mode == ShowErrorMode.YES)
@@ -337,28 +337,10 @@
/// <param name="zbGateway"></param>
/// <param name="HomeId"></param>
/// <returns></returns>
- public bool SetHomeIdToGateway(ZbGateway zbGateway, string HomeId, ShowErrorMode mode)
+ public async Task<bool> SetHomeIdToGateway(ZbGateway zbGateway, string HomeId, ShowErrorMode mode)
{
- //璐﹀彿ID
- string accountId = string.Empty;
- if (HomeId != string.Empty)
- {
- if (UserCenterResourse.UserInfo.AuthorityNo == 1)
- {
- //涓昏处鍙�
- accountId = Config.Instance.Guid;
- }
- else
- {
- accountId = Config.Instance.Home.MainUserDistributedMark;
- }
- }
- var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 82 } };
- var data = new Newtonsoft.Json.Linq.JObject { { "HomeId", HomeId }, { "AccountId", accountId } };
- jObject.Add("Data", data);
- //浣忓畢ID鐨勮缃�,鍥哄畾浣跨敤灞�鍩熺綉,涓嶅瓨鍦ㄨ繙绋嬬殑璇存硶
- var result = this.SendJobjectDataToGateway(zbGateway, "GwSetHomeId", jObject.ToString(), "GwSetHomeId_Respon", 5, true);
- if (result.ErrorMsgDiv == -1)
+ ZbGateway realWay = null;
+ if (this.GetRealGateway(ref realWay, zbGateway) == false)
{
if (mode == ShowErrorMode.YES)
{
@@ -368,11 +350,13 @@
}
return false;
}
- if (result.ErrorMsgDiv == 0)
+
+ var info = await realWay.GwSetHomeIdAsync(HomeId);
+ if (info != null && info.gwSetHomeIdData != null)
{
- return false;
+ return true;
}
- return true;
+ return false;
}
/// <summary>
@@ -388,7 +372,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
bindGateway.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" }, false);
+ var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
if (result == "Error")
{
return -1;
@@ -434,7 +418,7 @@
/// </summary>
/// <param name="zbGateway">缃戝叧</param>
/// <param name="btnMsg">娑堟伅鎺т欢</param>
- public int ReBindNewGateway(ZbGateway zbGateway, NormalViewControl btnMsg = null)
+ public async Task<int> ReBindNewGateway(ZbGateway zbGateway, NormalViewControl btnMsg = null)
{
if (zbGateway == null)
{
@@ -451,7 +435,7 @@
}
//璁剧疆浣忓畢ID鍒扮綉鍏�
- bool flage2 = this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, ShowErrorMode.YES);
+ bool flage2 = await this.SetHomeIdToGateway(zbGateway, Common.Config.Instance.HomeId, ShowErrorMode.YES);
if (flage2 == false)
{
//鍚戠綉鍏宠缃綇瀹匢D澶辫触
@@ -486,7 +470,7 @@
btnMsg.TextID = R.MyInternationalizationString.uGatewayDataIsChangingPleaseWhait;
});
}
- System.Threading.Thread.Sleep(8000);
+ await Task.Delay(8000);
//鑾峰彇缃戝叧鐨勪俊鎭�
ZbGatewayData.GetGwData result = null;
@@ -500,7 +484,7 @@
}
count--;
//鏈�澶氬啀绛�20绉�
- System.Threading.Thread.Sleep(4000);
+ await Task.Delay(4000);
}
if (result == null)
{
@@ -595,10 +579,12 @@
/// 鎵ц鍒囨崲缃戝叧鎿嶄綔
/// </summary>
/// <param name="gatewayId"></param>
- public bool DoSwitchGateway(string gatewayId)
+ public async Task<bool> DoSwitchGateway(string gatewayId)
{
+ var zbGateway = this.GetLocalGateway(gatewayId);
+
//閲嶆柊鑾峰彇鍦ㄧ嚎缃戝叧鐨勪俊鎭�
- var result = this.GetOnlineGatewayInfo(gatewayId);
+ var result = await this.GetOnlineGatewayInfo(gatewayId);
if (result == false)
{
return false;
@@ -617,7 +603,7 @@
/// </summary>
/// <param name="gatewayId"></param>
/// <returns></returns>
- private bool GetOnlineGatewayInfo(string gatewayId)
+ private async Task<bool> GetOnlineGatewayInfo(string gatewayId)
{
//鏄剧ず杩涘害鏉�
ProgressBar.Show();
@@ -630,7 +616,7 @@
//閲嶆柊璁剧疆浣忓畢ID(杩欎釜搴旇鏄笉缁忚繃APP,鐩存帴鎶婄綉鍏虫仮澶嶄簡鍑哄巶璁剧疆)
if (this.HomeIdIsEmpty(realWay.HomeId) == true)
{
- int result2 = this.ReBindNewGateway(realWay);
+ int result2 = await this.ReBindNewGateway(realWay);
if (result2 == 0)
{
//鍑虹幇鏈煡閿欒,璇风◢鍚庡啀璇�
@@ -659,11 +645,6 @@
ProgressBar.Close();
return false;
}
- }
- //鍒锋柊鍏ㄩ儴鍦烘櫙
- if (this.IsMainGateway(realWay) == 1)
- {
- HdlSceneLogic.Current.RefreshSceneUIList(false);
}
//鑾峰彇鍏ㄩ儴璁惧
@@ -694,15 +675,25 @@
/// <summary>
/// 鍒犻櫎缃戝叧锛屽寘鎷簯绔拰鏈湴(澶辫触鏃朵笉浼氭樉绀轰俊鎭紝骞朵笖浼氳繑鍥瀟rue)
/// </summary>
+ /// <param name="zbGateway"></param>
+ public async Task<bool> DeleteGateway(ZbGateway zbGateway)
+ {
+ //绉婚櫎鏈湴缃戝叧淇℃伅
+ return await this.DeleteGateway(zbGateway.GwId);
+ }
+
+ /// <summary>
+ /// 鍒犻櫎缃戝叧锛屽寘鎷簯绔拰鏈湴(澶辫触鏃朵笉浼氭樉绀轰俊鎭紝骞朵笖浼氳繑鍥瀟rue)
+ /// </summary>
/// <param name="zbGatewayID"></param>
- public bool DeleteGateway(string zbGatewayID)
+ public async Task<bool> DeleteGateway(string zbGatewayID)
{
ZbGateway realWay = null;
this.GetRealGateway(ref realWay, zbGatewayID);
//娓呯┖缃戝叧鐨勪綇瀹匢D 缃戝叧瑙ｇ粦澶辫触 涓嶇悊瀹�,鍥犱负缃戝叧鍙互鎸夋寜閿己鍒舵悳绱㈠緱鍒�
if (realWay != null)
{
- this.SetHomeIdToGateway(realWay, string.Empty, ShowErrorMode.NO);
+ await this.SetHomeIdToGateway(realWay, string.Empty, ShowErrorMode.NO);
}
//鍒犻櫎浜戠鐨勭綉鍏�
@@ -1496,39 +1487,24 @@
#endregion
- #region 鈻� 娓呯┖鐪熷疄缃戝叧閾炬帴___________________
+ #region 鈻� 娓呯┖鐪熷疄缃戝叧鍒楄〃___________________
/// <summary>
- /// 娓呯┖鍏ㄩ儴鐨勭湡瀹炵墿鐞嗙綉鍏崇殑閾炬帴
+ /// 娓呯┖鍏ㄩ儴鐨勭湡瀹炵墿鐞嗙綉鍏冲璞�
/// </summary>
- /// <param name="roadGateway">鏄惁鍔犺浇鏈湴鐨勭綉鍏冲璞″埌鐪熷疄鍒楄〃涓�</param>
- public void ClearAllRealGatewayConection(bool roadGateway)
+ public void ClearAllRealGateway()
{
- //鏂紑mqtt杩炴帴(鍗充娇淇濆瓨鍦ㄥ唴瀛樺綋涓篃娌￠棶棰�,鍥犱负濡傛灉骞挎挱涓嶅埌,鍒欏畠涓嶄細寤虹珛閾炬帴)
- for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
+ //鍥犱负閭ｄ竴鐬棿锛屾湁鍙兘mqtt浼氬姞鍥炴潵,鎵�浠ュ厛鍔犵紦瀛�
+ var list = new List<ZbGateway>();
+ list.AddRange(ZbGateway.GateWayList);
+ //鐒跺悗娓呯┖鎺�
+ ZbGateway.GateWayList.Clear();
+ //鏈�鍚庡啀鏂紑mqtt杩炴帴
+ for (int i = 0; i < list.Count; i++)
{
- ZbGateway.GateWayList[i].DisConnectLocalMqttClient("G");
+ list[i].DisConnectLocalMqttClient("G");
}
- //鍔犺浇鏈湴缃戝叧瀵硅薄
- if (roadGateway == true)
- {
- List<string> listFile = this.GetAllGatewayFile();
- //鍙嶅簭鍒楀寲娣诲姞鍒扮紦瀛�
- foreach (string file in listFile)
- {
- //浠庢枃浠朵腑鍙嶅簭鍒楀寲鍑虹綉鍏冲璞�
- var gateway = this.GetGatewayFromFile(file);
- if (gateway == null)
- {
- continue;
- }
- var tempWay = ZbGateway.GateWayList.Find(obj => (obj != null) && (obj.GwId == gateway.GwId));
- if (tempWay == null)
- {
- ZbGateway.GateWayList.Add(tempWay);
- }
- }
- }
+ list.Clear();
}
#endregion
@@ -1543,11 +1519,6 @@
/// <returns></returns>
public List<FirmwareVersionInfo> GetGatewayAllNewVersion(ZbGateway zbGateway, ShowErrorMode mode = ShowErrorMode.YES)
{
- //濡傛灉鏄睍绀烘ā鏉�,鎴栬�呮槸铏氭嫙浣忓畢鐨勮瘽,娌℃湁浠�涔堟柊鐗堟湰鐨勮娉�
- if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
- {
- return new List<FirmwareVersionInfo> { null, null, null };
- }
//鑾峰彇缃戝叧鐗堟湰淇℃伅
var result = this.GetGatewayInfo(zbGateway, false, mode);
if (result == null)
@@ -1633,13 +1604,6 @@
/// <returns></returns>
public List<ZbGatewayData.DriveCodeObj> GetListVDDriveCode(ZbGateway zbGateway)
{
- //濡傛灉鏄睍绀烘ā鏉�,鎴栬�呮槸铏氭嫙浣忓畢鐨勮瘽,鐩存帴鍙栫紦瀛�
- if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
- {
- //鍙栨湰鍦板璞�
- var localgw = this.GetLocalGateway(zbGateway.GwId);
- return localgw != null ? zbGateway.DriveCodeList : zbGateway.DriveCodeList;
- }
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 505 } };
var result = this.SendJobjectDataToGateway(zbGateway, "VirtualDrive/CatDriveCode", jObject.ToString(), "VirtualDrive/CatDriveCode_Respon");
if (result.ErrorMsg != null)
@@ -1675,16 +1639,12 @@
/// <returns></returns>
public int IsMainGateway(string waiID)
{
- var realWay = ZbGateway.GateWayList.Find((obj) =>
- {
- return obj.GwId == waiID;
- });
- //铏氭嫙缃戝叧涔熻繑鍥� 0
- if (realWay == null || realWay.IsVirtual == true)
+ ZbGateway zbGateway = null;
+ if (this.GetRealGateway(ref zbGateway, waiID) == false)
{
return 0;
}
- return realWay.IsMainGateWay == true ? 1 : 2;
+ return zbGateway.IsMainGateWay == true ? 1 : 2;
}
#endregion
@@ -1851,7 +1811,7 @@
//鑾峰彇鎺у埗涓讳汉璐﹀彿鐨凾oken
pra.ReqDto.LoginAccessToken = UserCenterLogic.GetConnectMainToken();
- var result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list, false);
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("App/GetSingleHomeGatewayPagger", true, pra, list);
if (string.IsNullOrEmpty(result) == true)
{
canBreak = true;
@@ -1907,11 +1867,6 @@
this.ShowTipMsg(msg);
}
return false;
- }
- if (((decimal)Longitude) == 0 && ((decimal)Latitude) == 0)
- {
- //娌℃湁閰嶇疆杩囩粡绾害
- return true;
}
int result = -1;
@@ -1988,7 +1943,7 @@
List<string> listNotShowError = new List<string>() { "NoExist", "NoBind", "NoRecord", "NotCheck" };
- bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError, false);
+ bool result = UserCenterLogic.GetResultStatuByRequestHttps("App/ReleaseGatewayToHome", true, Pra, listNotShowError);
if (result == false)
{
return false;
@@ -2041,7 +1996,7 @@
{
bindGateway.BindGateways.Clear();
bindGateway.BindGateways.Add(gwId);
- var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" }, false);
+ var result = UserCenterLogic.GetResultCodeByRequestHttps("App/BindGatewayToHome", true, bindGateway, new List<string> { "NotCheck" });
if (result == "Success")
{
this.listBackupGwId.Remove(gwId);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
index ea1c159..dcd3593 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayReceiveLogic.cs
@@ -277,25 +277,6 @@
#endregion
- #region 鈻� 铚傞福鍣ㄦ帹閫�
- //铚傞福鍣ㄦ暟鎹�
- else if (report.DeviceStatusReport.CluterID == 1282)
- {
- //mini澶滅伅
- if (Common.LocalDevice.Current.IsMiniLight(locadevice) == true)
- {
- foreach (var attData in report.DeviceStatusReport.AttriBute)
- {
- if (attData.AttributeId == 0)
- {
- //杩欎釜鏄姤璀︽寔缁椂闂�(澶т簬2绉掓椂,鏍囪涓鸿繕鍦ㄥ搷鐫�)
- ((ColorTemperatureLight)locadevice).IsBuzzerRing = attData.AttriButeData > 2 ? true : false;
- }
- }
- }
- }
- #endregion
-
#region 鈻� 绐楀笜鏁版嵁
//绐楀笜鏁版嵁
else if (report.DeviceStatusReport.CluterID == 258)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index c92cefd..6187c50 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -206,11 +206,9 @@
/// <summary>
/// 鑾峰彇浜戠浣忓畢鍒楄〃
/// </summary>
- /// <param name="checkNetwork">鏄惁妫�娴嬬綉缁�,濡傛灉璁剧疆妫�娴嬬殑璇�,褰撲笉鑳借仈缃戞椂,鐩存帴杩斿洖鏈湴浣忓畢</param>
- /// <returns></returns>
- public List<string> GetHomeListsFromDb(bool checkNetwork)
+ public List<string> GetHomeListsFromDb()
{
- if (checkNetwork == true && HdlWifiLogic.Current.CanAccessHttp == false)
+ if (HdlWifiLogic.Current.CanAccessHttp == false)
{
//褰撳墠鏃犳硶鑱旂綉
return Config.Instance.HomeFilePathList;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
index c3269e3..38c531b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlRoomLogic.cs
@@ -298,6 +298,7 @@
Common.LocalDevice.Current.DeleteRealDeviceByRoomId(roomId);
if (refreshLeftView == true)
{
+ //HdlAutoBackupLogic.DeleteFile(roomFilePath);
//鍒锋柊鎴块棿瑙嗗浘鍒楄〃
this.RefreshRoomListView();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 05702e2..32f3a09 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -231,9 +231,6 @@
zoneInfo.ZoneId = allData.ZoneId;
zoneInfo.ZoneName = allData.ZoneName;
- //淇℃伅鎺ㄩ��
- zoneInfo.InformationPush = allData.IsDisablePushMessage;
-
//澶勭悊璁惧
foreach (var data2 in allData.DeviceList)
{
@@ -288,6 +285,9 @@
zoneInfo.dicAlarmDevice.Clear();
zoneInfo.dicScenes.Clear();
+
+ //淇℃伅鎺ㄩ��
+ zoneInfo.InformationPush = resData.IsDisablePushMessage;
foreach (var data in resData.Actions)
{
@@ -1708,6 +1708,11 @@
{
return false;
}
+
+ if (zoneId > 3)
+ {
+ zoneId = 3;
+ }
//鐘舵�佸彉鏇�
var result = await Safeguard.DisablePushMessageAsync(zoneId, statu);
if (result == null || result.disablePushMessageResponseData == null || result.disablePushMessageResponseData.Result == 1)
@@ -1737,6 +1742,10 @@
/// <returns>0:鎺ㄩ�� 1:涓嶆帹閫�</returns>
public int GetGarrisonInformationPushStatu(int zoneId)
{
+ if (zoneId > 3)
+ {
+ zoneId = 3;
+ }
if (this.dicAllZoneInfo.ContainsKey(zoneId) == false)
{
return 1;
@@ -2331,7 +2340,7 @@
/// </summary>
public string ZoneName;
/// <summary>
- /// 淇℃伅鎺ㄩ�� 0:鎺ㄩ�� 1:涓嶆帹閫�
+ /// 淇℃伅鎺ㄩ�� 0:鎺ㄩ�� 1:涓嶆帹閫� (鍙湁闃插尯ID:1,2,3鎵嶄細鏈夈��4,5鐨勯兘褰掍负3,鍥犱负瀹冩槸浠ラ槻鍖烘ā寮廔D(ActionType)涓哄崟浣嶇殑)
/// </summary>
public int InformationPush = 1;
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index 3b90c1d..d087a84 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -178,11 +178,7 @@
if (topic == gatewayID + "/" + "Scene/GetAllInfo_Respon")
{
var sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene.GetSceneAllInfo>(jobject["Data"].ToString());
- if (sceneGetAllInfo.ScenesSum != 0)
- {
- //濡傛灉缃戝叧閲岄潰娌℃湁鍦烘櫙鐨勮瘽,瀹冧篃浼氭帹杩欎釜涓滆タ杩囨潵
- listScene.Add(sceneGetAllInfo);
- }
+ listScene.Add(sceneGetAllInfo);
//鏇村鎺ユ敹寰楀埌鍦烘櫙
canReceve = true;
@@ -363,15 +359,12 @@
/// <summary>
/// 鑾峰彇娣诲姞鎵ц鐩爣鍒板満鏅殑鍛戒护
/// </summary>
- /// <param name="sceneId">鍦烘櫙id</param>
- /// <param name="listAdjustTarget">鎵ц鐩爣</param>
- /// <param name="dicChangedMac">浜ゆ崲mac key:listAdjustTarget褰撳墠鐨凪ac value:杞崲鐨刴ac</param>
- /// <param name="sceneName">鍦烘櫙鍚嶇О(鐗规畩鐢ㄩ��,璇峰嬁璁剧疆)</param>
+ /// <param name="sceneId"></param>
+ /// <param name="listAdjustTarget"></param>
/// <returns></returns>
- public List<string> GetAddTargetToSceneCommand(int sceneId, List<Scene.DeviceListData> listAdjustTarget, Dictionary<string, string> dicChangedMac = null, string sceneName = null)
+ public List<string> GetAddTargetToSceneCommand(int sceneId, List<Scene.DeviceListData> listAdjustTarget)
{
var listCommand = new List<string>();
- int index = 1;
for (int i = 0; i < listAdjustTarget.Count; i++)
{
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 820 } };
@@ -379,17 +372,6 @@
//璁惧
if (data.Type == 0)
{
- string deviceAddr = data.DeviceAddr;
- if (dicChangedMac != null)
- {
- //濡傛灉涓嶅寘鍚�,鍒欎笉浣滀负澶勭悊瀵硅薄
- if (dicChangedMac.ContainsKey(deviceAddr) == false)
- {
- continue;
- }
- deviceAddr = dicChangedMac[deviceAddr];
- }
-
var taskList = new Newtonsoft.Json.Linq.JArray { };
foreach (var taskInfo in data.TaskList)
{
@@ -397,38 +379,25 @@
{ "Data1", taskInfo.Data1},{ "Data2",taskInfo.Data2}};
taskList.Add(tInfo);
}
- var data2 = new Newtonsoft.Json.Linq.JObject {{ "ScenesId",sceneId},{ "Type", 0} ,{ "DeviceAddr",deviceAddr} ,
- { "Epoint", data.Epoint} ,{ "TaskList", taskList },{ "DelayTime", 0} ,{ "MemberNumber",index}};
- if (sceneName != null)
- {
- data2.Add(new Newtonsoft.Json.Linq.JProperty("ScenesName", sceneName));
- }
+ var data2 = new Newtonsoft.Json.Linq.JObject {{ "ScenesId",sceneId},{ "Type", 0} ,{ "DeviceAddr",data.DeviceAddr} ,
+ { "Epoint", data.Epoint} ,{ "TaskList", taskList },{ "DelayTime", 0} ,{ "MemberNumber",i + 1}};
jObject.Add("Data", data2);
}
//鍦烘櫙
else if (data.Type == 1)
{
var data2 = new Newtonsoft.Json.Linq.JObject {{ "ScenesId",sceneId},{ "Type", 1} ,
- { "ElseScenesId", data.ElseScenesId },{ "DelayTime", 0} ,{ "MemberNumber",index} };
- if (sceneName != null)
- {
- data2.Add(new Newtonsoft.Json.Linq.JProperty("ScenesName", sceneName));
- }
+ { "ElseScenesId", data.ElseScenesId },{ "DelayTime", 0} ,{ "MemberNumber",i + 1} };
jObject.Add("Data", data2);
}
//寤舵椂
else
{
var data2 = new Newtonsoft.Json.Linq.JObject {{ "Type", 2} ,{ "ScenesId",sceneId},
- { "DelayTime", data.DelayTime} ,{ "MemberNumber",index}};
- if (sceneName != null)
- {
- data2.Add(new Newtonsoft.Json.Linq.JProperty("ScenesName", sceneName));
- }
+ { "DelayTime", data.DelayTime} ,{ "MemberNumber",i + 1}};
jObject.Add("Data", data2);
}
listCommand.Add(jObject.ToString());
- index++;
}
return listCommand;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
index 1f3fe59..37fe00a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlWifiLogic.cs
@@ -411,14 +411,11 @@
}
//閲嶆柊鍒濆鍖朣ocket
ZigBee.Common.Application.FindGateWaySocket.Stop();
- System.Threading.Thread.Sleep(100);
-
//鏂帀鏈湴杩炴帴
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
//鏂帀杩滅▼
ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
- //濡傛灉鏄痺ifi
if (value == 2)
{
ZigBee.Common.Application.FindGateWaySocket.Start();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 33a1934..b841920 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -22,19 +22,24 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
- public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
+ public static bool GetResultStatuByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return false;
+ }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
var byteData = GettByteResponsePack(RequestName, connectMode, obj);
- if (byteData == null)
+ if (byteData == null && setAgain == true)
{
if (setAgain == false)
{
- //褰撳墠鏃犳硶璁块棶缃戠粶
- ShowNotNetMsg(RequestName, listNotShowError);
+ //涓嶆寚瀹氶噸鍙�
return false;
}
byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -56,10 +61,17 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
/// </param>
- public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
+ public static string GetResultCodeByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return "Error";
+ }
+
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -68,8 +80,7 @@
{
if (setAgain == false)
{
- //褰撳墠鏃犳硶璁块棶缃戠粶
- ShowNotNetMsg(RequestName, listNotShowError);
+ //涓嶆寚瀹氶噸鍙�
return "Error";
}
byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -94,10 +105,16 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
/// </param>
- public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
+ public static string GetResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return null;
+ }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -106,8 +123,7 @@
{
if (setAgain == false)
{
- //褰撳墠鏃犳硶璁块棶缃戠粶
- ShowNotNetMsg(RequestName, listNotShowError);
+ //涓嶆寚瀹氶噸鍙�
return null;
}
byteData = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -138,9 +154,15 @@
/// <param name="checkAuthority">鏄惁妫�娴嬫潈闄愶紝璇ュ弬鏁颁笉鑳界渷鐣�</param>
/// <param name="obj">涓�涓被</param>
/// <param name="listNotShowError">涓嶉渶瑕佹樉绀洪敊璇殑閿欒绫诲埆(鎺ュ彛杩斿洖鐨勯敊璇被鍒�),濡傛灉鍖呭惈锛屽垯浼氳繑鍥炪�恡rue銆�</param>
- /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿閲嶅彂</param>
- public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = true)
+ /// <param name="setAgain">褰撳彂閫佸け璐ユ椂,鏄惁閲嶅彂,榛樿涓嶉噸鍙�</param>
+ public static byte[] GetByteResponseDataByRequestHttps(string RequestName, bool checkAuthority, object obj, List<string> listNotShowError = null, bool setAgain = false)
{
+ if (HdlWifiLogic.Current.CanAccessHttp == false && setAgain == false)
+ {
+ //褰撳墠鏃犳硶璁块棶缃戠粶(褰撻渶瑕侀噸鏂板彂閫佹椂,璺宠繃杩欎釜鍒ゆ柇)
+ ShowNotNetMsg(listNotShowError);
+ return null;
+ }
//鑾峰彇鎺ュ彛鐨勮繛鎺ユā寮�
var connectMode = GetHttpConnectMode(checkAuthority);
//鑾峰彇浠庢帴鍙ｉ偅閲屽彇鍒扮殑姣旂壒鏁版嵁
@@ -150,8 +172,7 @@
{
if (setAgain == false)
{
- //褰撳墠鏃犳硶璁块棶缃戠粶
- ShowNotNetMsg(RequestName, listNotShowError);
+ //涓嶆寚瀹氶噸鍙�
return null;
}
revertObj = ResetByteRequestHttps(RequestName, checkAuthority, obj);
@@ -206,7 +227,7 @@
if (count == 3)
{
//鏄剧ず娌℃湁缃戠粶鐨凪sg
- ShowNotNetMsg(RequestName, null);
+ ShowNotNetMsg(null);
break;
}
}
@@ -328,15 +349,13 @@
/// <summary>
/// 鏄剧ず娌℃湁缃戠粶鐨凪sg
/// </summary>
- private static void ShowNotNetMsg(string RequestName, List<string> listNotShowError)
+ private static void ShowNotNetMsg(List<string> listNotShowError)
{
if (listNotShowError != null && listNotShowError.Contains("NotCheck") == true)
{
//涓嶆娴�
return;
}
- //HdlLogLogic.Current.WriteLog(-1, "褰撳墠鏃犵綉缁滆繛鎺�:" + RequestName);
-
HdlThreadLogic.Current.RunMain(() =>
{
// 褰撳墠鏃犵綉缁滆繛鎺�,璇风‘璁ょ綉缁�
@@ -500,18 +519,13 @@
#endregion
#region 鈻� 鍒锋柊鏈湴缂撳瓨_______________________
-
/// <summary>
- /// 鍒锋柊鏈湴鎵�鏈夌紦瀛�(鐩墠姝ゆ柟娉曞彧鎻愪緵缁欐仮澶嶅浠芥暟鎹娇鐢�)
+ /// 鍒锋柊鏈湴鎵�鏈夌紦瀛�
/// </summary>
public static void RefreshAllMemory()
{
//鍒锋柊浣忓畢瀵硅薄
RefreshHomeObject();
- //鏍规嵁妯℃澘鏂囦欢,鎭㈠鏁版嵁
- TemplateData.TemplateCommonLogic.Current.RecoverDataByTemplateBinFile();
- //寮哄埗鐢熸垚璁惧鍜岀綉鍏虫枃浠�
- TemplateData.TemplateCommonLogic.Current.CreatDeviceAndGatewayFileFromMemoryByForce();
//鍒锋柊鏈湴缃戝叧鏂囦欢
HdlGatewayLogic.Current.ReFreshByLocal();
//鍒锋柊鏈湴璁惧
@@ -523,7 +537,7 @@
//鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
HdlThreadLogic.Current.RunThread(async () =>
{
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
}, ShowErrorMode.NO);
}
@@ -604,7 +618,7 @@
//娓呯┖褰撳墠浣忓畢id
Config.Instance.HomeId = string.Empty;
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(false);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
//鏂紑杩滅▼Mqtt杩炴帴
HdlThreadLogic.Current.RunThread(async () =>
@@ -660,8 +674,8 @@
}
else if (view is UserView.UserPage)
{
- //鍒锋柊涓婚〉
- UserView.UserPage.Instance.ReFreshControl();
+ var form = ((UserView.UserPage)view).GetNowActionForm();
+ form?.FormActionAgainEvent();
return;
}
else
@@ -847,15 +861,12 @@
//鏂紑杩滅▼Mqtt杩炴帴,閲嶆柊杩炴帴
HdlThreadLogic.Current.RunThread(async () =>
{
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
await ZigBee.Device.ZbGateway.DisConnectRemoteMqttClient();
}, ShowErrorMode.NO);
//鍒锋柊APP鍓嶄竴娆￠�夋嫨鐨勭綉鍏矷D(鍙互鍙嶅璋冪敤,闇�瑕佸湪缃戝叧鍒濆鍖栧畬浜嗕箣鍚庢墠鑳借皟鐢�)
HdlGatewayLogic.Current.RefreshAppOldSelectGatewayId();
-
- //鍔犺浇妯℃澘缂撳瓨
- //TemplateData.TemplateCommonLogic.Current.LoadLocalTemplateMemoryData();
//0:宸茬粡鍚屾杩囷紝涓嶉渶瑕佸悓姝�,杩欎釜鏃跺�欓渶瑕佹彁绀哄浠�
if (result == 0 && ShowPrompted == true)
@@ -922,8 +933,6 @@
HdlRoomLogic.Current.RefreshAllRoomByLocation();
//鍒锋柊宸﹁竟鍒锋柊鎴块棿瑙嗗浘鍒楄〃
HdlRoomLogic.Current.RefreshRoomListView();
- //鍔犺浇妯℃澘缂撳瓨
- //TemplateData.TemplateCommonLogic.Current.LoadLocalTemplateMemoryData();
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
index 7c15ae9..4771a28 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/DirectoryFileNameResourse.cs
@@ -151,48 +151,6 @@
get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, "020945dd7966a7550090d3c04a04d93cd2278eb4e6aebcf6"); }
}
/// <summary>
- /// 鏈湴妯℃澘缂撳瓨瀛樻斁鐨勩�愭枃浠跺す銆�
- /// </summary>
- public static string LocalTemplateDirectory
- {
- get { return System.IO.Path.Combine(LocalMemoryDirectory, "1180648b252f370b18565d54115f2bece19fcc9985dd1f70"); }
- }
- /// <summary>
- /// 鎵�鏈変綇瀹呯殑妯℃澘缂撳瓨瀛樻斁鐨勩�愭枃浠跺す銆�
- /// </summary>
- public static string AllResidenceTemplateDirectory
- {
- get { return System.IO.Path.Combine(IO.FileUtils.RootPath, Common.Config.Instance.Guid, "f8e712a42227d8f6a8208b076c7e132fe9869f7f0aff3d37"); }
- }
- /// <summary>
- /// 淇濆瓨璁惧閫夋嫨鐨勬ā鏉跨殑銆愭枃浠躲��
- /// </summary>
- public static string DeviceTemplateSelectFile
- {
- get { return System.IO.Path.Combine(LocalMemoryDirectory, "76d54eaedfd2124c4629cf8c4b8ae60f423c10556dfe50cb9de193a83c5653ef"); }
- }
- /// <summary>
- /// 淇濆瓨缃戝叧閫夋嫨鐨勬ā鏉跨殑銆愭枃浠躲��
- /// </summary>
- public static string GatewayTemplateSelectFile
- {
- get { return System.IO.Path.Combine(LocalMemoryDirectory, "fdac0d1dd857d946a524feb8ae4e69ecb048333261cb41f5fcc9932b35b09c2f"); }
- }
- /// <summary>
- /// 涓存椂淇濆瓨褰撳墠鏈湴鍏ㄩ儴鏂囦欢鐨勩�愭枃浠跺す銆�
- /// </summary>
- public static string TemporaryBackupLocalFileDirectory
- {
- get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, "eaa527389defe69899beb6df9a83228b281b4e57a63a654de1ad6d01ab956907"); }
- }
- /// <summary>
- /// 涓存椂淇濆瓨鏈湴褰撳墠鍏ㄩ儴妯℃澘鏂囦欢鐨勩�愭枃浠跺す銆�
- /// </summary>
- public static string TemporaryBackupTemplateFileDirectory
- {
- get { return System.IO.Path.Combine(TemporaryBackupLocalFileDirectory, "f8e712a42227d8f6df0aa223fe0a1eda"); }
- }
- /// <summary>
/// 淇濆瓨鎰忚鍙嶉娆℃暟鐨勩�愭枃浠躲��
/// </summary>
public static string SuggestionFile
@@ -207,6 +165,13 @@
get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, "cad1afb384fb482de753fc37ebe84f9e"); }
}
/// <summary>
+ /// 璋冭瘯鏋佸厜鍙戦�両D鐨勩�愭枃浠躲��
+ /// </summary>
+ public static string JiguangFile
+ {
+ get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, "e509ddd21100cb994f509fb28c2e4dd6"); }
+ }
+ /// <summary>
/// 璁板綍鍙戦�佸拰鎺ユ敹鐨勬暟鎹甃og
/// </summary>
public static string SendAndReceveDataLog
@@ -219,34 +184,6 @@
public static string SocketReceiveDataLog
{
get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, LocalMemoryDirectory, "SocketReceiveDataLog.log"); }
- }
- /// <summary>
- /// 瀛樻斁鍗囩骇鍥轰欢鐨勩�愭枃浠跺す銆�
- /// </summary>
- public static string FirmwareUpdateDirectory
- {
- get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, "5b78084db39091e2f9144bc6209e3001e0328e968d16adbc"); }
- }
- /// <summary>
- /// 瀛樻斁鍗囩骇鍥轰欢鍒楄〃鍚嶅瓧鐨勩�愭枃浠躲��
- /// </summary>
- public static string FirmwareUpdateList
- {
- get { return System.IO.Path.Combine(FirmwareUpdateDirectory, "5b78084db39091e2ee87891aa45d2c1ffc005ce4b9d67f51"); }
- }
- /// <summary>
- /// 璋冭瘯鏋佸厜鍙戦�両D鐨勩�愭枃浠躲��
- /// </summary>
- public static string JiguangFile
- {
- get { return System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, "e509ddd21100cb994f509fb28c2e4dd6"); }
- }
- /// <summary>
- /// 瀛樻斁鐢熸垚鍙戦�佺粰缃戝叧鐨勫悇绉嶆ā鏉挎暟鎹殑銆愭枃浠跺す銆�
- /// </summary>
- public static string CreatSendToGwTemplateDirectory
- {
- get { return System.IO.Path.Combine(Common.Config.Instance.FullPath, "96048b35f1d3d43725b1b2d7240878f804c003969e26330cd5afe42f509b63c7"); }
}
/// <summary>
/// 鍒嗕韩妤煎眰鐨勩�愭枃浠跺悕銆�
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
index 8e98407..38bb2ef 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Resourse/UserCenterResourse.cs
@@ -47,13 +47,5 @@
/// 鏂囦欢鍔犲瘑绉橀挜
/// </summary>
public const string FileEncryptKey = "4^Olh_3f";
- /// <summary>
- /// 鍗曟枩鏉犵殑杞箟瀛楃
- /// </summary>
- public const string slash = "\\";
- /// <summary>
- /// 鍙屽紩鍙风殑杞箟瀛楃
- /// </summary>
- public const string douMarks = "\"";
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
old mode 100755
new mode 100644
index 7e5db3d..30314e1
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/MutilfunctionPanelMethod.cs
@@ -173,6 +173,66 @@
}
/// <summary>
+ /// 璋冨厜鐏拰缁х數鍣ㄧ壒娈婂鐞嗘柟娉�
+ /// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
+ /// </summary>
+ /// <returns></returns>
+ public static void UpdateLightCount(int curBindType)
+ {
+
+ if (curBindType == 1 || curBindType == 2 || curBindType == 3)
+ {
+ curSwitchCount = 0;
+ curSocketCount = 0;
+ curLightFromRelayCount = 0;
+ curLightCount = 0;
+
+ foreach (var key in bindTargetsFromMutilfunctionPanelList.Keys)
+ {
+ var bList = bindTargetsFromMutilfunctionPanelList[key];
+ foreach (var bDev in bList)
+ {
+ var device = LocalDevice.Current.GetDevice(bDev.BindMacAddr, bDev.BindEpoint);
+ if (device == null)
+ {
+ continue;
+ }
+ if (bDev.KeyEpoint >= 52 && bDev.KeyEpoint <= 61)
+ {
+ if (device != null)
+ {
+ if (device.DfunctionType == DeviceFunctionType.A寮�鍏�)
+ {
+ curSwitchCount++;
+ }
+ else if (device.DfunctionType == DeviceFunctionType.A鎻掑骇)
+ {
+ curSocketCount++;
+ }
+ else if (device.DfunctionType == DeviceFunctionType.A鐏厜)
+ {
+ curLightFromRelayCount++;
+ }
+ }
+ }
+
+ if (bDev.KeyEpoint >= 22 && bDev.KeyEpoint <= 28)
+ {
+ if (device != null)
+ {
+ if (device.Type == DeviceType.DimmableLight && bDev.BindCluster == 8)
+ {
+ curLightCount++;
+ }
+ }
+ }
+ }
+ }
+ }
+ }
+
+
+ /// <summary>
/// 鏀寔鍖归厤鐨勭鐐逛釜鏁�
/// <param name="curBindType">褰撳墠绫诲瀷 0:鍦烘櫙 1:寮�鍏� 2:鎻掑骇 3:鐏厜 4:閬槼 5:绌鸿皟 6:鏂伴</param>
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index 8d3f858..568ce9c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -269,8 +269,7 @@
btnRight.ButtonClickEvent += (sender, e) =>
{
//鍥炶矾鏁板ぇ浜�1鎵嶅睍寮�
- var listMacDevice = LocalDevice.Current.GetDevicesByMac(deviceMac, false);
- if (listMacDevice.Count > 1)
+ if (Common.LocalDevice.Current.GetDevicesCountByMac(deviceMac) > 1)
{
btnRight.IsSelected = !btnRight.IsSelected;
//灞曞紑鎴栬�呮姌鍙犳槑缁嗗垪琛�
@@ -278,20 +277,9 @@
}
else
{
- if (LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)
- {
- //mini澶滅伅鐨勫姛鑳借缃晫闈�
- var room = HdlRoomLogic.Current.GetRoomByDevice(listMacDevice[0]);
- var form = new MainPage.DeviceDetailInfoForm();
- form.AddForm(listMacDevice[0], room);
- }
- else
- {
- //璁惧淇℃伅鐣岄潰
- var form = new DeviceMacInfoEditorForm();
- form.AddForm(deviceMac);
- }
btnNew.Visible = false;
+ var form = new DeviceMacInfoEditorForm();
+ form.AddForm(deviceMac);
//鐣岄潰璺宠浆,璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃
this.nowActionDeviceMac = deviceMac;
}
@@ -308,22 +296,9 @@
form2.AddForm(deviceMac);
return;
}
- var listMacDevice = LocalDevice.Current.GetDevicesByMac(deviceMac, false);
- if (LocalDevice.Current.IsMiniLight(listMacDevice[0]) == true)
- {
- //mini澶滅伅鐨勫姛鑳借缃晫闈�
- var room = HdlRoomLogic.Current.GetRoomByDevice(listMacDevice[0]);
- var form = new MainPage.DeviceDetailInfoForm();
- form.AddForm(listMacDevice[0], room);
- }
- else
- {
- //璁惧淇℃伅鐣岄潰
- var form = new DeviceMacInfoEditorForm();
- form.AddForm(deviceMac);
- }
-
btnNew.Visible = false;
+ var form = new DeviceMacInfoEditorForm();
+ form.AddForm(deviceMac);
//鐣岄潰璺宠浆,璁板綍褰撳墠鐨勬鍦ㄦ搷浣滅殑璁惧鐨凪ac鍦板潃
this.nowActionDeviceMac = deviceMac;
};
@@ -699,7 +674,7 @@
/// <summary>
/// 婊戝姩鎺т欢涓嬫媺鍒锋柊
/// </summary>
- private void ListViewBeginHeaderRefreshing()
+ private async void ListViewBeginHeaderRefreshing()
{
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熺殑
if (Common.Config.Instance.Home.IsVirtually == true)
@@ -726,7 +701,7 @@
{
//鏄剧ず杩涘害鏉�
ProgressBar.Show();
- int result2 = HdlGatewayLogic.Current.ReBindNewGateway(realWay);
+ int result2 = await HdlGatewayLogic.Current.ReBindNewGateway(realWay);
//鍏抽棴杩涘害鏉�
ProgressBar.Close();
if (result2 == -1)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs
index b698f35..acded9a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelFourButtonDirectionForm.cs
@@ -49,11 +49,15 @@
btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;
framePic.AddChidren(btnGreanLinght);
- //闀挎寜姝ゆ寜閿�
- string textMsg = Language.StringByID(R.MyInternationalizationString.uLongPressThisButton);
+ //浠绘剰鎸夐敭闀挎寜5绉�
+ string textMsg = Language.StringByID(R.MyInternationalizationString.uLongClickEachPanelSomeSecond);
+ if (textMsg.Contains("{0}") == true)
+ {
+ textMsg = string.Format(textMsg, "5");
+ }
var btnSecond = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
btnSecond.X = this.GetPictrueRealSize(441);
- btnSecond.Y = this.GetPictrueRealSize(526);
+ btnSecond.Y = this.GetPictrueRealSize(583);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 10;
btnSecond.Text = textMsg;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
index 5ef3e6d..02ade6f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelThreeButtonDirectionForm.cs
@@ -49,11 +49,15 @@
btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;
framePic.AddChidren(btnGreanLinght);
- //闀挎寜姝ゆ寜閿�
- string textMsg = Language.StringByID(R.MyInternationalizationString.uLongPressThisButton);
+ //浠绘剰鎸夐敭闀挎寜5绉�
+ string textMsg = Language.StringByID(R.MyInternationalizationString.uLongClickEachPanelSomeSecond);
+ if (textMsg.Contains("{0}") == true)
+ {
+ textMsg = string.Format(textMsg, "5");
+ }
var btnSecond = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
btnSecond.X = this.GetPictrueRealSize(441);
- btnSecond.Y = this.GetPictrueRealSize(526);
+ btnSecond.Y = this.GetPictrueRealSize(583);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 10;
btnSecond.Text = textMsg;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
index adb6ccf..ae74341 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Direction/PanelTwoButtonDirectionForm.cs
@@ -49,11 +49,15 @@
btnGreanLinght.TextID = R.MyInternationalizationString.uPanelBackLightLighting;
framePic.AddChidren(btnGreanLinght);
- //闀挎寜姝ゆ寜閿�
- string textMsg = Language.StringByID(R.MyInternationalizationString.uLongPressThisButton);
+ //浠绘剰鎸夐敭闀挎寜5绉�
+ string textMsg = Language.StringByID(R.MyInternationalizationString.uLongClickEachPanelSomeSecond);
+ if (textMsg.Contains("{0}") == true)
+ {
+ textMsg = string.Format(textMsg, "5");
+ }
var btnSecond = new NormalViewControl(this.GetPictrueRealSize(400), this.GetPictrueRealSize(45), false);
btnSecond.X = this.GetPictrueRealSize(441);
- btnSecond.Y = this.GetPictrueRealSize(526);
+ btnSecond.Y = this.GetPictrueRealSize(583);
btnSecond.TextColor = UserCenterColor.Current.TextGrayColor3;
btnSecond.TextSize = 10;
btnSecond.Text = textMsg;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
index 71725b2..85c4f68 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelColorSelectForm.cs
@@ -32,14 +32,6 @@
/// 鍦嗙洏閫夋嫨鐨勯鑹叉樉绀烘帶浠�(鍐呮)
/// </summary>
private IconViewControl wheelSelectIcon2 = null;
- /// <summary>
- /// 鏄惁鏄鑹查�夋嫨
- /// </summary>
- private bool isColorSelect = false;
- /// <summary>
- /// 棰滆壊鍊艰緭鍏ユ帶浠�
- /// </summary>
- private TextInputControl txtColorInput = null;
#endregion
@@ -51,7 +43,7 @@
/// <param name="i_R">R</param>
/// <param name="i_G">G</param>
/// <param name="i_B">B</param>
- public void ShowForm(int i_R, int i_G, int i_B)
+ public void ShowForm(int i_R,int i_G,int i_B)
{
this.ScrollEnabled = false;
@@ -105,15 +97,17 @@
/// </summary>
private void InitColorPictrueControl()
{
- //鍒濆鍖栭鑹茶緭鍏ユ帶浠�
- this.txtColorInput = this.InitColorInputControl();
+ //鍦嗙洏鎺т欢鐨凢rameLayout
+ var frameBack = new FrameLayout();
+ frameBack.Y = Application.GetRealHeight(66);
+ frameBack.Height = Application.GetRealHeight(1204);
+ bodyFrameLayout.AddChidren(frameBack);
var framePic = new FrameLayout();
framePic.Width = this.GetPictrueRealSize(588);
framePic.Height = this.GetPictrueRealSize(588);
- framePic.Gravity = Gravity.CenterHorizontal;
- framePic.Y = Application.GetRealHeight(192);
- bodyFrameLayout.AddChidren(framePic);
+ framePic.Gravity = Gravity.Center;
+ frameBack.AddChidren(framePic);
//鍦嗙洏鎺т欢
var colorPic = new ColorPicker();
@@ -143,11 +137,14 @@
listRGB.Add(Convert.ToInt32(Convert.ToString(eColor[2])));
//鏄剧ず閫夋嫨棰滆壊鐨勬帶浠�
- this.ShowNowSelectColorControl(eColor);
-
- //鑾峰彇棰滆壊鐨勭炕璇戞枃鏈�
- isColorSelect = true;
- this.txtColorInput.Text = this.GetColorTextTranslate(listRGB[0], listRGB[1], listRGB[2]);
+ if (nowSelectIcon1 != null)
+ {
+ nowSelectIcon1.BorderColor = UserCenterColor.Current.White;
+ }
+ wheelSelectIcon2.BackgroundColor = this.GetColorByRGB(eColor[0], eColor[1], eColor[2]);
+ wheelSelectIcon1.BorderColor = 0xffcccccc;
+ wheelSelectIcon1.Name = listRGB[0] + "-" + listRGB[1] + "-" + listRGB[2];
+ nowSelectIcon1 = wheelSelectIcon1;
};
colorPic.MouseDownEventHandler += (sender, e) =>
{
@@ -170,99 +167,6 @@
//褰撻紶鏍囩偣涓嬩簨浠跺鐞�
colorPic.MouseDownEventHandler(sender, e);
};
-
- //鎵嬪姩杈撳叆鍊兼敼鍙樹簨浠�
- this.txtColorInput.TextChangeEventHandler += (sender, value) =>
- {
- if (isColorSelect == true)
- {
- //杩欓噷鏄敱鐐瑰嚮鑹茬洏杩涜璧嬪�艰Е鍙�
- isColorSelect = false;
- return;
- }
- //妫�娴嬭緭鍏ョ殑棰滆壊鍊�
- var byteColor = this.CheckInputColorValue(value);
- if (byteColor == null)
- {
- return;
- }
- if (btnWhiteView.Visible == true)
- {
- //鐧界偣闅愯棌
- btnWhiteView.Visible = false;
- }
-
- //璁板綍缂撳瓨
- listRGB = new List<int>();
- listRGB.Add(Convert.ToInt32(Convert.ToString(byteColor[0])));
- listRGB.Add(Convert.ToInt32(Convert.ToString(byteColor[1])));
- listRGB.Add(Convert.ToInt32(Convert.ToString(byteColor[2])));
-
- //鏄剧ず閫夋嫨棰滆壊鐨勬帶浠�
- this.ShowNowSelectColorControl(byteColor);
- };
- }
-
- /// <summary>
- /// 鍒濆鍖栭鑹茶緭鍏ユ帶浠�
- /// </summary>
- /// <returns></returns>
- private TextInputControl InitColorInputControl()
- {
- //鑷畾涔夎壊鍊肩殑澶栨
- var frameInput = new NormalFrameLayout();
- frameInput.Width = Application.GetRealWidth(458);
- frameInput.Height = Application.GetRealHeight(104);
- frameInput.Y = Application.GetRealHeight(1103);
- frameInput.Gravity = Gravity.CenterHorizontal;
- frameInput.BorderColor = 0xffcccccc;
- frameInput.Radius = (uint)Application.GetRealWidth(17);
- frameInput.BorderWidth = Application.GetRealWidth(3) == 0 ? 1 : (uint)Application.GetRealWidth(3);
- bodyFrameLayout.AddChidren(frameInput);
- var btnMark = new NormalViewControl(100, 58, true);
- btnMark.X = Application.GetRealWidth(35);
- btnMark.Gravity = Gravity.CenterVertical;
- btnMark.IsBold = true;
- btnMark.Text = "# ";
- btnMark.Width = btnMark.GetRealWidthByText();
- btnMark.TextColor = UserCenterColor.Current.TextGrayColor2;
- frameInput.AddChidren(btnMark);
- //鑷畾涔夎壊鍊艰緭鍏ユ
- var txtInput = new TextInputControl(400, 58, true);
- txtInput.X = btnMark.Right;
- txtInput.Gravity = Gravity.CenterVertical;
- txtInput.TextSize = 16;
- txtInput.FrameBorder = frameInput;
- frameInput.AddChidren(txtInput);
- //鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
- var btnTipView = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(55), false);
- btnTipView.Y = frameInput.Bottom + Application.GetRealHeight(20);
- btnTipView.IsBold = true;
- btnTipView.TextAlignment = TextAlignment.Center;
- btnTipView.TextColor = UserCenterColor.Current.TextGrayColor2;
- btnTipView.TextSize = 12;
- btnTipView.TextID = R.MyInternationalizationString.uColorLengthMsg;
- bodyFrameLayout.AddChidren(btnTipView);
-
- return txtInput;
- }
-
- /// <summary>
- /// 鏄剧ず閫夋嫨棰滆壊鐨勬帶浠�
- /// </summary>
- /// <param name="eColor"></param>
- private void ShowNowSelectColorControl(byte[] eColor)
- {
- //鏄剧ず閫夋嫨棰滆壊鐨勬帶浠�
- if (nowSelectIcon1 != null)
- {
- nowSelectIcon1.BorderColor = UserCenterColor.Current.White;
- }
- var uintColor = this.GetColorByRGB(eColor[0], eColor[1], eColor[2]);
- wheelSelectIcon2.BackgroundColor = uintColor;
- wheelSelectIcon1.BorderColor = 0xffcccccc;
- wheelSelectIcon1.Name = listRGB[0] + "-" + listRGB[1] + "-" + listRGB[2];
- nowSelectIcon1 = wheelSelectIcon1;
}
#endregion
@@ -290,7 +194,7 @@
btnFrame.Width = this.GetPictrueRealSize(80);
btnFrame.Radius = (uint)this.GetPictrueRealSize(80) / 2;
btnFrame.X = Xdefult + i * this.GetPictrueRealSize(80 + 24);
- btnFrame.Y = Application.GetRealHeight(880);
+ btnFrame.Y = Application.GetRealHeight(1054);
btnFrame.BackgroundColor = UserCenterColor.Current.White;
btnFrame.BorderWidth = 1;
btnFrame.BorderColor = UserCenterColor.Current.White;
@@ -317,10 +221,6 @@
wheelSelectIcon1 = btnFrame;
wheelSelectIcon2 = btnIcon;
nowSelectIcon1 = btnFrame;
-
- //鑾峰彇棰滆壊鐨勭炕璇戞枃鏈�
- isColorSelect = true;
- this.txtColorInput.Text = this.GetColorTextTranslate(i_R, i_G, i_B);
}
btnFrame.ButtonClickEvent += (sender, e) =>
@@ -341,9 +241,6 @@
listRGB.Add(Convert.ToInt32(Convert.ToString(Arry[1])));
listRGB.Add(Convert.ToInt32(Convert.ToString(Arry[2])));
}
- //鑾峰彇棰滆壊鐨勭炕璇戞枃鏈�
- isColorSelect = true;
- this.txtColorInput.Text = this.GetColorTextTranslate(listRGB[0], listRGB[1], listRGB[2]);
};
}
}
@@ -396,51 +293,6 @@
list.Add(new List<int>() { 255, 117, 67 });
return list;
- }
-
- /// <summary>
- /// 妫�娴嬭緭鍏ョ殑棰滆壊鍊�
- /// </summary>
- /// <param name="colorText"></param>
- /// <returns></returns>
- private byte[] CheckInputColorValue(string colorText)
- {
- //鍙湁闀垮害涓�6鎵嶅鐞�
- if (colorText.Length != 6) { return null; }
-
- colorText = colorText.ToUpper();
- foreach (var c in colorText)
- {
- if (char.IsNumber(c) == true)
- {
- //鏁板瓧鐨勮瘽,OK
- continue;
- }
- if ('A' <= c && c <= 'F')
- {
- //A-F鐨勮瘽,OK
- continue;
- }
- return null;
- }
- int R = Convert.ToInt32(colorText.Substring(0, 2), 16);
- int G = Convert.ToInt32(colorText.Substring(2, 2), 16);
- int B = Convert.ToInt32(colorText.Substring(4, 2), 16);
- return new byte[] { (byte)R, (byte)G, (byte)B };
- }
-
- /// <summary>
- /// 鑾峰彇棰滆壊鐨勭炕璇戞枃鏈�
- /// </summary>
- /// <param name="i_R"></param>
- /// <param name="i_G"></param>
- /// <param name="i_B"></param>
- /// <returns></returns>
- private string GetColorTextTranslate(int i_R, int i_G, int i_B)
- {
- return Convert.ToString(i_R, 16).ToUpper().PadLeft(2, '0')
- + Convert.ToString(i_G, 16).ToUpper().PadLeft(2, '0')
- + Convert.ToString(i_B, 16).ToUpper().PadLeft(2, '0');
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
old mode 100755
new mode 100644
index 1cc5f84..d61492a
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
@@ -634,6 +634,7 @@
}
}
}
+
if (!btnChoose.IsSelected)
{
targetList.Remove(device);
@@ -838,13 +839,14 @@
EventHandler<MouseEventArgs> hander = (sender, e) =>
{
- if (curSupportBindEpointList.Count == 0 || curSupportBindEpointList.Count == targetScList.Count)
+ btnChoose.IsSelected = !btnChoose.IsSelected;
+
+ if (curSupportBindEpointList.Count == 0)
{
new Tip() { MaxWidth = 150, Text = Language.StringByID(R.MyInternationalizationString.BindFull), Direction = AMPopTipDirection.None, CloseTime = 1 }.Show(Common.CommonPage.Instance);
return;
}
- btnChoose.IsSelected = !btnChoose.IsSelected;
if (!btnChoose.IsSelected)
{
targetScList.Remove(scene);
@@ -901,6 +903,7 @@
//鑾峰彇鎴块棿鍒楄〃
supportRoomList = BindInfo.GetSupportRoomList();
+
//鑾峰彇闈㈡澘宸茬粡缁戝畾鐨勫尮閰嶇被鍨嬬殑鍒楄〃
curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
old mode 100755
new mode 100644
index 4e4ad2c..aaab4fc
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -375,6 +375,24 @@
{
midVerticalScrolViewLayout.RemoveAll();
curBindTypeList = MutilfunctionPanelMethod.GetMatchBindList(curBindType);
+ //娉ㄦ剰锛佸悓涓寜閿鐐瑰鏋滄敮鎸佺粦瀹氬绉嶅姛鑳界被鍨嬶紝闇�瑕佹敞鎰忓涓嬪鐞�
+ //褰撴洿鎹㈣澶囧姛鑳界被鍨嬪悗
+ // 缁戝畾鐨勫紑鍏炽�佹彃搴с�佺伅鍏夋墍鐢ㄧ殑鎸夐敭鍥炶矾浜掔浉鍏宠仈锛屾墍浠ヨ繖閲岄噸鏂拌幏鍙栧皢杩欎笁绉嶇被鍨嬬殑鍏朵粬2绉嶏紝涓轰簡鑾峰彇姝ｇ‘鐨勫紑鍏炽�佹彃搴с�佺伅鍏夌粦瀹氱殑涓暟
+ switch (curBindType)
+ {
+ case 1:
+ MutilfunctionPanelMethod.GetMatchBindList(2);
+ MutilfunctionPanelMethod.GetMatchBindList(3);
+ break;
+ case 2:
+ MutilfunctionPanelMethod.GetMatchBindList(1);
+ MutilfunctionPanelMethod.GetMatchBindList(3);
+ break;
+ case 3:
+ MutilfunctionPanelMethod.GetMatchBindList(1);
+ MutilfunctionPanelMethod.GetMatchBindList(2);
+ break;
+ }
int curIndex = 0;
for (int i = 0; i < curBindTypeList.Count; i++)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
index 05aa07c..f19425c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySearchForm.cs
@@ -239,7 +239,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
//娓呯┖鍏ㄩ儴鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
ZigBee.Common.Application.IsSearchingGateway = true;
int index = 1;
@@ -253,7 +253,7 @@
if (timeCount == 10)
{
//5绉掑悗娓呯┖缃戝叧鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
ZigBee.Common.Application.IsSearchingGateway = true;
}
if (timeCount % 2 == 0)
@@ -316,7 +316,7 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
int count = 0;
while (this.Parent != null && this.isGatewaySearching == true)
@@ -331,7 +331,7 @@
}
count = 0;
- this.CheckZbGatewayAndSetRow();
+ await this.CheckZbGatewayAndSetRow();
if (this.newGatewayGetting == true)
{
@@ -345,7 +345,7 @@
/// <summary>
/// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
/// </summary>
- private bool CheckZbGatewayAndSetRow()
+ private async Task<bool> CheckZbGatewayAndSetRow()
{
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
{
@@ -383,7 +383,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
if (result == false)
{
continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
index 0800856..c959bbf 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/MiniGatewaySelectNetworkForm.cs
@@ -54,35 +54,25 @@
rowWifi.InitControl();
rowWifi.AddBottomLine();
rowWifi.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputHomeWifiAccount);
- //涓嬫媺鍥炬爣鏄亸鍙崇殑
- rowWifi.RightOffset = -Application.GetRealWidth(18);
- var btnDrop = rowWifi.AddMostRightEmptyIcon(58, 58);
- btnDrop.UnSelectedImagePath = "Item/Down.png";
- rowWifi.ChangedChidrenBindMode(btnDrop, ChidrenBindMode.NotBind);
- btnDrop.ButtonClickEvent += (sender, e) =>
- {
- //鏄剧ずWifi涓嬫媺鍒楄〃
- this.ShowWifiListView(rowWifi);
- };
//瀵嗙爜
- var rowPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPassword), string.Empty);
- rowPsw.Y = rowWifi.Bottom + Application.GetRealHeight(9);
- frameBack.AddChidren(rowPsw);
- rowPsw.InitControl();
- rowPsw.txtInput.SecureTextEntry = true;
- rowPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
- var btnView = rowPsw.AddMostRightEmptyIcon(81, 81);
+ var btnPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPassword), string.Empty);
+ btnPsw.Y = rowWifi.Bottom + Application.GetRealHeight(9);
+ frameBack.AddChidren(btnPsw);
+ btnPsw.InitControl();
+ btnPsw.txtInput.SecureTextEntry = true;
+ btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
+ var btnView = btnPsw.AddMostRightEmptyIcon(81, 81);
btnView.UnSelectedImagePath = "Item/HidenPWD.png";
btnView.SelectedImagePath = "Item/UnHidenPWD.png";
- rowPsw.ChangedChidrenBindMode(btnView, ChidrenBindMode.NotBind);
+ btnPsw.ChangedChidrenBindMode(btnView, ChidrenBindMode.NotBind);
btnView.ButtonClickEvent += (sender, e) =>
{
btnView.IsSelected = !btnView.IsSelected;
- rowPsw.txtInput.SecureTextEntry = !rowPsw.txtInput.SecureTextEntry;
+ btnPsw.txtInput.SecureTextEntry = !btnPsw.txtInput.SecureTextEntry;
};
- var btnMsg = new NormalViewControl(rowPsw.txtInput.Width, false);
+ var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
btnMsg.X = ControlCommonResourse.XXLeft;
btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
btnMsg.TextSize = 12;
@@ -112,14 +102,14 @@
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputHomeWifiAccount);
return;
}
- if (rowPsw.Text == string.Empty)
+ if (btnPsw.Text == string.Empty)
{
//璇疯緭鍏ifi瀵嗙爜
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
return;
}
//鍙戦�佸瘑鐮�
- var result = HdlWifiLogic.Current.SendApHomeWifiPassword(rowWifi.Text, rowPsw.Text);
+ var result = HdlWifiLogic.Current.SendApHomeWifiPassword(rowWifi.Text, btnPsw.Text);
if (result == false)
{
//瀵嗙爜鍙戦�佸け璐�
@@ -133,60 +123,6 @@
};
}
- #endregion
-
- #region 鈻� 鏄剧ずWifi涓嬫媺鍒楄〃___________________
-
- /// <summary>
- /// 鏄剧ずWifi涓嬫媺鍒楄〃
- /// </summary>
- /// <param name="rowWifi"></param>
- private void ShowWifiListView(FrameCaptionInputControl rowWifi)
- {
- //涓�涓彲浠ラ伄浣廈ody鐨勪笢瑗�
- var frameTran = new NormalFrameLayout();
- frameTran.Height = bodyFrameLayout.Height;
- frameTran.BackgroundColor = UserCenterColor.Current.DialogBackColor;
- bodyFrameLayout.AddChidren(frameTran);
- frameTran.ButtonClickEvent += (sender, e) =>
- {
- frameTran.RemoveFromParent();
- };
- //鐧借壊鑳屾櫙妗�
- var frameList = new NormalFrameLayout();
- frameList.Y = rowWifi.Bottom;
- frameList.Gravity = Gravity.CenterHorizontal;
- frameList.Width = frameTran.Width - ControlCommonResourse.XXLeft * 2;
- frameList.Height = this.GetPictrueRealSize(1200);
- frameList.Radius = (uint)Application.GetRealWidth(17);
- frameList.BackgroundColor = UserCenterColor.Current.White;
- frameTran.AddChidren(frameList);
- //鍒楄〃鎺т欢
- var listView = new VerticalListControl();
- listView.Height = frameList.Height;
- frameList.AddChidren(listView);
-
- for (int i = 1; i <= 10; i++)
- {
- var frameRow = new FrameRowControl();
- listView.AddChidren(frameRow);
- //wifi鍚嶅瓧
- var btnWifi = new NormalViewControl(frameRow.Width, frameRow.Height - ControlCommonResourse.BottomLineHeight, false);
- btnWifi.X = ControlCommonResourse.XXLeft;
- btnWifi.Text = "Application Software" + i;
- frameRow.AddChidren(btnWifi, ChidrenBindMode.BindEvent);
- //搴曠嚎
- var btnLine = new NormalViewControl(frameRow.Width, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- btnLine.Y = btnWifi.Bottom;
- frameRow.AddChidren(btnLine, ChidrenBindMode.BindEvent);
- frameRow.ButtonClickEvent += (sender, e) =>
- {
- rowWifi.Text = btnWifi.Text;
- frameTran.RemoveFromParent();
- };
- }
- }
#endregion
#region 鈻� 鐣岄潰鍏抽棴___________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
index 9539160..726b27a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WiredGatewaySearchForm.cs
@@ -292,10 +292,10 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
//娓呯┖鍏ㄩ儴鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
ZigBee.Common.Application.IsSearchingGateway = true;
int count = 0;
@@ -311,7 +311,7 @@
}
count = 0;
- this.CheckZbGatewayAndSetRow();
+ await this.CheckZbGatewayAndSetRow();
if (this.newGatewayGetting == true)
{
@@ -325,7 +325,7 @@
/// <summary>
/// 妫�娴嬫悳绱㈠埌鐨勭綉鍏筹紝鐒跺悗娣诲姞鍒扮敾闈㈢殑琛岄噷闈�
/// </summary>
- private bool CheckZbGatewayAndSetRow()
+ private async Task<bool> CheckZbGatewayAndSetRow()
{
List<string> listId = new List<string>();
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
@@ -389,7 +389,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
if (result == false)
{
continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
index dbe4e4b..3b35e26 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSearchForm.cs
@@ -249,7 +249,7 @@
if (timeCount == 10)
{
//5绉掑悗娓呯┖缃戝叧鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
ZigBee.Common.Application.IsSearchingGateway = true;
}
if (timeCount % 2 == 0)
@@ -312,7 +312,7 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
int count = 0;
while (this.Parent != null && this.isGatewaySearching == true)
@@ -327,7 +327,7 @@
}
count = 0;
- this.CheckZbGatewayAndSetRow();
+ await this.CheckZbGatewayAndSetRow();
if (this.newGatewayGetting == true)
{
@@ -341,7 +341,7 @@
/// <summary>
/// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
/// </summary>
- private bool CheckZbGatewayAndSetRow()
+ private async Task<bool> CheckZbGatewayAndSetRow()
{
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
{
@@ -379,7 +379,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
if (result == false)
{
continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
index 7c52b22..c3a2d29 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessApSelectNetworkForm.cs
@@ -1,5 +1,6 @@
锘縰sing System;
using System.Collections.Generic;
+using System.Security.Cryptography;
using System.Text;
namespace Shared.Phone.UserCenter.GatewayAdd
@@ -51,35 +52,25 @@
rowWifi.InitControl();
rowWifi.AddBottomLine();
rowWifi.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputHomeWifiAccount);
- //涓嬫媺鍥炬爣鏄亸鍙崇殑
- rowWifi.RightOffset = -Application.GetRealWidth(18);
- var btnDrop = rowWifi.AddMostRightEmptyIcon(58, 58);
- btnDrop.UnSelectedImagePath = "Item/Down.png";
- rowWifi.ChangedChidrenBindMode(btnDrop, ChidrenBindMode.NotBind);
- btnDrop.ButtonClickEvent += (sender, e) =>
- {
- //鏄剧ずWifi涓嬫媺鍒楄〃
- this.ShowWifiListView(rowWifi);
- };
//瀵嗙爜
- var rowPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPassword), string.Empty);
- rowPsw.Y = rowWifi.Bottom + Application.GetRealHeight(9);
- frameBack.AddChidren(rowPsw);
- rowPsw.InitControl();
- rowPsw.txtInput.SecureTextEntry = true;
- rowPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
- var btnView = rowPsw.AddMostRightEmptyIcon(81, 81);
+ var btnPsw = new FrameCaptionInputControl(Language.StringByID(R.MyInternationalizationString.uPassword), string.Empty);
+ btnPsw.Y = rowWifi.Bottom + Application.GetRealHeight(9);
+ frameBack.AddChidren(btnPsw);
+ btnPsw.InitControl();
+ btnPsw.txtInput.SecureTextEntry = true;
+ btnPsw.txtInput.PlaceholderText = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
+ var btnView = btnPsw.AddMostRightEmptyIcon(81, 81);
btnView.UnSelectedImagePath = "Item/HidenPWD.png";
btnView.SelectedImagePath = "Item/UnHidenPWD.png";
- rowPsw.ChangedChidrenBindMode(btnView, ChidrenBindMode.NotBind);
+ btnPsw.ChangedChidrenBindMode(btnView, ChidrenBindMode.NotBind);
btnView.ButtonClickEvent += (sender, e) =>
{
btnView.IsSelected = !btnView.IsSelected;
- rowPsw.txtInput.SecureTextEntry = !rowPsw.txtInput.SecureTextEntry;
+ btnPsw.txtInput.SecureTextEntry = !btnPsw.txtInput.SecureTextEntry;
};
- var btnMsg = new NormalViewControl(rowPsw.txtInput.Width, false);
+ var btnMsg = new NormalViewControl(btnPsw.txtInput.Width, false);
btnMsg.X = ControlCommonResourse.XXLeft;
btnMsg.Y = frameBack.Bottom + Application.GetRealHeight(23);
btnMsg.TextSize = 12;
@@ -109,14 +100,14 @@
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputHomeWifiAccount);
return;
}
- if (rowPsw.Text == string.Empty)
+ if (btnPsw.Text == string.Empty)
{
//璇疯緭鍏ifi瀵嗙爜
btnMsg.Text = Language.StringByID(R.MyInternationalizationString.uPleaseInputWifiPassword);
return;
}
//鍙戦�佸瘑鐮�
- var result = HdlWifiLogic.Current.SendApHomeWifiPassword(rowWifi.Text, rowPsw.Text);
+ var result = HdlWifiLogic.Current.SendApHomeWifiPassword(rowWifi.Text, btnPsw.Text);
if (result == false)
{
//瀵嗙爜鍙戦�佸け璐�
@@ -124,66 +115,11 @@
return;
}
- this.CloseForm();
- var form = new MiniGatewayDirection3Form();
- form.AddForm();
+ var form = new WirelessApDirection3Form();
+ this.AddFromAndRemoveNowForm(form);
};
}
- #endregion
-
- #region 鈻� 鏄剧ずWifi涓嬫媺鍒楄〃___________________
-
- /// <summary>
- /// 鏄剧ずWifi涓嬫媺鍒楄〃
- /// </summary>
- /// <param name="rowWifi"></param>
- private void ShowWifiListView(FrameCaptionInputControl rowWifi)
- {
- //涓�涓彲浠ラ伄浣廈ody鐨勪笢瑗�
- var frameTran = new NormalFrameLayout();
- frameTran.Height = bodyFrameLayout.Height;
- frameTran.BackgroundColor = UserCenterColor.Current.DialogBackColor;
- bodyFrameLayout.AddChidren(frameTran);
- frameTran.ButtonClickEvent += (sender, e) =>
- {
- frameTran.RemoveFromParent();
- };
- //鐧借壊鑳屾櫙妗�
- var frameList = new NormalFrameLayout();
- frameList.Y = rowWifi.Bottom;
- frameList.Gravity = Gravity.CenterHorizontal;
- frameList.Width = frameTran.Width - ControlCommonResourse.XXLeft * 2;
- frameList.Height = this.GetPictrueRealSize(1200);
- frameList.Radius = (uint)Application.GetRealWidth(17);
- frameList.BackgroundColor = UserCenterColor.Current.White;
- frameTran.AddChidren(frameList);
- //鍒楄〃鎺т欢
- var listView = new VerticalListControl();
- listView.Height = frameList.Height;
- frameList.AddChidren(listView);
-
- for (int i = 1; i <= 10; i++)
- {
- var frameRow = new FrameRowControl();
- listView.AddChidren(frameRow);
- //wifi鍚嶅瓧
- var btnWifi = new NormalViewControl(frameRow.Width, frameRow.Height - ControlCommonResourse.BottomLineHeight, false);
- btnWifi.X = ControlCommonResourse.XXLeft;
- btnWifi.Text = "Application Software" + i;
- frameRow.AddChidren(btnWifi, ChidrenBindMode.BindEvent);
- //搴曠嚎
- var btnLine = new NormalViewControl(frameRow.Width, ControlCommonResourse.BottomLineHeight, false);
- btnLine.BackgroundColor = UserCenterColor.Current.ButtomLine;
- btnLine.Y = btnWifi.Bottom;
- frameRow.AddChidren(btnLine, ChidrenBindMode.BindEvent);
- frameRow.ButtonClickEvent += (sender, e) =>
- {
- rowWifi.Text = btnWifi.Text;
- frameTran.RemoveFromParent();
- };
- }
- }
#endregion
#region 鈻� 鐣岄潰鍏抽棴___________________________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
index a70a6b3..73e09d6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Add/WirelessUdpSearchForm.cs
@@ -249,7 +249,7 @@
if (timeCount == 10)
{
//5绉掑悗娓呯┖缃戝叧鍒楄〃
- HdlGatewayLogic.Current.ClearAllRealGatewayConection(true);
+ HdlGatewayLogic.Current.ClearAllRealGateway();
ZigBee.Common.Application.IsSearchingGateway = true;
}
if (timeCount % 2 == 0)
@@ -312,7 +312,7 @@
private void StartCheckGatewayThread()
{
this.isGatewaySearching = true;
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
int count = 0;
while (this.Parent != null && this.isGatewaySearching == true)
@@ -327,7 +327,7 @@
}
count = 0;
- this.CheckZbGatewayAndSetRow();
+ await this.CheckZbGatewayAndSetRow();
if (this.newGatewayGetting == true)
{
@@ -341,7 +341,7 @@
/// <summary>
/// 妫�娴嬫悳绱㈠埌鐨勭綉鍏�
/// </summary>
- private bool CheckZbGatewayAndSetRow()
+ private async Task<bool> CheckZbGatewayAndSetRow()
{
for (int i = 0; i < ZbGateway.GateWayList.Count; i++)
{
@@ -379,7 +379,7 @@
if (mode == GatewayBindMode.First || mode == GatewayBindMode.Binded)
{
//娣诲姞鎼滅储鍒扮殑缃戝叧鍒扮紦瀛�(鎵ц缃戝叧淇濆瓨鎿嶄綔)
- var result = HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
+ var result = await HdlGatewayLogic.Current.AddNewGateway(way, ShowErrorMode.NO);
if (result == false)
{
continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
index fb1d954..58fdae5 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayInfoEditorForm.cs
@@ -330,7 +330,7 @@
private void CheckNewVersion(PicViewControl btnNewVersion)
{
//鑾峰彇缃戝叧鐗堟湰淇℃伅
- var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway, ShowErrorMode.NO);
+ var result = HdlGatewayLogic.Current.GetGatewayAllNewVersion(this.zbGateway);
if (result == null)
{
return;
@@ -380,9 +380,9 @@
/// </summary>
/// <param name="gatewayId"></param>
/// <param name="online"></param>
- private void DoSwitchGateway()
+ private async void DoSwitchGateway()
{
- var result = HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId);
+ var result = await HdlGatewayLogic.Current.DoSwitchGateway(zbGateway.GwId);
if (result == false)
{
return;
@@ -425,13 +425,13 @@
/// <param name="row"></param>
private void DeleteGateway(string strWayId)
{
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鍒犻櫎浜戠缃戝叧
- bool result = HdlGatewayLogic.Current.DeleteGateway(strWayId);
+ bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (result == false)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
index d0b5faf..8b60ed8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayListForm.cs
@@ -238,12 +238,12 @@
/// </summary>
/// <param name="strWayId"></param>
/// <param name="row"></param>
- private void DeleteGateway(string strWayId)
+ private async void DeleteGateway(string strWayId)
{
//鎵撳紑杩涘害鏉�
this.ShowProgressBar();
//鍒犻櫎浜戠缃戝叧
- bool result = HdlGatewayLogic.Current.DeleteGateway(strWayId);
+ bool result = await HdlGatewayLogic.Current.DeleteGateway(strWayId);
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
if (result == false)
@@ -273,9 +273,9 @@
/// </summary>
/// <param name="gatewayId"></param>
/// <param name="online"></param>
- private void DoSwitchGateway(string gatewayId)
+ private async void DoSwitchGateway(string gatewayId)
{
- var result = HdlGatewayLogic.Current.DoSwitchGateway(gatewayId);
+ var result = await HdlGatewayLogic.Current.DoSwitchGateway(gatewayId);
if (result == false)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs
index 5411559..eea6e72 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewayRebindForm.cs
@@ -40,21 +40,14 @@
btnMsg.TextID = R.MyInternationalizationString.uIsReBindingPleaseWaiting;
bodyFrameLayout.AddChidren(btnMsg);
- HdlThreadLogic.Current.RunThread(() =>
+ HdlThreadLogic.Current.RunThread(async () =>
{
- System.Threading.Thread.Sleep(1000);
- int value = HdlGatewayLogic.Current.ReBindNewGateway(i_gateway, btnMsg);
+ await System.Threading.Tasks.Task.Delay(1000);
+ int value = await HdlGatewayLogic.Current.ReBindNewGateway(i_gateway, btnMsg);
if (value == 1)
{
//鎴愬姛
i_dicZbGatewayDiv[i_gateway.GwId] = 1;
- //鎴戣寰楄繖閲岄渶瑕佽幏鍙栦竴涓嬫柊缃戝叧鐨勮澶囧垪琛�
- Common.LocalDevice.Current.SetDeviceToMemmoryByGateway(i_gateway, true);
- if (i_gateway.IsMainGateWay == true)
- {
- //濡傛灉瀹冩槸涓荤綉鍏�,鍒欏埛鏂板満鏅垪琛�
- HdlSceneLogic.Current.RefreshSceneUIList(true);
- }
}
else if (value == 0)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
index 70d86b1..ca44a7a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Gateway/Manage/GatewaySearchListForm.cs
@@ -178,9 +178,12 @@
/// </summary>
public override void CloseFormBefore()
{
- //鍒锋柊涓婚〉
- UserView.UserPage.Instance.ReFreshControl();
-
+ var userPageForm = UserView.UserPage.Instance.GetNowActionForm();
+ if (userPageForm != null && userPageForm.FormID == "UserMainForm")
+ {
+ //鍒锋柊涓婚〉
+ UserView.UserPage.Instance.ReFreshControl();
+ }
base.CloseFormBefore();
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs
index 15592dc..73f495e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionDirectoryListForm.cs
@@ -63,7 +63,7 @@
row1.AddBottomLine();
row1.ButtonClickEvent += (sender, e) =>
{
- var form = new HideOptionSearchAllFile();
+ var form = new HideOptionFileListForm();
form.AddForm(Common.Config.Instance.FullPath);
};
@@ -99,7 +99,7 @@
row1.ButtonClickEvent += (sender, e) =>
{
- var form = new HideOptionSearchAllFile();
+ var form = new HideOptionFileListForm();
form.AddForm(directoryValue);
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs
index 5658f1d..d44f2d0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileContentForm.cs
@@ -95,6 +95,7 @@
textValue += value + "\r\n";
}
}
+ textValue = textValue.Replace(",", "\r\n");
if (textValue.StartsWith("{") == true)
{
textValue = "{\r\n" + textValue.Substring(1);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs
new file mode 100755
index 0000000..a4a3e23
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionFileListForm.cs
@@ -0,0 +1,167 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.HideOption
+{
+ /// <summary>
+ /// 鏈湴缂撳瓨鏂囦欢鍒楄〃鐨勭晫闈�
+ /// </summary>
+ public class HideOptionFileListForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 瑙ｅ瘑
+ /// </summary>
+ private bool decryptPassword = false;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ public void ShowForm(string directory)
+ {
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText("鏂囦欢鍒楄〃");
+
+ var btnButton = new NormalViewControl(200, 69, true);
+ btnButton.Gravity = Gravity.CenterVertical;
+ btnButton.X = bodyFrameLayout.Width - Application.GetRealWidth(200) - ControlCommonResourse.XXLeft;
+ btnButton.TextColor = UserCenterColor.Current.TopLayoutTitleText;
+ btnButton.TextAlignment = TextAlignment.BottomRight;
+ btnButton.TextSize = 17;
+ btnButton.Text = "缈昏瘧";
+ topFrameLayout.AddChidren(btnButton);
+ btnButton.ButtonClickEvent += (sender, e) =>
+ {
+ if (this.decryptPassword == false)
+ {
+ this.decryptPassword = true;
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(directory);
+ }
+ };
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame(directory);
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame(string directory)
+ {
+ this.ClearBodyFrame();
+
+ var listAllFile = HdlFileLogic.Current.GetFileFromDirectory(directory);
+ listAllFile.Sort();
+
+ var listView = new VerticalListControl(23);
+ listView.BackgroundColor = UserCenterColor.Current.White;
+ listView.Height = bodyFrameLayout.Height;
+ bodyFrameLayout.AddChidren(listView);
+
+ for (int i = 0; i < listAllFile.Count; i++)
+ {
+ this.AddRowControl(listView, listAllFile[i], directory, i != listAllFile.Count - 1);
+ }
+ listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(50));
+
+ var btnButon = new BottomClickButton();
+ btnButon.Text = "鍒犻櫎鏂囦欢澶�";
+ bodyFrameLayout.AddChidren(btnButon);
+ btnButon.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁娓呴櫎璇ユ枃浠跺す", () =>
+ {
+ try
+ {
+ System.IO.Directory.Delete(directory, true);
+ this.CloseForm();
+ }
+ catch (Exception ex)
+ {
+ this.ShowMassage(ShowMsgType.Error, "娓呴櫎缂撳瓨鏂囦欢澶瑰紓甯�");
+ HdlLogLogic.Current.WriteLog(ex, "娓呴櫎缂撳瓨鏂囦欢澶瑰紓甯�");
+ }
+ });
+ };
+ if (directory == Common.Config.Instance.FullPath)
+ {
+ btnButon.CanClick = false;
+ }
+ }
+
+ private void AddRowControl(VerticalListControl listView, string fileName, string directory, bool addLine)
+ {
+ string fileNewName = fileName;
+ if (decryptPassword == true && fileName.StartsWith("Device_") == false)
+ {
+ try
+ {
+ fileNewName = UserCenterLogic.DecryptPassword(UserCenterResourse.FileEncryptKey, fileName);
+ }
+ catch { fileNewName = fileName; }
+ }
+
+ var row1 = new RowLayoutControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ var btnName = row1.frameTable.AddLeftCaption(fileNewName, 800);
+ btnName.IsMoreLines = true;
+ if (addLine == true)
+ {
+ row1.frameTable.AddBottomLine();
+ }
+ row1.frameTable.AddRightArrow();
+
+ var btnUpLoad = row1.AddEditorControl();
+ btnUpLoad.Text = "涓婁紶";
+ btnUpLoad.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁涓婁紶璇ユ枃浠�(娴嬭瘯)?", () =>
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ string tagrtFile = System.IO.Path.Combine(directory, fileName);
+ HdlBackupLogic.Current.UpLoadByteDataToOptionBackup(fileName, HdlFileLogic.Current.ReadFileByteContent(tagrtFile));
+ });
+ });
+ };
+
+ var btnDelete = row1.AddDeleteControl();
+ btnDelete.ButtonClickEvent += (sender, e) =>
+ {
+ this.ShowMassage(ShowMsgType.Confirm, "鏄惁娓呴櫎璇ョ紦瀛樻枃浠�", () =>
+ {
+ var myFile = System.IO.Path.Combine(Common.Config.Instance.FullPath, directory, fileName);
+ try
+ {
+ System.IO.File.Delete(myFile);
+ row1.RemoveFromParent();
+ }
+ catch (Exception ex)
+ {
+ this.ShowMassage(ShowMsgType.Error, "娓呴櫎缂撳瓨鏂囦欢寮傚父");
+ HdlLogLogic.Current.WriteLog(ex, "娓呴櫎缂撳瓨鏂囦欢寮傚父");
+ }
+ });
+ };
+
+ row1.frameTable.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionFileContentForm();
+ form.AddForm(System.IO.Path.Combine(Common.Config.Instance.FullPath, directory, fileName));
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayInfoMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayInfoMenuForm.cs
deleted file mode 100755
index 83fc914..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayInfoMenuForm.cs
+++ /dev/null
@@ -1,78 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter.HideOption
-{
- /// <summary>
- /// 闅愬尶鍔熻兘鐨勭綉鍏充俊鎭彍鍗曠晫闈�
- /// </summary>
- public class HideOptionGatewayInfoMenuForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 缃戝叧瀵硅薄
- /// </summary>
- private ZbGateway zbGateway = null;
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_gateway"></param>
- public void ShowForm(ZbGateway i_gateway)
- {
- this.zbGateway = i_gateway;
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText("缃戝叧鑿滃崟");
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- var listview = new VerticalListControl(29);
- listview.Height = bodyFrameLayout.Height;
- listview.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(listview);
-
- //缃戝叧淇℃伅
- var rowContr1 = new RowLayoutControl(listview.rowSpace / 2);
- listview.AddChidren(rowContr1);
- rowContr1.frameTable.AddLeftCaption("缃戝叧淇℃伅", 700);
- rowContr1.frameTable.AddRightArrow();
- rowContr1.frameTable.AddBottomLine();
- rowContr1.frameTable.ButtonClickEvent += (sender, e) =>
- {
- var form = new GatewayManage.GatewayInfoEditorForm();
- form.AddForm(zbGateway);
- };
-
- //缃戝叧鏂囦欢鍒楄〃
- var rowContr2 = new RowLayoutControl(listview.rowSpace / 2);
- listview.AddChidren(rowContr2);
- rowContr2.frameTable.AddLeftCaption("缃戝叧鏂囦欢鍒楄〃", 700);
- rowContr2.frameTable.AddRightArrow();
- rowContr2.frameTable.ButtonClickEvent += (sender, e) =>
- {
- var form = new HideOptionGatewayListFileForm();
- form.AddForm(zbGateway);
- };
-
- listview.AdjustRealHeight(Application.GetRealHeight(23));
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs
deleted file mode 100755
index 529ff96..0000000
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs
+++ /dev/null
@@ -1,203 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Text;
-using ZigBee.Device;
-
-namespace Shared.Phone.UserCenter.HideOption
-{
- /// <summary>
- /// 闅愬尶鍔熻兘鐨勭綉鍏虫枃浠跺垪琛ㄧ晫闈�
- /// </summary>
- public class HideOptionGatewayListFileForm : EditorCommonForm
- {
- #region 鈻� 鍙橀噺澹版槑___________________________
-
- /// <summary>
- /// 缃戝叧瀵硅薄
- /// </summary>
- private ZbGateway zbGateway = null;
- private BottomClickButton btnDelete = null;
- private List<string> listDeleteFile = new List<string>();
-
- #endregion
-
- #region 鈻� 鍒濆鍖朹____________________________
-
- /// <summary>
- /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
- /// </summary>
- /// <param name="i_gateway"></param>
- public void ShowForm(ZbGateway i_gateway)
- {
- HdlFileLogic.Current.CreateDirectory(System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, "MyTempDir"), true);
- this.zbGateway = i_gateway;
- //璁剧疆鏍囬淇℃伅
- base.SetTitleText("缃戝叧鏂囦欢鍒楄〃");
- //鍒濆鍖栦腑閮ㄦ帶浠�
- this.InitMiddleFrame();
-
- var btnButton = new NormalViewControl(300, 69, true);
- btnButton.Gravity = Gravity.CenterVertical;
- btnButton.X = bodyFrameLayout.Width - Application.GetRealWidth(300) - ControlCommonResourse.XXLeft;
- btnButton.TextColor = UserCenterColor.Current.TopLayoutTitleText;
- btnButton.TextAlignment = TextAlignment.CenterRight;
- btnButton.TextSize = 17;
- btnButton.Text = "涓�閿垹闄�";
- topFrameLayout.AddChidren(btnButton);
- btnButton.ButtonClickEvent += (sender, e) =>
- {
- btnDelete.Visible = true;
- };
- }
-
- /// <summary>
- /// 鍒濆鍖栦腑閮ㄦ帶浠�
- /// </summary>
- private void InitMiddleFrame()
- {
- //娓呯┖bodyFrame
- this.ClearBodyFrame();
-
- var listview = new VerticalListControl(29);
- listview.Height = bodyFrameLayout.Height;
- listview.BackgroundColor = UserCenterColor.Current.White;
- bodyFrameLayout.AddChidren(listview);
-
- this.ShowProgressBar();
- HdlThreadLogic.Current.RunThread(async () =>
- {
- var result = await zbGateway.FileTransferLsDirAsync();
-
- this.CloseProgressBar();
- if (result == null || result.fileTransferLsDiResponseData == null)
- {
- this.ShowMassage(ShowMsgType.Tip, "鑾峰彇鍒楄〃澶辫触,缃戝叧娌℃湁鍥炲");
- return;
- }
- if (result.fileTransferLsDiResponseData.Result != 0)
- {
- this.ShowMassage(ShowMsgType.Tip, "鏌ョ湅澶辫触,濂藉儚缃戝叧涓嶅厑璁告煡鐪嬭繖涓洰褰�");
- return;
- }
-
- var listFile = new List<string>();
- foreach (var data in result.fileTransferLsDiResponseData.Dir)
- {
- string[] strArry = data.File.Split(new string[] { "/" }, StringSplitOptions.RemoveEmptyEntries);
- listFile.Add(strArry[strArry.Length - 1]);
- }
- listFile.Sort();
- HdlThreadLogic.Current.RunMain(() =>
- {
- foreach (var fileName in listFile)
- {
- var rowContr1 = new RowLayoutControl(listview.rowSpace / 2);
- listview.AddChidren(rowContr1);
- rowContr1.frameTable.AddLeftCaption(fileName, 700);
- rowContr1.frameTable.AddBottomLine();
-
- var btnSelect = new IconViewControl(58);
- btnSelect.UnSelectedImagePath = "Item/ItemSelected.png";
- btnSelect.Gravity = Gravity.Center;
- rowContr1.frameTable.AddChidren(btnSelect);
- btnSelect.Visible = false;
-
- var btnDelete = rowContr1.AddDeleteControl();
- btnDelete.ButtonClickEvent += (sender, e) =>
- {
- this.ShowMassage(ShowMsgType.Confirm, "鏄惁鍒犻櫎缃戝叧鐨勮繖涓枃浠�(闇�璋ㄦ厧)", async () =>
- {
- var result9 = await zbGateway.DelFileOrDirAsync("/etc/hdlDat/" + fileName);
- if (result9 == null || result9.delFileOrDirResponseData == null)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,缃戝叧娌℃湁鍥炲");
- return;
- }
- if (result9.delFileOrDirResponseData.Result == 1)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,缃戝叧璇磋繖涓笢瑗夸笉瀛樺湪");
- return;
- }
- if (result9.delFileOrDirResponseData.Result == 2)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,缃戝叧璇磋繖涓笢瑗夸笉鍏佽鍒犻櫎");
- return;
- }
- if (result9.delFileOrDirResponseData.Result != 0)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,鏃犳硶璇嗗埆鐨勭姸鎬佺爜(" + result9.delFileOrDirResponseData.Result + ")");
- return;
- }
- rowContr1.RemoveFromParent();
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢鎴愬姛");
- });
- };
- }
-
- listview.AdjustRealHeightByBottomButton(Application.GetRealHeight(23));
-
- this.btnDelete = new BottomClickButton();
- btnDelete.Text = "鍒犻櫎";
- bodyFrameLayout.AddChidren(btnDelete);
- btnDelete.Visible = false;
- btnDelete.ButtonClickEvent += (sender, e) =>
- {
- this.ShowMassage(ShowMsgType.Confirm, "纭畾鏄惁鍒犻櫎杩欎簺鏂囦欢?",async () =>
- {
- foreach (var listfile in this.listDeleteFile)
- {
- var result9 = await zbGateway.DelFileOrDirAsync("/etc/hdlDat/" + listfile);
- if (result9 == null || result9.delFileOrDirResponseData == null)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,缃戝叧娌℃湁鍥炲");
- this.InitMiddleFrame();
- this.listDeleteFile = new List<string>();
- return;
- }
- if (result9.delFileOrDirResponseData.Result == 1)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,缃戝叧璇磋繖涓笢瑗夸笉瀛樺湪");
- this.InitMiddleFrame();
- this.listDeleteFile = new List<string>();
- return;
- }
- if (result9.delFileOrDirResponseData.Result == 2)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,缃戝叧璇磋繖涓笢瑗夸笉鍏佽鍒犻櫎");
- this.InitMiddleFrame();
- this.listDeleteFile = new List<string>();
- return;
- }
- if (result9.delFileOrDirResponseData.Result != 0)
- {
- this.ShowMassage(ShowMsgType.Tip, "鍒犻櫎鏂囦欢澶辫触,鏃犳硶璇嗗埆鐨勭姸鎬佺爜(" + result9.delFileOrDirResponseData.Result + ")");
- this.InitMiddleFrame();
- this.listDeleteFile = new List<string>();
- return;
- }
- }
- this.InitMiddleFrame();
- this.listDeleteFile = new List<string>();
- });
- };
- });
- });
- }
-
- #endregion
-
- #region 鈻� 鐣岄潰鍏抽棴___________________________
-
- /// <summary>
- /// 鐣岄潰鍏抽棴
- /// </summary>
- public override void CloseFormBefore()
- {
- HdlFileLogic.Current.DeleteDirectory(System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, "MyTempDir"));
-
- base.CloseFormBefore();
- }
-
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
index b6ad0bf..585bd74 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListForm.cs
@@ -137,7 +137,7 @@
};
gatewayRow.frameTable.ButtonClickEvent += (sender, e) =>
{
- var form = new HideOptionGatewayInfoMenuForm();
+ var form = new GatewayManage.GatewayInfoEditorForm();
form.AddForm(i_gateway);
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 0dc5107..5cc33dd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -51,15 +51,6 @@
{
listView.RemoveAll();
- var rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
- var btnTemp = new NormalViewControl(600, 100, true);
- btnTemp.Text = "涓�鑸俊鎭儴鍒�";
- btnTemp.Gravity = Gravity.Center;
- btnTemp.TextSize = 16;
- btnTemp.IsBold = true;
- btnTemp.TextAlignment = TextAlignment.Center;
- rowTemp.AddChidren(btnTemp);
-
this.AddNormalRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
@@ -76,24 +67,15 @@
this.AddNormalRowControl("WIFI鍙橀噺", 400, Shared.Application.IsWifi == true ? "true" : "false", 400);
- rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
- btnTemp = new NormalViewControl(600, 100, true);
- btnTemp.Text = "閾炬帴璋冭瘯閮ㄥ垎";
- btnTemp.Gravity = Gravity.Center;
- btnTemp.TextSize = 16;
- btnTemp.IsBold = true;
- btnTemp.TextAlignment = TextAlignment.Center;
- rowTemp.AddChidren(btnTemp);
-
this.AddNormalRowControl("鎵嬫満鑾峰彇鐨処P", 600, new Shared.Net.NetWiFi().BroadcastIpAddress.ToString(), 600);
- if (ZigBee.Common.Application.FindGateWaySocket.udpClient == null)
+ if (ZigBee.Common.Application.FindGateWaySocket.busSocket == null)
{
this.AddNormalRowControl("Socket閾炬帴", 400, "鏈垵濮嬪寲", 400);
}
else
{
- this.AddNormalRowControl("Socket閾炬帴", 400, "宸插垵濮嬪寲", 400);
+ this.AddNormalRowControl("Socket閾炬帴", 400, ZigBee.Common.Application.FindGateWaySocket.busSocket.Connected == true ? "true" : "false", 400);
}
int count = ZbGateway.GateWayList.Count;
@@ -116,6 +98,28 @@
//妫�娴嬭兘鍚﹀箍鎾緱鍒扮綉鍏�
this.AddCheckReceviceGatewayRow();
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("鏌ョ湅缂撳瓨鏂囦欢", 500);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionDirectoryListForm();
+ form.AddForm();
+ };
+
+ row1 = new FrameRowControl(listView.rowSpace / 2);
+ listView.AddChidren(row1);
+ row1.AddLeftCaption("璁惧缂撳瓨鍙橀噺", 500);
+ row1.AddRightArrow();
+ row1.AddBottomLine();
+ row1.ButtonClickEvent += (sender, e) =>
+ {
+ var form = new HideOptionMemoryListDeviceForm();
+ form.AddForm();
+ };
row1 = new FrameRowControl(listView.rowSpace / 2);
listView.AddChidren(row1);
@@ -191,61 +195,6 @@
ZigBee.Common.Application.FindGateWaySocket.Stop();
ZigBee.Common.Application.FindGateWaySocket.Start();
this.ShowMassage(ShowMsgType.Tip, "鍒濆鍖栧畬鎴�");
- });
- };
-
- rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
- btnTemp = new NormalViewControl(600, 100, true);
- btnTemp.Text = "鏌ョ湅缂撳瓨閮ㄥ垎";
- btnTemp.Gravity = Gravity.Center;
- btnTemp.TextSize = 16;
- btnTemp.IsBold = true;
- btnTemp.TextAlignment = TextAlignment.Center;
- rowTemp.AddChidren(btnTemp);
-
- row1 = new FrameRowControl(listView.rowSpace / 2);
- listView.AddChidren(row1);
- row1.AddLeftCaption("鏌ョ湅缂撳瓨鏂囦欢", 500);
- row1.AddRightArrow();
- row1.AddBottomLine();
- row1.ButtonClickEvent += (sender, e) =>
- {
- var form = new HideOptionDirectoryListForm();
- form.AddForm();
- };
-
- row1 = new FrameRowControl(listView.rowSpace / 2);
- listView.AddChidren(row1);
- row1.AddLeftCaption("璁惧缂撳瓨鍙橀噺", 500);
- row1.AddRightArrow();
- row1.AddBottomLine();
- row1.ButtonClickEvent += (sender, e) =>
- {
- var form = new HideOptionMemoryListDeviceForm();
- form.AddForm();
- };
-
- rowTemp = this.AddNormalRowControl(string.Empty, 400, string.Empty, 400);
- btnTemp = new NormalViewControl(600, 100, true);
- btnTemp.Text = "鍏朵粬閮ㄥ垎";
- btnTemp.Gravity = Gravity.Center;
- btnTemp.TextSize = 16;
- btnTemp.IsBold = true;
- btnTemp.TextAlignment = TextAlignment.Center;
- rowTemp.AddChidren(btnTemp);
-
- row1 = new FrameRowControl(listView.rowSpace / 2);
- listView.AddChidren(row1);
- row1.AddLeftCaption("閲嶇疆瀵煎叆鏍囪瘑", 500);
- row1.AddRightArrow();
- row1.AddBottomLine();
- row1.ButtonClickEvent += (sender, e) =>
- {
- this.ShowMassage(ShowMsgType.Confirm, "鏄惁閲嶇疆杩欎釜浣忓畢鐨勫鍏ユ爣璇�?\r\n閲嶇疆涔嬪悗鍙互鍐嶆瀵煎叆缃戝叧", () =>
- {
- Common.Config.Instance.Home.SendTemplateSuccess = false;
- Common.Config.Instance.Home.Save();
- this.ShowMassage(ShowMsgType.Tip, "閲嶇疆瀹屾垚");
});
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
index 34348bd..401554a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
@@ -131,30 +131,6 @@
}
}
listView.AdjustRealHeightByBottomButton(Application.GetRealHeight(50));
-
- var btnButon = new BottomClickButton();
- btnButon.Text = "鍒犻櫎鏂囦欢澶�";
- bodyFrameLayout.AddChidren(btnButon);
- btnButon.ButtonClickEvent += (sender, e) =>
- {
- this.ShowMassage(ShowMsgType.Confirm, "鏄惁娓呴櫎璇ユ枃浠跺す", () =>
- {
- try
- {
- System.IO.Directory.Delete(directory, true);
- this.CloseForm();
- }
- catch (Exception ex)
- {
- this.ShowMassage(ShowMsgType.Error, "娓呴櫎缂撳瓨鏂囦欢澶瑰紓甯�");
- HdlLogLogic.Current.WriteLog(ex, "娓呴櫎缂撳瓨鏂囦欢澶瑰紓甯�");
- }
- });
- };
- if (directory == Common.Config.Instance.FullPath)
- {
- btnButon.CanClick = false;
- }
}
private void AddDirectoryRowControl(VerticalListControl listView, string directoryName, string directory, bool addLine)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
index d730def..e88ead1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberListForm.cs
@@ -358,7 +358,7 @@
return;
}
pra.Account = dicMemberAccount[keys];
- var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" }, false);
+ var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
if (result == null)
{
continue;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
index 9ffe23b..2f15977 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Member/MemberManagementForm.cs
@@ -416,7 +416,7 @@
{
var pra = new AccountInfoPra();
pra.Account = memberInfo.Account;
- var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" }, false);
+ var result = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
if (result == null)
{
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
index ab608cf..c384d1e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
@@ -124,7 +124,7 @@
{
//鑾峰彇浣忓畢淇℃伅
var Pra = new GetResidenceInfoPra();
- string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" }, false);
+ string resultData = UserCenterLogic.GetResponseDataByRequestHttps("App/GetHomePager", false, Pra, new List<string> { "NotCheck" });
if (string.IsNullOrEmpty(resultData) == true)
{
return false;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
index c19b63e..f0438a2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceManagementForm.cs
@@ -693,7 +693,6 @@
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.Global.CreateHomeDirectory(myHouse.Id);
Common.Config.Instance.Save();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
index dbc1465..bf7c54f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
@@ -123,8 +123,8 @@
/// <param name="btnswich"></param>
private async void SetInformationPush(MostRightIconControl btnswich)
{
- //鑾峰彇鐘舵��(鍙栧弽)
- int statu = btnswich.IsSelected == true ? 1 : 0;
+ //鑾峰彇鐘舵��
+ int statu = HdlSafeguardLogic.Current.GetGarrisonInformationPushStatu(this.zoonID) == 0 ? 1 : 0;
//鎵ц淇敼
var result = await HdlSafeguardLogic.Current.SetGarrisonInformationPushStatu(this.zoonID, statu);
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 55e728a..8503e8e 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -64,7 +64,7 @@
//鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
if (loginSuccess == 1 || loginSuccess == 2)
{
- var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb(true);
+ var homes = UserCenter.HdlResidenceLogic.Current.GetHomeListsFromDb();
//鍒锋柊涓汉涓績鐨勫唴瀛樺強绾跨▼
UserCenter.UserCenterLogic.InitUserCenterMenmoryAndThread();
//鍚姩ZigBee
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index b3f93e1..91553e0 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -160,13 +160,13 @@
{
try
{
- if (FindGateWaySocket.udpClient == null || FindGateWaySocket.udpClient.Available <= 0)
+ if (FindGateWaySocket.busSocket == null || FindGateWaySocket.busSocket.Available <= 0)
{
System.Threading.Thread.Sleep(500);
continue;
- }
- var ipEndPoint = new System.Net.IPEndPoint(0, 0);
- var bytes = FindGateWaySocket.udpClient.Receive(ref ipEndPoint);
+ }
+ var bytes = new byte[1024];
+ var len = FindGateWaySocket.busSocket.Receive(bytes, bytes.Length, System.Net.Sockets.SocketFlags.None);
if (bytes[43] == 0xA2)
{
//骞挎挱鍥炲缃戝叧鐨勫熀鏈俊鎭鐞�
@@ -284,14 +284,7 @@
}
}
}
- catch (Exception ex)
- {
- //璋冭瘯鐢�
- if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
- {
- Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, "Receive寮傚父\r\n" + ex.Message);
- }
- }
+ catch { }
}
})
{ IsBackground = true }.Start();
@@ -397,19 +390,24 @@
public static class FindGateWaySocket
{
//鏈湴Socket
- public static UdpClient udpClient;
+ public static Socket busSocket;
/// <summary>
/// 鍚姩Socket鎺ユ敹鍜屽彂閫佸姛鑳�
/// </summary>
/// <param name="port"></param>
- public static void Start()
+ public static void Start(int port = 7624)
{
- if (udpClient!=null)
+ if (IsRunning)
{
return;
}
- udpClient = new UdpClient { EnableBroadcast = true };
+ //瀹氫箟缃戠粶绫诲瀷锛屾暟鎹繛鎺ョ被鍨嬪拰缃戠粶鍗忚UDP
+ busSocket = new Socket(AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);
+ busSocket.EnableBroadcast = true;
+ busSocket.ReceiveTimeout = 1000;
+ busSocket.SendTimeout = 1000;
+ busSocket.Bind(new IPEndPoint(IPAddress.Any, port));
}
/// <summary>
@@ -419,12 +417,23 @@
{
try
{
- udpClient?.Close();
+ busSocket?.Close();
}
catch { }
- udpClient = null;
+ busSocket = null;
Console.WriteLine("BusSocket鍏抽棴鎴愬姛!");
+ }
+
+ /// <summary>
+ /// 褰撳墠鐨凷ocket鏄惁杩愯
+ /// </summary>
+ public static bool IsRunning
+ {
+ get
+ {
+ return busSocket == null ? false : true;
+ }
}
/// <summary>
@@ -435,11 +444,11 @@
{
try
{
- if (udpClient == null)
+ if (IsRunning)
{
- return;
+ busSocket.BeginSendTo(bytes, 0, bytes.Length, SocketFlags.None, iPEndPoint, new AsyncCallback(asyncEndSend), null);
}
- udpClient.Send(bytes, bytes.Length, iPEndPoint);
+
}
catch (Exception ex)
{
@@ -450,8 +459,28 @@
}
}
}
+
+ /// <summary>
+ /// 寮傛鍙戦�佹暟鎹粨鏉�
+ /// </summary>
+ /// <param name="iar"></param>
+ private static void asyncEndSend(IAsyncResult iar)
+ {
+ try
+ {
+ int bytesSent = busSocket.EndSendTo(iar);
+ }
+ catch (Exception ex)
+ {
+ //璋冭瘯鐢�
+ if (Shared.Phone.UserCenter.UserCenterResourse.HideOption.WriteSocketReceiveDataToFile == 1)
+ {
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteLog(3, "寮傛鍙戦�佺粨鏉熷紓甯�(asyncEndSend)\r\n" + ex.Message);
+ }
+ }
+ }
}
#endregion
}
-}
\ No newline at end of file
+}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs
index 6dcd028..1f2a4b8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ColorTemperatureLight.cs
@@ -28,12 +28,6 @@
public int ColorTemperature = 0;
/// <summary>
- ///铚傞福鍣ㄦ槸鍚﹀湪鍝嶇潃(true:鍝嶇潃 false:涓嶅搷)
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public bool IsBuzzerRing = false;
-
- /// <summary>
/// 璇诲彇浜害
/// </summary>
public void ReadLevel()
@@ -47,14 +41,6 @@
public void ReadColorTemperature()
{
ReadAttri(Device.Cluster_ID.ColorControl, AttriButeId.LevelControl);
- }
-
- /// <summary>
- /// 璇诲彇铚傞福鍣ㄧ姸鎬�(灏忓鐏笓鐢�)
- /// </summary>
- public void ReadBuzzerStatu()
- {
- ReadAttri((Cluster_ID)1282, 0);
}
///<summary >
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 61a4856..fa16d90 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -85,6 +85,7 @@
/// <para>鎸佺画鏁版嵁涓婃姤(MomentStatus=0 TriggerZoneStatus>=1锛滄姤璀︼紴 TriggerZoneStatus=0锛滃彇娑堟姤璀︼紴)</para>
/// <para>21: Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿欙級</para>
/// <para>22:Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿�</para>
+ /// <para>541 鐞冨瀷绉诲姩浼犳劅鍣�</para>
/// </summary>
public int IasDeviceType;
/// <summary>
@@ -115,7 +116,7 @@
/// </summary>
public int ZigbeeType;
/// <summary>
- /// 鍥轰欢鐗堟湰
+ /// 褰撳墠杩愯绋嬪簭鐗堟湰淇℃伅銆� 鏈�澶�64瀛楄妭
/// </summary>
public int ImgVersion;
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
index af40ff4..04f6b80 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
@@ -4706,15 +4706,7 @@
/// <summary>
/// 闃插尯鍚嶇О 锛屾渶澶�32涓瓧绗�
/// </summary>
- public string ZoneName;
-
- /// <summary>
- /// 鏄惁绂佺敤淇℃伅鎺ㄩ�侊細
- ///<para>0锛氫笉绂佺敤</para>
- ///<para>1锛氱鐢�</para>
- ///<para>褰撻槻鍖虹殑淇℃伅鎺ㄩ�佽绂佺敤鏃讹紝闃插尯琚Е鍙戞椂涓嶄細鍙戦��18灏忚妭鐨勨�濋槻鍖鸿瑙﹀彂鏄姤鍛娾�濈殑涓婚淇℃伅銆�</para>
- /// </summary>
- public int IsDisablePushMessage = 0;
+ public string ZoneName;
/// <summary>
/// 瀹夐槻璁惧鍒楄〃
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index 33f7267..ab48517 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -72,7 +72,7 @@
/// <summary>
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
- public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
+ public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
/// <summary>
/// 铏氭嫙缃戝叧
@@ -249,9 +249,32 @@
/// <summary>
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
- public List<DriveCodeObj> DriveCodeList = new List<DriveCodeObj>();
+ public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
}
+ public class DriveCodeListObj
+ {
+ /// <summary>
+ /// 椹卞姩浠ｅ彿锛堢敱缃戝叧涓洪┍鍔ㄥ垎閰嶅敮涓�鏍囪瘑锛�
+ /// </summary>
+ public int DriveCode;
+ /// <summary>
+ /// 椹卞姩纭欢鐗堟湰
+ /// </summary>
+ public int DriveHwVersion;
+ /// <summary>
+ /// 椹卞姩杞欢鐗�
+ /// </summary>
+ public int DriveFwVersion;
+ /// <summary>
+ /// 椹卞姩鍥轰欢绫诲瀷
+ /// </summary>
+ public int DriveImageType;
+ /// <summary>
+ /// 椹卞姩id
+ /// </summary>
+ public int DriveId;
+ }
#endregion
#region 淇敼缃戝叧鍚嶇О
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index b767caa..aef72af 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -5846,14 +5846,6 @@
/// 閽ュ寵鎵�
/// </summary>
public const int uKeyfob = 16143;
- /// <summary>
- /// 鑹插�煎彿涓�6浣嶏紙鐢变换鎰忔暟瀛�+瀛楁瘝缁勫悎锛�
- /// </summary>
- public const int uColorLengthMsg = 16144;
- /// <summary>
- /// 闀挎寜姝ゆ寜閿�
- /// </summary>
- public const int uLongPressThisButton = 16145;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index 25ce690..7de833c 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -45,7 +45,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\IfString.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\LightView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\mFunView.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\RoomClickView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SaveView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\SelectedDeviceView.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\Device\Logic\LogicView\TipView.cs" />
@@ -140,9 +139,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\SmartSound\Widget\MyButton.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\SmartSound\Widget\SoundRowLayout.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\SmartSound\Widget\TextDialog.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\TemplateData\TemplateCommonLogic.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\TemplateData\TemplateDataCommon.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\TemplateData\TemplateDeviceDataLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\AbountForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\SLAForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Common\AccountOption.cs" />
@@ -295,8 +291,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HdlBackup\HdlBackupListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionDirectoryListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileContentForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayInfoMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayListFileForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionFileListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionGatewayListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMainForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\HideOption\HideOptionMemoryListDeviceForm.cs" />
--
Gitblit v1.8.0