From c7df85937f73fb347ee0b19e9c052d2d00a6df6c Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期五, 18 九月 2020 13:58:19 +0800
Subject: [PATCH] 新版本
---
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 133
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 10581 +++++++++++++++++++-------------------
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 20
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs | 37
ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustFailIcon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs | 7
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs | 44
ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidenceIcon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs | 319 +
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs | 14
ZigbeeApp/Home.Ios/mono_crash.115869ea88.1.json | 775 ++
ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs | 10
ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs | 13
ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs | 56
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs | 12
ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs | 48
ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs | 230
ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png | 0
ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs | 64
ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs | 32
ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs | 17
ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs | 4
ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs | 12
ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs | 34
ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs | 30
ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png.png | 0
ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs | 8
ZigbeeApp/Home.Ios/Info.plist | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs | 4
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs | 17
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustFailIcon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs | 2
ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs | 118
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs | 8
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs | 56
ZigbeeApp/Shared/Shared.projitems | 15
ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs | 71
ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs | 2
ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs | 31
ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs | 143
ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustSuccessIcon.png | 0
ZigbeeApp/Shared/Phone/ZigBee/Device/DimmerSwitch.cs | 17
ZigbeeApp/Shared/Common/SendDataToServer.cs | 15
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 4
ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs | 12
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs | 13
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs | 1
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidenceIcon.png | 0
ZigbeeApp/Shared/Phone/Device/Logic/Method.cs | 77
ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj | 9
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs | 2
ZigbeeApp/Shared/Common/CommonPage.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs | 44
ZigbeeApp/GateWay.Droid/Application.cs | 206
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs | 1
ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs | 2
ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs | 8
ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs | 8
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs | 11
ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs | 342 +
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs | 24
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs | 19
ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs | 35
ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionMenuControl.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs | 14
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs | 11
ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs | 3
ZigbeeApp/Shared/Phone/UserView/HomePage.cs | 10
ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs | 13
ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs | 49
ZigbeeApp/Home.Ios/Resources/Language.ini | 133
ZigbeeApp/Home.Ios/Home.IOS.csproj | 5
ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs | 26
ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs | 2
ZigbeeApp/Shared/R.cs | 534 +
ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs | 2
ZigbeeApp/GateWay.Droid/Resources/mipmap-hdpi/Icon.png | 0
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs | 5
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs | 6
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs | 91
ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs | 8
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 2
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDeviceChange.cs | 4
ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png | 0
ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs | 127
ZigbeeApp/Shared/Common/Device.cs | 111
ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs | 270
ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs | 68
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs | 138
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs | 9
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs | 27
/dev/null | 82
ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustSuccessIcon.png | 0
ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs | 36
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlMessageLogic.cs | 109
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs | 32
ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs | 11
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 19
ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs | 194
ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs | 23
128 files changed, 9,661 insertions(+), 6,471 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Application.cs b/ZigbeeApp/GateWay.Droid/Application.cs
index 46946fd..7858c42 100755
--- a/ZigbeeApp/GateWay.Droid/Application.cs
+++ b/ZigbeeApp/GateWay.Droid/Application.cs
@@ -25,8 +25,8 @@
class WXEntryActivity : Android.App.Activity, IWXAPIEventHandler
{
public void OnReq(BaseReq p0)
- {
-
+ {
+
}
protected override void OnNewIntent(Intent intent)
{
@@ -51,32 +51,40 @@
break;
default:
RespAction?.Invoke(null);
- break;
-
- //case SendAuth.Resp.InnerErrCode.ErrUserCancel:
- // break;
- //case SendAuth.Resp.InnerErrCode.ErrAuthDenied:
- // break;
-
+ break;
+
+ //case SendAuth.Resp.InnerErrCode.ErrUserCancel:
+ // break;
+ //case SendAuth.Resp.InnerErrCode.ErrAuthDenied:
+ // break;
+
}
- }
-
+ }
+
this.Finish();
}
//IWXAPI api;
protected override void OnCreate(Bundle savedInstanceState)
{
- base.OnCreate(savedInstanceState);
- // 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚�
- //api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", false);
-
- // 灏嗗簲鐢ㄧ殑appId娉ㄥ唽鍒板井淇�
- //api.RegisterApp("wx2ec8f53f6fa36e82");
-
- com.hdl.home.Application.api?.HandleIntent(Intent, this);
+ base.OnCreate(savedInstanceState);
+ // 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚�
+ //api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", false);
+
+ // 灏嗗簲鐢ㄧ殑appId娉ㄥ唽鍒板井淇�
+ //api.RegisterApp("wx2ec8f53f6fa36e82");
+
+ com.hdl.home.Application.api?.HandleIntent(Intent, this);
}
}
- /// <summary>鈥� /// 璁惧畾涓洪粯璁ゅ惎鍔ㄧ殑Application鈥� /// </summary>鈥� [Android.App.Application()]鈥� public class Application : Android.App.Application鈥� {鈥� public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }鈥ㄢ�� public override void OnCreate()鈥� {
+ /// <summary>
+ /// 璁惧畾涓洪粯璁ゅ惎鍔ㄧ殑Application
+ /// </summary>
+ [Android.App.Application]
+ public class Application : Android.App.Application
+ {
+ public Application(IntPtr handle, Android.Runtime.JniHandleOwnership ownerShip) : base(handle, ownerShip) { }
+ public override void OnCreate()
+ {
//濡傛灉涓嶆槸App鐨勪富杩涚▼,鍒欎笉闇�瑕佸鐞�
if (this.IsCurrentAppProcess == false)
{
@@ -87,10 +95,13 @@
{
//杩欎釜涓滆タ濂藉儚鍙兘浼氬嚭寮傚父
this.initAll();
- }鈥� catch (Exception ex)鈥� {
+ }
+ catch (Exception ex)
+ {
//璋冭瘯:璁板綍绯荤粺寮傚父
Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.SystemLogFile, ex.Message + "\r\n" + ex.StackTrace, true, false);
- }鈥� base.OnCreate();
+ }
+ base.OnCreate();
// 閫氳繃WXAPIFactory宸ュ巶锛岃幏鍙朓WXAPI鐨勫疄渚�
//api = WXAPIFactory.CreateWXAPI(this, "wx2ec8f53f6fa36e82", true);
@@ -116,20 +127,28 @@
}
return false;
}
- }
+ }
+
+ internal static IWXAPI api;
- internal static IWXAPI api;
-
- public static void WXLogin() {
+ public static void WXLogin()
+ {
var req = new SendAuth.Req { Scope = "snsapi_userinfo", State = "ZigbeeApp" };
api?.SendReq(req);
}
- /// <summary>鈥� /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜扳�� /// </summary>鈥� void initAll()鈥� {
+ /// <summary>
+ /// 鎵�鏈夊垵濮嬪寲鍏ㄩ儴鍦ㄨ繖涓柟娉曞疄鐜�
+ /// </summary>
+ void initAll()
+ {
Shared.Application.IsGpsEnable = System.IO.File.Exists(Shared.Phone.UserCenter.DirNameResourse.OpenGbsFile);
+ //闅愯棌搴曢儴杞寜閿�
+ BaseActivity.IsHideVirualButtons = true;
//璁剧疆鏋佸厜璋冭瘯妯″紡锛屼负false鏃跺彧鎵撳嵃璀﹀憡淇℃伅
// System.Console.WriteLine($"AAA : {System.DateTime.Now.ToString()}");
-#if Release鈥� JPushInterface.SetDebugMode(false);
+#if Release
+ JPushInterface.SetDebugMode(false);
//淇濆瓨鎵嬫満鍚嶇О鍒版湰鍦版枃浠�
//System.Console.WriteLine($"BBB : {System .DateTime .Now .ToString ()}");
@@ -138,7 +157,8 @@
#endif
- BaseActivity.BackKeyAction = () => {
+ BaseActivity.BackKeyAction = () =>
+ {
try
{
if (Shared.Common.CommonPage.BackKeyCanClick == false)
@@ -175,20 +195,135 @@
Console.WriteLine("Remove PageLayout Children!!!!");
HomePage.Instance.GetChildren(HomePage.Instance.ChildrenCount - 1).RemoveFromParent();
Console.WriteLine("Remove PageLayout Children End!!!!");
+ }
+ else if (Shared.Common.CommonPage.Instance.ChildrenCount > 2)
+ {
+ //杩欓噷鍙搴旂櫥闄嗙晫闈㈢殑
+ Shared.Common.CommonPage.Instance.GetChildren(Shared.Common.CommonPage.Instance.ChildrenCount - 1).RemoveFromParent();
}
else
{
BaseActivity.VerifyDateTime = DateTime.MaxValue;
Console.WriteLine("BaseActivity VerifyDateTime Max!!!!");
}
- };
-鈥� BaseActivity.OnCreateActoin += (activity, application) => {
+ };
+ BaseActivity.OnCreateActoin += (activity, application) =>
+ {
Shared.Application.FontSize = 12;
- AppCenter.Start("4802834a-e7e9-4dd8-93f1-c2f88f0bd464", typeof(Analytics), typeof(Crashes));鈥�#if Release鈥� //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠垛�� var registrationId = JPushInterface.GetRegistrationID(activity);
+ AppCenter.Start("4802834a-e7e9-4dd8-93f1-c2f88f0bd464", typeof(Analytics), typeof(Crashes));
+#if Release
+ //淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
+ var registrationId = JPushInterface.GetRegistrationID(activity);
System.Console.WriteLine("registrationId-鏋佸厜id=" + registrationId);
- if (!string.IsNullOrEmpty(registrationId))鈥� {鈥� Shared.Common.Config.Instance.RegistrationID = registrationId;鈥� Shared.Common.Config.Instance.Save();鈥� }鈥� //璋冭瘯:璁板綍鏋佸厜ID鈥� Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "receive1:" + registrationId, true, true);鈥�#endif鈥� };鈥ㄢ�� 鈥� BaseActivity.RefreshUIAction += (activity) => {鈥� Shared.Language.CurrentLanguage = "Chinese";鈥� Shared.Common.CommonPage.Instance.Show();鈥� };鈥ㄢ�� BaseActivity.NetworkStateChanged += (v) =>鈥� {鈥� };鈥� BaseActivity.OnDestroyAction += (activity) => {鈥� //socket鍋滄杩炴帴鈥� //ZigBee.Device.ZbGateway.FindGateWaySocket.Stop();鈥� };鈥ㄢ�� HDLUtils.SetAuthoritiesName("com.evoyo.home.fileProvider");鈥� }鈥ㄢ�� public static bool IsShowTip = true;鈥� JpushNotificationReceiver myReceiver = new JpushNotificationReceiver { };鈥ㄢ�� /// <summary>鈥� /// 椤圭洰鍚姩鏃剁綉缁滄煡璇⑩�� /// </summary>鈥� void checkSomeInfo()鈥� {鈥� var status = isNetworkAvailable(this);鈥� string internetStatus = "Available";鈥� if (!status)鈥� {鈥� internetStatus = "UnaVailable";鈥� }鈥� else鈥� {鈥� var isWifi = isWifiConnected(this);鈥� if (isWifi)鈥� {鈥� internetStatus = "WiFiConnect";鈥� }鈥� else鈥� {鈥� internetStatus = "MobileConnect";鈥� }鈥� }鈥ㄢ�� int connectState = 0;鈥� if (internetStatus == "UnaVailable")鈥� {鈥� connectState = 0;鈥� }鈥� else if (internetStatus == "WiFiConnect")鈥� {鈥� connectState = 2;鈥� }鈥� else鈥� {鈥� connectState = 1;鈥� }鈥� //ZigBee.Device.ZbGateway.CheckConnection(connectState);鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁鍙敤鈥� /// </summary>鈥� /// <returns><c>true</c>, if network available was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isNetworkAvailable(Context context)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� if (cm == null || cm.ActiveNetworkInfo == null)鈥� {鈥� //褰撳墠缃戠粶涓嶅彲鐢ㄢ�� return false;鈥� }鈥� else鈥� {鈥� return cm.ActiveNetworkInfo.IsAvailable;鈥� }鈥� }鈥ㄢ�� /// <summary>鈥� /// 缃戠粶鏄惁杩炴帴鈥� /// </summary>鈥� /// <returns><c>true</c>, if wifi connected was ised, <c>false</c> otherwise.</returns>鈥� /// <param name="context">Context.</param>鈥� bool isWifiConnected(Context context)鈥� {鈥� if (context != null)鈥� {鈥� var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);鈥ㄢ�� var mWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Wifi);鈥� if (Android.Net.NetworkInfo.State.Connected == mWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疻i-Fi杩炴帴鈥� return true;鈥� }鈥ㄢ�� var moWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Mobile);鈥� if (Android.Net.NetworkInfo.State.Connected == moWiFiNetworkInfo.GetState())鈥� {鈥� //褰撳墠缃戠粶鏄疢obile杩炴帴鈥� return false;鈥� }鈥� }鈥� return false;鈥� }
+ if (!string.IsNullOrEmpty(registrationId))
+ {
+ Shared.Common.Config.Instance.RegistrationID = registrationId;
+ Shared.Common.Config.Instance.Save();
+ }
+ //璋冭瘯:璁板綍鏋佸厜ID
+ Shared.Phone.UserCenter.HdlLogLogic.Current.WriteOtherText(Shared.Phone.UserCenter.DirNameResourse.JiguangFile, "receive1:" + registrationId, true, true);
+#endif
+ };
+ BaseActivity.RefreshUIAction += (activity) =>
+ {
+ Shared.Language.CurrentLanguage = "Chinese";
+ Shared.Common.CommonPage.Instance.Show();
+ };
+ BaseActivity.NetworkStateChanged += (v) =>
+ {
+ };
+ BaseActivity.OnDestroyAction += (activity) =>
+ {
+ //socket鍋滄杩炴帴
+ //ZigBee.Device.ZbGateway.FindGateWaySocket.Stop();
+ };
+ HDLUtils.SetAuthoritiesName("com.evoyo.home.fileProvider");
+ }
+ public static bool IsShowTip = true;
+ JpushNotificationReceiver myReceiver = new JpushNotificationReceiver { };
+ /// <summary>
+ /// 椤圭洰鍚姩鏃剁綉缁滄煡璇�
+ /// </summary>
+ void checkSomeInfo()
+ {
+ var status = isNetworkAvailable(this);
+ string internetStatus = "Available";
+ if (!status)
+ {
+ internetStatus = "UnaVailable";
+ }
+ else
+ {
+ var isWifi = isWifiConnected(this);
+ if (isWifi)
+ {
+ internetStatus = "WiFiConnect";
+ }
+ else
+ {
+ internetStatus = "MobileConnect";
+ }
+ }
+ int connectState = 0;
+ if (internetStatus == "UnaVailable")
+ {
+ connectState = 0;
+ }
+ else if (internetStatus == "WiFiConnect")
+ {
+ connectState = 2;
+ }
+ else
+ {
+ connectState = 1;
+ }
+ //ZigBee.Device.ZbGateway.CheckConnection(connectState);
+ }
+ /// <summary>
+ /// 缃戠粶鏄惁鍙敤
+ /// </summary>
+ /// <returns><c>true</c>, if network available was ised, <c>false</c> otherwise.</returns>
+ /// <param name="context">Context.</param>
+ bool isNetworkAvailable(Context context)
+ {
+ var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);
+ if (cm == null || cm.ActiveNetworkInfo == null)
+ {
+ //褰撳墠缃戠粶涓嶅彲鐢�
+ return false;
+ }
+ else
+ {
+ return cm.ActiveNetworkInfo.IsAvailable;
+ }
+ }
+ /// <summary>
+ /// 缃戠粶鏄惁杩炴帴
+ /// </summary
+ /// <returns><c>true</c>, if wifi connected was ised, <c>false</c> otherwise.</returns>
+ /// <param name="context">Context.</param>
+ bool isWifiConnected(Context context)
+ {
+ if (context != null)
+ {
+ var cm = (ConnectivityManager)context.GetSystemService(ConnectivityService);
+ var mWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Wifi);
+ if (Android.Net.NetworkInfo.State.Connected == mWiFiNetworkInfo.GetState())
+ {
+ //褰撳墠缃戠粶鏄疻i-Fi杩炴帴
+ return true;
+ }
+ var moWiFiNetworkInfo = cm.GetNetworkInfo(ConnectivityType.Mobile);
+ if (Android.Net.NetworkInfo.State.Connected == moWiFiNetworkInfo.GetState())
+ {
+ //褰撳墠缃戠粶鏄疢obile杩炴帴
+ return false;
+ }
+ }
+ return false;
+ }
-
+
}
[BroadcastReceiver(Name = "com.evoyo.home.JpushNotificationReceiver", Exported = false, Enabled = true)]
@@ -390,7 +525,8 @@
CustomOverlay = mZXingCustomScanView
};
- mZXingCustomScanView.OnCancel += () => {
+ mZXingCustomScanView.OnCancel += () =>
+ {
scanner?.Cancel();
};
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 568a03f..754fb8d 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -816,6 +816,133 @@
13602=鏃�
13603=鑾峰彇涓�...
13604=褰撳墠 浜害
+13605=妯℃澘
+13606=璇诲彇涓�
+13607=娣诲姞浣忓畢
+13608=鏂板缓浣忓畢
+13609=鑷畾涔�
+13610=椤圭洰鍚�
+13611=璇峰～鍐欓」鐩悕绉�
+13612=妤煎彿
+13613=1-100涔嬮棿
+13614=鍗曞厓鍙�
+13615=鎴峰彿
+13616=灞傚彿鍔犳埧鍙凤紝渚嬪0201
+13617=涓句緥锛氭垚閮介噾鍫傞噾鑼傚簻椤圭洰-2鏍�-3鍗曞厓-0201鎴�
+13618=閫夋嫨鍒涘缓鏂瑰紡
+13619=鏂瑰紡
+13620=鏈夋ā鏉�
+13621=鏃犳ā鏉�
+13622=鏃犺澶囧垱寤�
+13623=鏈夎澶囧垱寤�
+13624=鑷畾涔夋柊寤轰綇瀹�
+13625=鑷畾涔夊悕绉�
+13626=鑷畾涔夊唴瀹�
+13627=浣忓畢閰嶇疆
+13628=鏃犳ā鏉挎湁璁惧
+13629=鏈夋ā鏉挎湁璁惧
+13630=鏃犳ā鏉挎棤璁惧
+13631=鍖哄煙
+13632=璁惧鍜屽姛鑳�
+13633=妤煎眰鏁�
+13634=鎴块棿鏁�
+13635=璁惧鏁�
+13636=鍔熻兘鏁�
+13637=鏃犲睆缃戝叧
+13638=璺敱缃戝叧
+13639=鏈夌綉绾挎坊鍔犵綉鍏�
+13640=WIFI娣诲姞缃戝叧
+13641=璁惧鍒楄〃
+13642=宸叉悳绱㈣澶囨暟锛�
+13643=涓�
+13644=鍙栨秷鎼滅储
+13645=淇″彿
+13646=瑙ｇ粦
+13647=璁惧鍑哄巶鍚嶇О
+13648=璁惧澶囨敞鍚嶇О
+13649=鐐瑰嚮缂栬緫妤煎眰涓庡娉�
+13650=缃戝叧閫夋嫨
+13651=鍦烘櫙鍒楄〃
+13652=鏆傛棤鍦烘櫙,璇锋坊鍔�
+13653=铏氭嫙
+13654=鏈湴
+13655=杩滅▼
+13656=浣忓畢鍒楄〃
+13657=鎼滅储浣忓畢鍏抽敭璇�
+13658=鎴峰悕
+13659=淇敼鏃堕棿
+13660=纭鍒囨崲
+13661=璇疯緭鍏ヨ嚜瀹氫箟鍚嶇О
+13662=璇疯緭鑷畾涔夊唴瀹�
+13663=榛樿
+13664=鐢辫繎鍒拌繙
+13665=鐢辫繙鍒拌繎
+13666=杩斿洖{0}涓婚〉
+13667=淇濆瓨妯℃澘{0}鍒癆PP
+13668=淇濆瓨澶囦唤{0}鍒癆PP
+13669=鏈湴澶囦唤淇濆瓨鎴愬姛
+13670=澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
+13671=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬ā鏉挎暟鎹�
+13672=閫夋嫨妯℃澘
+13673=宸查�夋ā鐗�
+13674=璇烽�夋嫨妯℃澘瀵硅薄
+13675={0}杩樻病鏈夐�夋嫨妯℃澘瀵硅薄,纭瑕佽繑鍥�?
+13676=妯℃澘涓搴旂殑缃戝叧
+13677=鍙栨秷缁戝畾
+13678=妯℃澘涓搴旂殑缃戝叧杩樻病璁剧疆{0}纭瑕佽繑鍥烇紵
+13679=妯℃澘涓澶囨暟锛�
+13680=璇烽�夋嫨妯℃澘涓殑璁惧
+13681=妯℃澘涓搴旂殑璁惧
+13683=妯℃澘
+13684=纭鍒犻櫎銆寋0}銆嶈澶囧強鍔熻兘锛�
+13685=妯＄増璁惧鏁颁笌缁戝畾璁惧鏁颁笉涓�鑷磠0}璇锋鏌ヨ澶�
+13686=瀵煎叆鍔熻兘涓庡満鏅�
+13687=鏈夎澶囨湭閫夋嫨妯℃澘
+13688=鎵嬫満浼犵綉鍏�
+13689=缃戝叧浼犺澶�
+13690=棰勮鎬昏�楁椂
+13691=涓�閿鍏�
+13692=妯℃澘涓㈠け,璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆
+13693=璇峰厛閫夋嫨缃戝叧鐨勬ā鏉垮璞�
+13694=璁惧涓庢ā鏉垮凡缁忓畬鍏ㄥ尮閰�
+13695=鏈湴澶囦唤
+13696=浜戠澶囦唤
+13697=鎭㈠鍒皗0}鏈湴
+13698=涓婁紶鍒皗0}浜戠
+13699=涓嬭浇鍒癆PP
+13700=纭畾涓嬭浇姝ゅ浠藉埌APP?
+13701=璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆椤圭洰绫诲瀷
+13702=纭畾涓婁紶鎸囧畾澶囦唤鍒颁簯绔�?
+13703=澶囦唤鏁版嵁涓嬭浇鎴愬姛
+13704=纭畾灏嗘暟鎹仮澶嶅埌鏈湴锛�
+13705=绉讳氦缁檣0}鐢ㄦ埛
+13706=鎺堟潈缁檣0}璋冭瘯浜哄憳
+13707=閰嶇疆{0}浣忓畢
+13708=鍒囨崲{0}浣忓畢
+13709=鏈湴妯℃澘
+13710=浜戠妯℃澘
+13711=鏈湴杩樻病鏈夋ā鏉�
+13712=妯℃澘瀵煎叆鎴愬姛
+13713=鍔熻兘鍦烘櫙宸插叏閮ㄥ鍏�
+13714=妯℃澘瀵煎叆澶辫触
+13715=鏌ョ湅鍘熷洜
+13716=瀵煎嚭鏂囨湰{0}璇存槑
+13717=杩樻病鏈夊垱寤哄尯鍩�
+13718=浜戠杩樻病鏈夋ā鏉�
+13719=涓嬭浇鎴愬姛
+13720=涓嬭浇澶辫触
+13721=淇濆瓨鍒颁簯绔�
+13722=璇疯緭鍏ユā鏉垮悕瀛�
+13723=妯℃澘鍚嶅瓧宸茬粡瀛樺湪
+13724=涓婁紶妯℃澘鎴愬姛
+13725=涓婁紶妯℃澘澶辫触
+13726=姝よ处鍙锋棤鏉冪櫥褰�
+13727=涓嬭浇妯℃澘澶辫触
+13728=缂栬緫浣忓畢鍚嶇О澶辫触
+13729=缂栬緫浣忓畢鍖哄煙澶辫触
+13730=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+13731=涓嶈兘鑷繁鎺堟潈缁欒嚜宸�
+13732=鎺堟潈璐﹀彿
15000=瀵嗙爜闀垮害涓簕0}涓瓧绗�
@@ -1906,6 +2033,12 @@
16158=鏌ョ湅
16159=瀹氭椂鑷姩鍏抽棴
16160=涓嶅叧闂�
+16161=缁堟
+16162=姝ｅ湪绉讳氦缁欑敤鎴�,璇风◢鍚�...
+16163=姝ｅ湪鎺堟潈缁欒皟璇曚汉鍛�,璇风◢鍚�...
+16164=杩囨埛鎴愬姛
+16165=杩囨埛澶辫触
+16166=鎭枩{0}鎴愪负銆寋1}銆嶇鐞嗗憳
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustFailIcon.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustFailIcon.png
new file mode 100755
index 0000000..e5d389f
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustFailIcon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustSuccessIcon.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustSuccessIcon.png
new file mode 100755
index 0000000..4d08660
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/AdjustSuccessIcon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidenceIcon.png b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidenceIcon.png
new file mode 100755
index 0000000..81b46bb
--- /dev/null
+++ b/ZigbeeApp/GateWay.Droid/Assets/Phone/Item/TransferOfResidenceIcon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
index 1b9d694..0ae2613 100644
--- a/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
+++ b/ZigbeeApp/GateWay.Droid/GateWay.Droid.csproj
@@ -2514,6 +2514,15 @@
<ItemGroup>
<AndroidAsset Include="Assets\Phone\Item\TransferOfResidence.png" />
</ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AdjustFailIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\AdjustSuccessIcon.png" />
+ </ItemGroup>
+ <ItemGroup>
+ <AndroidAsset Include="Assets\Phone\Item\TransferOfResidenceIcon.png" />
+ </ItemGroup>
<Import Project="..\Shared\Shared.projitems" Label="Shared" Condition="Exists('..\Shared\Shared.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
<Import Project="..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets" Condition="Exists('..\packages\Xamarin.Android.Support.Annotations.26.0.2\build\MonoAndroid80\Xamarin.Android.Support.Annotations.targets')" />
diff --git a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
index ab6d27e..bee41a8 100644
--- a/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
+++ b/ZigbeeApp/GateWay.Droid/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120082701" android:installLocation="auto" android:versionName="1.1.0120082701">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.evoyo.home" android:versionCode="0120091501" android:installLocation="auto" android:versionName="1.1.0120091501">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="26" />
<permission android:name="com.evoyo.home.permission.JPUSH_MESSAGE" android:protectionLevel="signature" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 77c05a9..af73240 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -31,233 +31,233 @@
public partial class Animation
{
- // aapt resource value: 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 +272,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 +288,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 +304,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 +1667,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,347 +1695,347 @@
public partial class Color
{
- // aapt resource value: 0x7f0d0059
- public const int abc_background_cache_hint_selector_material_dark = 2131558489;
+ // aapt resource value: 0x7F060000
+ public const int abc_background_cache_hint_selector_material_dark = 2131099648;
- // aapt resource value: 0x7f0d005a
- public const int abc_background_cache_hint_selector_material_light = 2131558490;
+ // aapt resource value: 0x7F060001
+ public const int abc_background_cache_hint_selector_material_light = 2131099649;
- // aapt resource value: 0x7f0d005b
- public const int abc_btn_colored_borderless_text_material = 2131558491;
+ // aapt resource value: 0x7F060002
+ public const int abc_btn_colored_borderless_text_material = 2131099650;
- // aapt resource value: 0x7f0d005c
- public const int abc_btn_colored_text_material = 2131558492;
+ // aapt resource value: 0x7F060003
+ public const int abc_btn_colored_text_material = 2131099651;
- // aapt resource value: 0x7f0d005d
- public const int abc_color_highlight_material = 2131558493;
+ // aapt resource value: 0x7F060004
+ public const int abc_color_highlight_material = 2131099652;
- // aapt resource value: 0x7f0d005e
- public const int abc_hint_foreground_material_dark = 2131558494;
+ // aapt resource value: 0x7F060005
+ public const int abc_hint_foreground_material_dark = 2131099653;
- // aapt resource value: 0x7f0d005f
- public const int abc_hint_foreground_material_light = 2131558495;
+ // 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: 0x7f0d0060
- public const int abc_primary_text_disable_only_material_dark = 2131558496;
+ // aapt resource value: 0x7F060008
+ public const int abc_primary_text_disable_only_material_dark = 2131099656;
- // aapt resource value: 0x7f0d0061
- public const int abc_primary_text_disable_only_material_light = 2131558497;
+ // aapt resource value: 0x7F060009
+ public const int abc_primary_text_disable_only_material_light = 2131099657;
- // aapt resource value: 0x7f0d0062
- public const int abc_primary_text_material_dark = 2131558498;
+ // aapt resource value: 0x7F06000A
+ public const int abc_primary_text_material_dark = 2131099658;
- // aapt resource value: 0x7f0d0063
- public const int abc_primary_text_material_light = 2131558499;
+ // aapt resource value: 0x7F06000B
+ public const int abc_primary_text_material_light = 2131099659;
- // aapt resource value: 0x7f0d0064
- public const int abc_search_url_text = 2131558500;
+ // 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: 0x7f0d0065
- public const int abc_secondary_text_material_dark = 2131558501;
+ // aapt resource value: 0x7F060010
+ public const int abc_secondary_text_material_dark = 2131099664;
- // aapt resource value: 0x7f0d0066
- public const int abc_secondary_text_material_light = 2131558502;
+ // aapt resource value: 0x7F060011
+ public const int abc_secondary_text_material_light = 2131099665;
- // aapt resource value: 0x7f0d0067
- public const int abc_tint_btn_checkable = 2131558503;
+ // aapt resource value: 0x7F060012
+ public const int abc_tint_btn_checkable = 2131099666;
- // aapt resource value: 0x7f0d0068
- public const int abc_tint_default = 2131558504;
+ // aapt resource value: 0x7F060013
+ public const int abc_tint_default = 2131099667;
- // aapt resource value: 0x7f0d0069
- public const int abc_tint_edittext = 2131558505;
+ // aapt resource value: 0x7F060014
+ public const int abc_tint_edittext = 2131099668;
- // aapt resource value: 0x7f0d006a
- public const int abc_tint_seek_thumb = 2131558506;
+ // aapt resource value: 0x7F060015
+ public const int abc_tint_seek_thumb = 2131099669;
- // aapt resource value: 0x7f0d006b
- public const int abc_tint_spinner = 2131558507;
+ // aapt resource value: 0x7F060016
+ public const int abc_tint_spinner = 2131099670;
- // aapt resource value: 0x7f0d006c
- public const int abc_tint_switch_track = 2131558508;
+ // 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: 0x7f0d0047
- public const int colorAccent = 2131558471;
+ // aapt resource value: 0x7F060026
+ public const int colorAccent = 2131099686;
- // aapt resource value: 0x7f0d0048
- public const int colorPrimary = 2131558472;
+ // aapt resource value: 0x7F060027
+ public const int colorPrimary = 2131099687;
- // aapt resource value: 0x7f0d0049
- public const int colorPrimaryDark = 2131558473;
+ // aapt resource value: 0x7F060028
+ public const int colorPrimaryDark = 2131099688;
- // aapt resource value: 0x7f0d0058
- public const int color_default = 2131558488;
+ // aapt resource value: 0x7F060029
+ public const int color_default = 2131099689;
- // aapt resource value: 0x7f0d0056
- public const int color_disable = 2131558486;
+ // aapt resource value: 0x7F06002A
+ public const int color_disable = 2131099690;
- // aapt resource value: 0x7f0d0057
- public const int color_select = 2131558487;
+ // aapt resource value: 0x7F06002B
+ public const int color_select = 2131099691;
- // aapt resource value: 0x7f0d0055
- public const int color_white = 2131558485;
+ // aapt resource value: 0x7F06002C
+ public const int color_white = 2131099692;
- // aapt resource value: 0x7f0d003c
- public const int design_bottom_navigation_shadow_color = 2131558460;
+ // aapt resource value: 0x7F06002D
+ public const int design_bottom_navigation_shadow_color = 2131099693;
- // aapt resource value: 0x7f0d006d
- public const int design_error = 2131558509;
+ // aapt resource value: 0x7F06002E
+ public const int design_error = 2131099694;
- // aapt resource value: 0x7f0d003d
- public const int design_fab_shadow_end_color = 2131558461;
+ // aapt resource value: 0x7F06002F
+ public const int design_fab_shadow_end_color = 2131099695;
- // aapt resource value: 0x7f0d003e
- public const int design_fab_shadow_mid_color = 2131558462;
+ // aapt resource value: 0x7F060030
+ public const int design_fab_shadow_mid_color = 2131099696;
- // aapt resource value: 0x7f0d003f
- public const int design_fab_shadow_start_color = 2131558463;
+ // aapt resource value: 0x7F060031
+ public const int design_fab_shadow_start_color = 2131099697;
- // aapt resource value: 0x7f0d0040
- public const int design_fab_stroke_end_inner_color = 2131558464;
+ // aapt resource value: 0x7F060032
+ public const int design_fab_stroke_end_inner_color = 2131099698;
- // aapt resource value: 0x7f0d0041
- public const int design_fab_stroke_end_outer_color = 2131558465;
+ // aapt resource value: 0x7F060033
+ public const int design_fab_stroke_end_outer_color = 2131099699;
- // aapt resource value: 0x7f0d0042
- public const int design_fab_stroke_top_inner_color = 2131558466;
+ // aapt resource value: 0x7F060034
+ public const int design_fab_stroke_top_inner_color = 2131099700;
- // aapt resource value: 0x7f0d0043
- public const int design_fab_stroke_top_outer_color = 2131558467;
+ // aapt resource value: 0x7F060035
+ public const int design_fab_stroke_top_outer_color = 2131099701;
- // aapt resource value: 0x7f0d0044
- public const int design_snackbar_background_color = 2131558468;
+ // aapt resource value: 0x7F060036
+ public const int design_snackbar_background_color = 2131099702;
- // aapt resource value: 0x7f0d006e
- public const int design_tint_password_toggle = 2131558510;
+ // aapt resource value: 0x7F060037
+ public const int design_tint_password_toggle = 2131099703;
- // aapt resource value: 0x7f0d0012
- public const int dim_foreground_disabled_material_dark = 2131558418;
+ // aapt resource value: 0x7F060038
+ public const int dim_foreground_disabled_material_dark = 2131099704;
- // aapt resource value: 0x7f0d0013
- public const int dim_foreground_disabled_material_light = 2131558419;
+ // aapt resource value: 0x7F060039
+ public const int dim_foreground_disabled_material_light = 2131099705;
- // aapt resource value: 0x7f0d0014
- public const int dim_foreground_material_dark = 2131558420;
+ // aapt resource value: 0x7F06003A
+ public const int dim_foreground_material_dark = 2131099706;
- // aapt resource value: 0x7f0d0015
- public const int dim_foreground_material_light = 2131558421;
+ // aapt resource value: 0x7F06003B
+ public const int dim_foreground_material_light = 2131099707;
- // aapt resource value: 0x7f0d0016
- public const int error_color_material = 2131558422;
+ // aapt resource value: 0x7F06003C
+ public const int error_color_material = 2131099708;
- // aapt resource value: 0x7f0d0017
- public const int foreground_material_dark = 2131558423;
+ // aapt resource value: 0x7F06003D
+ public const int foreground_material_dark = 2131099709;
- // aapt resource value: 0x7f0d0018
- public const int foreground_material_light = 2131558424;
+ // aapt resource value: 0x7F06003E
+ public const int foreground_material_light = 2131099710;
- // aapt resource value: 0x7f0d004b
- public const int gd_top_view = 2131558475;
+ // aapt resource value: 0x7F06003F
+ public const int gd_top_view = 2131099711;
- // aapt resource value: 0x7f0d0019
- public const int highlighted_text_material_dark = 2131558425;
+ // aapt resource value: 0x7F060040
+ public const int highlighted_text_material_dark = 2131099712;
- // aapt resource value: 0x7f0d001a
- public const int highlighted_text_material_light = 2131558426;
+ // aapt resource value: 0x7F060041
+ public const int highlighted_text_material_light = 2131099713;
- // aapt resource value: 0x7f0d001b
- public const int material_blue_grey_800 = 2131558427;
+ // aapt resource value: 0x7F060042
+ public const int material_blue_grey_800 = 2131099714;
- // aapt resource value: 0x7f0d001c
- public const int material_blue_grey_900 = 2131558428;
+ // aapt resource value: 0x7F060043
+ public const int material_blue_grey_900 = 2131099715;
- // aapt resource value: 0x7f0d001d
- public const int material_blue_grey_950 = 2131558429;
+ // aapt resource value: 0x7F060044
+ public const int material_blue_grey_950 = 2131099716;
- // aapt resource value: 0x7f0d001e
- public const int material_deep_teal_200 = 2131558430;
+ // aapt resource value: 0x7F060045
+ public const int material_deep_teal_200 = 2131099717;
- // aapt resource value: 0x7f0d001f
- public const int material_deep_teal_500 = 2131558431;
+ // aapt resource value: 0x7F060046
+ public const int material_deep_teal_500 = 2131099718;
- // aapt resource value: 0x7f0d0020
- public const int material_grey_100 = 2131558432;
+ // aapt resource value: 0x7F060047
+ public const int material_grey_100 = 2131099719;
- // aapt resource value: 0x7f0d0021
- public const int material_grey_300 = 2131558433;
+ // aapt resource value: 0x7F060048
+ public const int material_grey_300 = 2131099720;
- // aapt resource value: 0x7f0d0022
- public const int material_grey_50 = 2131558434;
+ // aapt resource value: 0x7F060049
+ public const int material_grey_50 = 2131099721;
- // aapt resource value: 0x7f0d0023
- public const int material_grey_600 = 2131558435;
+ // aapt resource value: 0x7F06004A
+ public const int material_grey_600 = 2131099722;
- // aapt resource value: 0x7f0d0024
- public const int material_grey_800 = 2131558436;
+ // aapt resource value: 0x7F06004B
+ public const int material_grey_800 = 2131099723;
- // aapt resource value: 0x7f0d0025
- public const int material_grey_850 = 2131558437;
+ // aapt resource value: 0x7F06004C
+ public const int material_grey_850 = 2131099724;
- // aapt resource value: 0x7f0d0026
- public const int material_grey_900 = 2131558438;
+ // aapt resource value: 0x7F06004D
+ public const int material_grey_900 = 2131099725;
- // aapt resource value: 0x7f0d004a
- public const int material_red_500 = 2131558474;
+ // aapt resource value: 0x7F06004E
+ public const int material_red_500 = 2131099726;
- // aapt resource value: 0x7f0d0045
- public const int notification_action_color_filter = 2131558469;
+ // aapt resource value: 0x7F06004F
+ public const int notification_action_color_filter = 2131099727;
- // aapt resource value: 0x7f0d0046
- public const int notification_icon_bg_color = 2131558470;
+ // aapt resource value: 0x7F060050
+ public const int notification_icon_bg_color = 2131099728;
- // aapt resource value: 0x7f0d003b
- public const int notification_material_background_media_default_color = 2131558459;
+ // aapt resource value: 0x7F060051
+ public const int notification_material_background_media_default_color = 2131099729;
- // aapt resource value: 0x7f0d004c
- public const int pickerview_bgColor_default = 2131558476;
+ // aapt resource value: 0x7F060052
+ public const int pickerview_bgColor_default = 2131099730;
- // aapt resource value: 0x7f0d004d
- public const int pickerview_bgColor_overlay = 2131558477;
+ // aapt resource value: 0x7F060053
+ public const int pickerview_bgColor_overlay = 2131099731;
- // aapt resource value: 0x7f0d004e
- public const int pickerview_bg_topbar = 2131558478;
+ // aapt resource value: 0x7F060054
+ public const int pickerview_bg_topbar = 2131099732;
- // aapt resource value: 0x7f0d004f
- public const int pickerview_timebtn_nor = 2131558479;
+ // aapt resource value: 0x7F060055
+ public const int pickerview_timebtn_nor = 2131099733;
- // aapt resource value: 0x7f0d0050
- public const int pickerview_timebtn_pre = 2131558480;
+ // aapt resource value: 0x7F060056
+ public const int pickerview_timebtn_pre = 2131099734;
- // aapt resource value: 0x7f0d0051
- public const int pickerview_topbar_title = 2131558481;
+ // aapt resource value: 0x7F060057
+ public const int pickerview_topbar_title = 2131099735;
- // aapt resource value: 0x7f0d0052
- public const int pickerview_wheelview_textcolor_center = 2131558482;
+ // aapt resource value: 0x7F060058
+ public const int pickerview_wheelview_textcolor_center = 2131099736;
- // aapt resource value: 0x7f0d0053
- public const int pickerview_wheelview_textcolor_divider = 2131558483;
+ // aapt resource value: 0x7F060059
+ public const int pickerview_wheelview_textcolor_divider = 2131099737;
- // aapt resource value: 0x7f0d0054
- public const int pickerview_wheelview_textcolor_out = 2131558484;
+ // aapt resource value: 0x7F06005A
+ public const int pickerview_wheelview_textcolor_out = 2131099738;
- // aapt resource value: 0x7f0d0027
- public const int primary_dark_material_dark = 2131558439;
+ // aapt resource value: 0x7F06005B
+ public const int primary_dark_material_dark = 2131099739;
- // aapt resource value: 0x7f0d0028
- public const int primary_dark_material_light = 2131558440;
+ // aapt resource value: 0x7F06005C
+ public const int primary_dark_material_light = 2131099740;
- // aapt resource value: 0x7f0d0029
- public const int primary_material_dark = 2131558441;
+ // aapt resource value: 0x7F06005D
+ public const int primary_material_dark = 2131099741;
- // aapt resource value: 0x7f0d002a
- public const int primary_material_light = 2131558442;
+ // aapt resource value: 0x7F06005E
+ public const int primary_material_light = 2131099742;
- // aapt resource value: 0x7f0d002b
- public const int primary_text_default_material_dark = 2131558443;
+ // aapt resource value: 0x7F06005F
+ public const int primary_text_default_material_dark = 2131099743;
- // aapt resource value: 0x7f0d002c
- public const int primary_text_default_material_light = 2131558444;
+ // aapt resource value: 0x7F060060
+ public const int primary_text_default_material_light = 2131099744;
- // aapt resource value: 0x7f0d002d
- public const int primary_text_disabled_material_dark = 2131558445;
+ // aapt resource value: 0x7F060061
+ public const int primary_text_disabled_material_dark = 2131099745;
- // aapt resource value: 0x7f0d002e
- public const int primary_text_disabled_material_light = 2131558446;
+ // aapt resource value: 0x7F060062
+ public const int primary_text_disabled_material_light = 2131099746;
- // aapt resource value: 0x7f0d002f
- public const int ripple_material_dark = 2131558447;
+ // aapt resource value: 0x7F060063
+ public const int ripple_material_dark = 2131099747;
- // aapt resource value: 0x7f0d0030
- public const int ripple_material_light = 2131558448;
+ // aapt resource value: 0x7F060064
+ public const int ripple_material_light = 2131099748;
- // aapt resource value: 0x7f0d0031
- public const int secondary_text_default_material_dark = 2131558449;
+ // aapt resource value: 0x7F060065
+ public const int secondary_text_default_material_dark = 2131099749;
- // aapt resource value: 0x7f0d0032
- public const int secondary_text_default_material_light = 2131558450;
+ // aapt resource value: 0x7F060066
+ public const int secondary_text_default_material_light = 2131099750;
- // aapt resource value: 0x7f0d0033
- public const int secondary_text_disabled_material_dark = 2131558451;
+ // aapt resource value: 0x7F060067
+ public const int secondary_text_disabled_material_dark = 2131099751;
- // aapt resource value: 0x7f0d0034
- public const int secondary_text_disabled_material_light = 2131558452;
+ // aapt resource value: 0x7F060068
+ public const int secondary_text_disabled_material_light = 2131099752;
- // aapt resource value: 0x7f0d0035
- public const int switch_thumb_disabled_material_dark = 2131558453;
+ // aapt resource value: 0x7F060069
+ public const int switch_thumb_disabled_material_dark = 2131099753;
- // aapt resource value: 0x7f0d0036
- public const int switch_thumb_disabled_material_light = 2131558454;
+ // aapt resource value: 0x7F06006A
+ public const int switch_thumb_disabled_material_light = 2131099754;
- // aapt resource value: 0x7f0d006f
- public const int switch_thumb_material_dark = 2131558511;
+ // aapt resource value: 0x7F06006B
+ public const int switch_thumb_material_dark = 2131099755;
- // aapt resource value: 0x7f0d0070
- public const int switch_thumb_material_light = 2131558512;
+ // aapt resource value: 0x7F06006C
+ public const int switch_thumb_material_light = 2131099756;
- // aapt resource value: 0x7f0d0037
- public const int switch_thumb_normal_material_dark = 2131558455;
+ // aapt resource value: 0x7F06006D
+ public const int switch_thumb_normal_material_dark = 2131099757;
- // aapt resource value: 0x7f0d0038
- public const int switch_thumb_normal_material_light = 2131558456;
+ // aapt resource value: 0x7F06006E
+ public const int switch_thumb_normal_material_light = 2131099758;
- // aapt resource value: 0x7f0d0071
- public const int text_color = 2131558513;
+ // aapt resource value: 0x7F06006F
+ public const int text_color = 2131099759;
- // aapt resource value: 0x7f0d0039
- public const int tooltip_background_dark = 2131558457;
+ // aapt resource value: 0x7F060070
+ public const int tooltip_background_dark = 2131099760;
- // aapt resource value: 0x7f0d003a
- public const int tooltip_background_light = 2131558458;
+ // aapt resource value: 0x7F060071
+ public const int tooltip_background_light = 2131099761;
static Color()
{
@@ -2050,491 +2050,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()
{
@@ -2549,554 +2549,533 @@
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+ // aapt resource value: 0x7F080007
+ public const int abc_ab_share_pack_mtrl_alpha = 2131230727;
- // aapt resource value: 0x7f020001
- public const int abc_action_bar_item_background_material = 2130837505;
+ // aapt resource value: 0x7F080008
+ public const int abc_action_bar_item_background_material = 2131230728;
- // aapt resource value: 0x7f020002
- public const int abc_btn_borderless_material = 2130837506;
+ // aapt resource value: 0x7F080009
+ public const int abc_btn_borderless_material = 2131230729;
- // aapt resource value: 0x7f020003
- public const int abc_btn_check_material = 2130837507;
+ // aapt resource value: 0x7F08000A
+ public const int abc_btn_check_material = 2131230730;
- // aapt resource value: 0x7f020004
- public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+ // aapt resource value: 0x7F08000B
+ public const int abc_btn_check_to_on_mtrl_000 = 2131230731;
- // aapt resource value: 0x7f020005
- public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+ // aapt resource value: 0x7F08000C
+ public const int abc_btn_check_to_on_mtrl_015 = 2131230732;
- // aapt resource value: 0x7f020006
- public const int abc_btn_colored_material = 2130837510;
+ // aapt resource value: 0x7F08000D
+ public const int abc_btn_colored_material = 2131230733;
- // aapt resource value: 0x7f020007
- public const int abc_btn_default_mtrl_shape = 2130837511;
+ // aapt resource value: 0x7F08000E
+ public const int abc_btn_default_mtrl_shape = 2131230734;
- // aapt resource value: 0x7f020008
- public const int abc_btn_radio_material = 2130837512;
+ // aapt resource value: 0x7F08000F
+ public const int abc_btn_radio_material = 2131230735;
- // aapt resource value: 0x7f020009
- public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+ // aapt resource value: 0x7F080010
+ public const int abc_btn_radio_to_on_mtrl_000 = 2131230736;
- // aapt resource value: 0x7f02000a
- public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+ // aapt resource value: 0x7F080011
+ public const int abc_btn_radio_to_on_mtrl_015 = 2131230737;
- // aapt resource value: 0x7f02000b
- public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+ // aapt resource value: 0x7F080012
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2131230738;
- // aapt resource value: 0x7f02000c
- public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+ // aapt resource value: 0x7F080013
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2131230739;
- // aapt resource value: 0x7f02000d
- public const int abc_cab_background_internal_bg = 2130837517;
+ // aapt resource value: 0x7F080014
+ public const int abc_cab_background_internal_bg = 2131230740;
- // aapt resource value: 0x7f02000e
- public const int abc_cab_background_top_material = 2130837518;
+ // aapt resource value: 0x7F080015
+ public const int abc_cab_background_top_material = 2131230741;
- // aapt resource value: 0x7f02000f
- public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+ // aapt resource value: 0x7F080016
+ public const int abc_cab_background_top_mtrl_alpha = 2131230742;
- // aapt resource value: 0x7f020010
- public const int abc_control_background_material = 2130837520;
+ // aapt resource value: 0x7F080017
+ public const int abc_control_background_material = 2131230743;
- // aapt resource value: 0x7f020011
- public const int abc_dialog_material_background = 2130837521;
+ // aapt resource value: 0x7F080018
+ public const int abc_dialog_material_background = 2131230744;
- // aapt resource value: 0x7f020012
- public const int abc_edit_text_material = 2130837522;
+ // aapt resource value: 0x7F080019
+ public const int abc_edit_text_material = 2131230745;
- // aapt resource value: 0x7f020013
- public const int abc_ic_ab_back_material = 2130837523;
+ // aapt resource value: 0x7F08001A
+ public const int abc_ic_ab_back_material = 2131230746;
- // aapt resource value: 0x7f020014
- public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+ // aapt resource value: 0x7F08001B
+ public const int abc_ic_arrow_drop_right_black_24dp = 2131230747;
- // aapt resource value: 0x7f020015
- public const int abc_ic_clear_material = 2130837525;
+ // aapt resource value: 0x7F08001C
+ public const int abc_ic_clear_material = 2131230748;
- // aapt resource value: 0x7f020016
- public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+ // aapt resource value: 0x7F08001D
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2131230749;
- // aapt resource value: 0x7f020017
- public const int abc_ic_go_search_api_material = 2130837527;
+ // aapt resource value: 0x7F08001E
+ public const int abc_ic_go_search_api_material = 2131230750;
- // aapt resource value: 0x7f020018
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+ // aapt resource value: 0x7F08001F
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230751;
- // aapt resource value: 0x7f020019
- public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+ // aapt resource value: 0x7F080020
+ public const int abc_ic_menu_cut_mtrl_alpha = 2131230752;
- // aapt resource value: 0x7f02001a
- public const int abc_ic_menu_overflow_material = 2130837530;
+ // aapt resource value: 0x7F080021
+ public const int abc_ic_menu_overflow_material = 2131230753;
- // aapt resource value: 0x7f02001b
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+ // aapt resource value: 0x7F080022
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230754;
- // aapt resource value: 0x7f02001c
- public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+ // aapt resource value: 0x7F080023
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2131230755;
- // aapt resource value: 0x7f02001d
- public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+ // aapt resource value: 0x7F080024
+ public const int abc_ic_menu_share_mtrl_alpha = 2131230756;
- // aapt resource value: 0x7f02001e
- public const int abc_ic_search_api_material = 2130837534;
+ // aapt resource value: 0x7F080025
+ public const int abc_ic_search_api_material = 2131230757;
- // aapt resource value: 0x7f02001f
- public const int abc_ic_star_black_16dp = 2130837535;
+ // aapt resource value: 0x7F080026
+ public const int abc_ic_star_black_16dp = 2131230758;
- // aapt resource value: 0x7f020020
- public const int abc_ic_star_black_36dp = 2130837536;
+ // aapt resource value: 0x7F080027
+ public const int abc_ic_star_black_36dp = 2131230759;
- // aapt resource value: 0x7f020021
- public const int abc_ic_star_black_48dp = 2130837537;
+ // aapt resource value: 0x7F080028
+ public const int abc_ic_star_black_48dp = 2131230760;
- // aapt resource value: 0x7f020022
- public const int abc_ic_star_half_black_16dp = 2130837538;
+ // aapt resource value: 0x7F080029
+ public const int abc_ic_star_half_black_16dp = 2131230761;
- // aapt resource value: 0x7f020023
- public const int abc_ic_star_half_black_36dp = 2130837539;
+ // aapt resource value: 0x7F08002A
+ public const int abc_ic_star_half_black_36dp = 2131230762;
- // aapt resource value: 0x7f020024
- public const int abc_ic_star_half_black_48dp = 2130837540;
+ // aapt resource value: 0x7F08002B
+ public const int abc_ic_star_half_black_48dp = 2131230763;
- // aapt resource value: 0x7f020025
- public const int abc_ic_voice_search_api_material = 2130837541;
+ // aapt resource value: 0x7F08002C
+ public const int abc_ic_voice_search_api_material = 2131230764;
- // aapt resource value: 0x7f020026
- public const int abc_item_background_holo_dark = 2130837542;
+ // aapt resource value: 0x7F08002D
+ public const int abc_item_background_holo_dark = 2131230765;
- // aapt resource value: 0x7f020027
- public const int abc_item_background_holo_light = 2130837543;
+ // aapt resource value: 0x7F08002E
+ public const int abc_item_background_holo_light = 2131230766;
- // aapt resource value: 0x7f020028
- public const int abc_list_divider_mtrl_alpha = 2130837544;
+ // aapt resource value: 0x7F08002F
+ public const int abc_list_divider_mtrl_alpha = 2131230767;
- // aapt resource value: 0x7f020029
- public const int abc_list_focused_holo = 2130837545;
+ // aapt resource value: 0x7F080030
+ public const int abc_list_focused_holo = 2131230768;
- // aapt resource value: 0x7f02002a
- public const int abc_list_longpressed_holo = 2130837546;
+ // aapt resource value: 0x7F080031
+ public const int abc_list_longpressed_holo = 2131230769;
- // aapt resource value: 0x7f02002b
- public const int abc_list_pressed_holo_dark = 2130837547;
+ // aapt resource value: 0x7F080032
+ public const int abc_list_pressed_holo_dark = 2131230770;
- // aapt resource value: 0x7f02002c
- public const int abc_list_pressed_holo_light = 2130837548;
+ // aapt resource value: 0x7F080033
+ public const int abc_list_pressed_holo_light = 2131230771;
- // aapt resource value: 0x7f02002d
- public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+ // aapt resource value: 0x7F080034
+ public const int abc_list_selector_background_transition_holo_dark = 2131230772;
- // aapt resource value: 0x7f02002e
- public const int abc_list_selector_background_transition_holo_light = 2130837550;
+ // aapt resource value: 0x7F080035
+ public const int abc_list_selector_background_transition_holo_light = 2131230773;
- // aapt resource value: 0x7f02002f
- public const int abc_list_selector_disabled_holo_dark = 2130837551;
+ // aapt resource value: 0x7F080036
+ public const int abc_list_selector_disabled_holo_dark = 2131230774;
- // aapt resource value: 0x7f020030
- public const int abc_list_selector_disabled_holo_light = 2130837552;
+ // aapt resource value: 0x7F080037
+ public const int abc_list_selector_disabled_holo_light = 2131230775;
- // aapt resource value: 0x7f020031
- public const int abc_list_selector_holo_dark = 2130837553;
+ // aapt resource value: 0x7F080038
+ public const int abc_list_selector_holo_dark = 2131230776;
- // aapt resource value: 0x7f020032
- public const int abc_list_selector_holo_light = 2130837554;
+ // aapt resource value: 0x7F080039
+ public const int abc_list_selector_holo_light = 2131230777;
- // aapt resource value: 0x7f020033
- public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+ // aapt resource value: 0x7F08003A
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2131230778;
- // aapt resource value: 0x7f020034
- public const int abc_popup_background_mtrl_mult = 2130837556;
+ // aapt resource value: 0x7F08003B
+ public const int abc_popup_background_mtrl_mult = 2131230779;
- // aapt resource value: 0x7f020035
- public const int abc_ratingbar_indicator_material = 2130837557;
+ // aapt resource value: 0x7F08003C
+ public const int abc_ratingbar_indicator_material = 2131230780;
- // aapt resource value: 0x7f020036
- public const int abc_ratingbar_material = 2130837558;
+ // aapt resource value: 0x7F08003D
+ public const int abc_ratingbar_material = 2131230781;
- // aapt resource value: 0x7f020037
- public const int abc_ratingbar_small_material = 2130837559;
+ // aapt resource value: 0x7F08003E
+ public const int abc_ratingbar_small_material = 2131230782;
- // aapt resource value: 0x7f020038
- public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+ // aapt resource value: 0x7F08003F
+ public const int abc_scrubber_control_off_mtrl_alpha = 2131230783;
- // aapt resource value: 0x7f020039
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+ // aapt resource value: 0x7F080040
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230784;
- // aapt resource value: 0x7f02003a
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+ // aapt resource value: 0x7F080041
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230785;
- // aapt resource value: 0x7f02003b
- public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+ // aapt resource value: 0x7F080042
+ public const int abc_scrubber_primary_mtrl_alpha = 2131230786;
- // aapt resource value: 0x7f02003c
- public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+ // aapt resource value: 0x7F080043
+ public const int abc_scrubber_track_mtrl_alpha = 2131230787;
- // aapt resource value: 0x7f02003d
- public const int abc_seekbar_thumb_material = 2130837565;
+ // aapt resource value: 0x7F080044
+ public const int abc_seekbar_thumb_material = 2131230788;
- // aapt resource value: 0x7f02003e
- public const int abc_seekbar_tick_mark_material = 2130837566;
+ // aapt resource value: 0x7F080045
+ public const int abc_seekbar_tick_mark_material = 2131230789;
- // aapt resource value: 0x7f02003f
- public const int abc_seekbar_track_material = 2130837567;
+ // aapt resource value: 0x7F080046
+ public const int abc_seekbar_track_material = 2131230790;
- // aapt resource value: 0x7f020040
- public const int abc_spinner_mtrl_am_alpha = 2130837568;
+ // aapt resource value: 0x7F080047
+ public const int abc_spinner_mtrl_am_alpha = 2131230791;
- // aapt resource value: 0x7f020041
- public const int abc_spinner_textfield_background_material = 2130837569;
+ // aapt resource value: 0x7F080048
+ public const int abc_spinner_textfield_background_material = 2131230792;
- // aapt resource value: 0x7f020042
- public const int abc_switch_thumb_material = 2130837570;
+ // aapt resource value: 0x7F080049
+ public const int abc_switch_thumb_material = 2131230793;
- // aapt resource value: 0x7f020043
- public const int abc_switch_track_mtrl_alpha = 2130837571;
+ // aapt resource value: 0x7F08004A
+ public const int abc_switch_track_mtrl_alpha = 2131230794;
- // aapt resource value: 0x7f020044
- public const int abc_tab_indicator_material = 2130837572;
+ // aapt resource value: 0x7F08004B
+ public const int abc_tab_indicator_material = 2131230795;
- // aapt resource value: 0x7f020045
- public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+ // aapt resource value: 0x7F08004C
+ public const int abc_tab_indicator_mtrl_alpha = 2131230796;
- // aapt resource value: 0x7f020046
- public const int abc_text_cursor_material = 2130837574;
+ // aapt resource value: 0x7F080054
+ public const int abc_textfield_activated_mtrl_alpha = 2131230804;
- // aapt resource value: 0x7f020047
- public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+ // aapt resource value: 0x7F080055
+ public const int abc_textfield_default_mtrl_alpha = 2131230805;
- // aapt resource value: 0x7f020048
- public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+ // aapt resource value: 0x7F080056
+ public const int abc_textfield_search_activated_mtrl_alpha = 2131230806;
- // aapt resource value: 0x7f020049
- public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+ // aapt resource value: 0x7F080057
+ public const int abc_textfield_search_default_mtrl_alpha = 2131230807;
- // aapt resource value: 0x7f02004a
- public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+ // aapt resource value: 0x7F080058
+ public const int abc_textfield_search_material = 2131230808;
- // aapt resource value: 0x7f02004b
- public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
+ // aapt resource value: 0x7F08004D
+ public const int abc_text_cursor_material = 2131230797;
- // aapt resource value: 0x7f02004c
- public const int abc_text_select_handle_right_mtrl_light = 2130837580;
+ // aapt resource value: 0x7F08004E
+ public const int abc_text_select_handle_left_mtrl_dark = 2131230798;
- // aapt resource value: 0x7f02004d
- public const int abc_textfield_activated_mtrl_alpha = 2130837581;
+ // aapt resource value: 0x7F08004F
+ public const int abc_text_select_handle_left_mtrl_light = 2131230799;
- // aapt resource value: 0x7f02004e
- public const int abc_textfield_default_mtrl_alpha = 2130837582;
+ // aapt resource value: 0x7F080050
+ public const int abc_text_select_handle_middle_mtrl_dark = 2131230800;
- // aapt resource value: 0x7f02004f
- public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
+ // aapt resource value: 0x7F080051
+ public const int abc_text_select_handle_middle_mtrl_light = 2131230801;
- // aapt resource value: 0x7f020050
- public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
+ // aapt resource value: 0x7F080052
+ public const int abc_text_select_handle_right_mtrl_dark = 2131230802;
- // aapt resource value: 0x7f020051
- public const int abc_textfield_search_material = 2130837585;
+ // aapt resource value: 0x7F080053
+ public const int abc_text_select_handle_right_mtrl_light = 2131230803;
- // aapt resource value: 0x7f020052
- public const int abc_vector_test = 2130837586;
+ // aapt resource value: 0x7F080059
+ public const int abc_vector_test = 2131230809;
- // aapt resource value: 0x7f020053
- public const int avd_hide_password = 2130837587;
+ // aapt resource value: 0x7F08005A
+ public const int avd_hide_password = 2131230810;
- // aapt resource value: 0x7f0200b0
- public const int avd_hide_password_1 = 2130837680;
+ // aapt resource value: 0x7F08005B
+ public const int avd_show_password = 2131230811;
- // aapt resource value: 0x7f0200b1
- public const int avd_hide_password_2 = 2130837681;
+ // aapt resource value: 0x7F08005C
+ public const int back = 2131230812;
- // aapt resource value: 0x7f0200b2
- public const int avd_hide_password_3 = 2130837682;
+ // aapt resource value: 0x7F08005D
+ public const int call = 2131230813;
- // aapt resource value: 0x7f020054
- public const int avd_show_password = 2130837588;
+ // aapt resource value: 0x7F08005E
+ public const int design_bottom_navigation_item_background = 2131230814;
- // aapt resource value: 0x7f0200b3
- public const int avd_show_password_1 = 2130837683;
+ // aapt resource value: 0x7F08005F
+ public const int design_fab_background = 2131230815;
- // aapt resource value: 0x7f0200b4
- public const int avd_show_password_2 = 2130837684;
+ // aapt resource value: 0x7F080060
+ public const int design_ic_visibility = 2131230816;
- // aapt resource value: 0x7f0200b5
- public const int avd_show_password_3 = 2130837685;
-
- // aapt resource value: 0x7f020055
- public const int back = 2130837589;
-
- // aapt resource value: 0x7f020056
- public const int call = 2130837590;
-
- // aapt resource value: 0x7f020057
- public const int design_bottom_navigation_item_background = 2130837591;
-
- // aapt resource value: 0x7f020058
- public const int design_fab_background = 2130837592;
-
- // aapt resource value: 0x7f020059
- public const int design_ic_visibility = 2130837593;
-
- // aapt resource value: 0x7f02005a
- public const int design_ic_visibility_off = 2130837594;
-
- // aapt resource value: 0x7f02005b
- public const int design_password_eye = 2130837595;
+ // aapt resource value: 0x7F080061
+ public const int design_ic_visibility_off = 2131230817;
- // aapt resource value: 0x7f02005c
- public const int design_snackbar_background = 2130837596;
+ // aapt resource value: 0x7F080062
+ public const int design_password_eye = 2131230818;
- // aapt resource value: 0x7f02005d
- public const int dialog_background = 2130837597;
+ // aapt resource value: 0x7F080063
+ public const int design_snackbar_background = 2131230819;
- // aapt resource value: 0x7f02005e
- public const int fingerprint_draw_off = 2130837598;
+ // aapt resource value: 0x7F080064
+ public const int dialog_background = 2131230820;
- // aapt resource value: 0x7f02005f
- public const int fingerprint_draw_off_animation = 2130837599;
+ // aapt resource value: 0x7F080065
+ public const int fingerprint_draw_off = 2131230821;
- // aapt resource value: 0x7f020060
- public const int fingerprint_draw_on = 2130837600;
+ // aapt resource value: 0x7F080066
+ public const int fingerprint_draw_off_animation = 2131230822;
- // aapt resource value: 0x7f020061
- public const int fingerprint_draw_on_animation = 2130837601;
+ // aapt resource value: 0x7F080067
+ public const int fingerprint_draw_on = 2131230823;
- // aapt resource value: 0x7f020062
- public const int fingerprint_error = 2130837602;
+ // aapt resource value: 0x7F080068
+ public const int fingerprint_draw_on_animation = 2131230824;
- // aapt resource value: 0x7f020063
- public const int fingerprint_error_off = 2130837603;
+ // aapt resource value: 0x7F080069
+ public const int fingerprint_error = 2131230825;
- // aapt resource value: 0x7f020064
- public const int fingerprint_error_off_animation = 2130837604;
+ // aapt resource value: 0x7F08006A
+ public const int fingerprint_error_off = 2131230826;
- // aapt resource value: 0x7f020065
- public const int fingerprint_error_on = 2130837605;
+ // aapt resource value: 0x7F08006B
+ public const int fingerprint_error_off_animation = 2131230827;
- // aapt resource value: 0x7f020066
- public const int fingerprint_error_on_animation = 2130837606;
+ // aapt resource value: 0x7F08006C
+ public const int fingerprint_error_on = 2131230828;
- // aapt resource value: 0x7f020067
- public const int fingerprint_error_state_to_fp = 2130837607;
+ // aapt resource value: 0x7F08006D
+ public const int fingerprint_error_on_animation = 2131230829;
- // aapt resource value: 0x7f020068
- public const int fingerprint_error_state_to_fp_animation = 2130837608;
+ // aapt resource value: 0x7F08006E
+ public const int fingerprint_error_state_to_fp = 2131230830;
- // aapt resource value: 0x7f020069
- public const int fingerprint_fingerprint = 2130837609;
+ // aapt resource value: 0x7F08006F
+ public const int fingerprint_error_state_to_fp_animation = 2131230831;
- // aapt resource value: 0x7f02006a
- public const int fingerprint_fp_to_error_state = 2130837610;
+ // aapt resource value: 0x7F080070
+ public const int fingerprint_fingerprint = 2131230832;
- // aapt resource value: 0x7f02006b
- public const int fingerprint_fp_to_error_state_animation = 2130837611;
+ // aapt resource value: 0x7F080071
+ public const int fingerprint_fp_to_error_state = 2131230833;
- // aapt resource value: 0x7f02006c
- public const int floor = 2130837612;
+ // aapt resource value: 0x7F080072
+ public const int fingerprint_fp_to_error_state_animation = 2131230834;
- // aapt resource value: 0x7f02006d
- public const int gd_btn_shape_app_b = 2130837613;
+ // aapt resource value: 0x7F080073
+ public const int floor = 2131230835;
- // aapt resource value: 0x7f02006e
- public const int gd_btn_shape_app_g = 2130837614;
+ // aapt resource value: 0x7F080074
+ public const int gd_btn_shape_app_b = 2131230836;
- // aapt resource value: 0x7f02006f
- public const int gd_btn_shape_app_w = 2130837615;
+ // aapt resource value: 0x7F080075
+ public const int gd_btn_shape_app_g = 2131230837;
- // aapt resource value: 0x7f020070
- public const int gd_btn_shape_shadow_w = 2130837616;
+ // aapt resource value: 0x7F080076
+ public const int gd_btn_shape_app_w = 2131230838;
- // aapt resource value: 0x7f020071
- public const int gd_click_effect_select = 2130837617;
+ // aapt resource value: 0x7F080077
+ public const int gd_btn_shape_shadow_w = 2131230839;
- // aapt resource value: 0x7f020072
- public const int hangup = 2130837618;
+ // aapt resource value: 0x7F080078
+ public const int gd_click_effect_select = 2131230840;
- // aapt resource value: 0x7f020073
- public const int ic_gdmap_add = 2130837619;
+ // aapt resource value: 0x7F080079
+ public const int hangup = 2131230841;
- // aapt resource value: 0x7f020074
- public const int ic_gdmap_back = 2130837620;
+ // aapt resource value: 0x7F08009A
+ public const int Icon = 2131230874;
- // aapt resource value: 0x7f020075
- public const int ic_gdmap_delete = 2130837621;
+ // aapt resource value: 0x7F08007A
+ public const int ic_gdmap_add = 2131230842;
- // aapt resource value: 0x7f020076
- public const int ic_gdmap_home = 2130837622;
+ // aapt resource value: 0x7F08007B
+ public const int ic_gdmap_back = 2131230843;
- // aapt resource value: 0x7f020077
- public const int ic_gdmap_mylocation = 2130837623;
+ // aapt resource value: 0x7F08007C
+ public const int ic_gdmap_delete = 2131230844;
- // aapt resource value: 0x7f020078
- public const int ic_gdmap_now = 2130837624;
+ // aapt resource value: 0x7F08007D
+ public const int ic_gdmap_home = 2131230845;
- // aapt resource value: 0x7f020079
- public const int ic_gdmap_search = 2130837625;
+ // aapt resource value: 0x7F08007E
+ public const int ic_gdmap_mylocation = 2131230846;
- // aapt resource value: 0x7f02007a
- public const int ic_gdmap_zoom_out = 2130837626;
+ // aapt resource value: 0x7F08007F
+ public const int ic_gdmap_now = 2131230847;
- // aapt resource value: 0x7f02007b
- public const int ic_gps_point = 2130837627;
+ // aapt resource value: 0x7F080080
+ public const int ic_gdmap_search = 2131230848;
- // aapt resource value: 0x7f02007c
- public const int ic_launcher_background = 2130837628;
+ // aapt resource value: 0x7F080081
+ public const int ic_gdmap_zoom_out = 2131230849;
- // aapt resource value: 0x7f02007d
- public const int ic_launcher_foreground = 2130837629;
+ // aapt resource value: 0x7F080082
+ public const int ic_gps_point = 2131230850;
- // aapt resource value: 0x7f0200b6
- public const int ic_launcher_foreground_1 = 2130837686;
+ // aapt resource value: 0x7F080083
+ public const int ic_launcher_background = 2131230851;
- // aapt resource value: 0x7f02007e
- public const int ic_wd_arc_scale_bg = 2130837630;
+ // aapt resource value: 0x7F080084
+ public const int ic_launcher_foreground = 2131230852;
- // aapt resource value: 0x7f02007f
- public const int ic_wd_curtain_bg_top = 2130837631;
+ // aapt resource value: 0x7F080085
+ public const int ic_wd_arc_scale_bg = 2131230853;
- // aapt resource value: 0x7f020080
- public const int ic_wd_curtain_h_bg = 2130837632;
+ // aapt resource value: 0x7F080086
+ public const int ic_wd_curtain_bg_top = 2131230854;
- // aapt resource value: 0x7f020081
- public const int ic_wd_curtain_h_open = 2130837633;
+ // aapt resource value: 0x7F080087
+ public const int ic_wd_curtain_h_bg = 2131230855;
- // aapt resource value: 0x7f020082
- public const int ic_wd_curtain_h_progress = 2130837634;
+ // aapt resource value: 0x7F080088
+ public const int ic_wd_curtain_h_open = 2131230856;
- // aapt resource value: 0x7f020083
- public const int ic_wd_curtain_h_top = 2130837635;
+ // aapt resource value: 0x7F080089
+ public const int ic_wd_curtain_h_progress = 2131230857;
- // aapt resource value: 0x7f020084
- public const int ic_wd_curtain_open = 2130837636;
+ // aapt resource value: 0x7F08008A
+ public const int ic_wd_curtain_h_top = 2131230858;
- // aapt resource value: 0x7f020085
- public const int ic_wd_curtain_roll_bg = 2130837637;
+ // aapt resource value: 0x7F08008B
+ public const int ic_wd_curtain_open = 2131230859;
- // aapt resource value: 0x7f020086
- public const int ic_wd_curtain_roll_progress = 2130837638;
+ // aapt resource value: 0x7F08008C
+ public const int ic_wd_curtain_roll_bg = 2131230860;
- // aapt resource value: 0x7f020087
- public const int ic_wd_on_curtain_blinds_progress = 2130837639;
+ // aapt resource value: 0x7F08008D
+ public const int ic_wd_curtain_roll_progress = 2131230861;
- // aapt resource value: 0x7f020088
- public const int ic_wd_on_curtain_blinds_progress2 = 2130837640;
+ // aapt resource value: 0x7F08008E
+ public const int ic_wd_on_curtain_blinds_progress = 2131230862;
- // aapt resource value: 0x7f020089
- public const int ic_wd_on_curtain_blinds_progress_close = 2130837641;
+ // aapt resource value: 0x7F08008F
+ public const int ic_wd_on_curtain_blinds_progress2 = 2131230863;
- // aapt resource value: 0x7f02008a
- public const int ic_wd_on_curtain_blinds_progress_close2 = 2130837642;
+ // aapt resource value: 0x7F080090
+ public const int ic_wd_on_curtain_blinds_progress_close = 2131230864;
- // aapt resource value: 0x7f02008b
- public const int ic_wd_on_curtain_h_bg = 2130837643;
+ // aapt resource value: 0x7F080091
+ public const int ic_wd_on_curtain_blinds_progress_close2 = 2131230865;
- // aapt resource value: 0x7f02008c
- public const int ic_wd_on_curtain_h_open = 2130837644;
+ // aapt resource value: 0x7F080092
+ public const int ic_wd_on_curtain_h_bg = 2131230866;
- // aapt resource value: 0x7f02008d
- public const int ic_wd_on_curtain_h_progress = 2130837645;
+ // aapt resource value: 0x7F080093
+ public const int ic_wd_on_curtain_h_open = 2131230867;
- // aapt resource value: 0x7f02008e
- public const int ic_wd_on_curtain_h_progress_close = 2130837646;
+ // aapt resource value: 0x7F080094
+ public const int ic_wd_on_curtain_h_progress = 2131230868;
- // aapt resource value: 0x7f02008f
- public const int ic_wd_on_curtain_open = 2130837647;
+ // aapt resource value: 0x7F080095
+ public const int ic_wd_on_curtain_h_progress_close = 2131230869;
- // aapt resource value: 0x7f020090
- public const int ic_wd_on_curtain_roll_bg = 2130837648;
+ // aapt resource value: 0x7F080096
+ public const int ic_wd_on_curtain_open = 2131230870;
- // aapt resource value: 0x7f020091
- public const int ic_wd_on_curtain_roll_progress = 2130837649;
+ // aapt resource value: 0x7F080097
+ public const int ic_wd_on_curtain_roll_bg = 2131230871;
- // aapt resource value: 0x7f020092
- public const int ic_wd_on_curtain_roll_progress_close = 2130837650;
+ // aapt resource value: 0x7F080098
+ public const int ic_wd_on_curtain_roll_progress = 2131230872;
- // aapt resource value: 0x7f020093
- public const int Icon = 2130837651;
+ // aapt resource value: 0x7F080099
+ public const int ic_wd_on_curtain_roll_progress_close = 2131230873;
- // aapt resource value: 0x7f020094
- public const int Loading = 2130837652;
+ // aapt resource value: 0x7F08009B
+ public const int Loading = 2131230875;
- // aapt resource value: 0x7f020095
- public const int navigation_empty_icon = 2130837653;
+ // aapt resource value: 0x7F08009C
+ public const int navigation_empty_icon = 2131230876;
- // aapt resource value: 0x7f020096
- public const int notification_action_background = 2130837654;
+ // aapt resource value: 0x7F08009D
+ public const int notification_action_background = 2131230877;
- // aapt resource value: 0x7f020097
- public const int notification_bg = 2130837655;
+ // aapt resource value: 0x7F08009E
+ public const int notification_bg = 2131230878;
- // aapt resource value: 0x7f020098
- public const int notification_bg_low = 2130837656;
+ // aapt resource value: 0x7F08009F
+ public const int notification_bg_low = 2131230879;
- // aapt resource value: 0x7f020099
- public const int notification_bg_low_normal = 2130837657;
+ // aapt resource value: 0x7F0800A0
+ public const int notification_bg_low_normal = 2131230880;
- // aapt resource value: 0x7f02009a
- public const int notification_bg_low_pressed = 2130837658;
+ // aapt resource value: 0x7F0800A1
+ public const int notification_bg_low_pressed = 2131230881;
- // aapt resource value: 0x7f02009b
- public const int notification_bg_normal = 2130837659;
+ // aapt resource value: 0x7F0800A2
+ public const int notification_bg_normal = 2131230882;
- // aapt resource value: 0x7f02009c
- public const int notification_bg_normal_pressed = 2130837660;
+ // aapt resource value: 0x7F0800A3
+ public const int notification_bg_normal_pressed = 2131230883;
- // aapt resource value: 0x7f02009d
- public const int notification_icon_background = 2130837661;
+ // aapt resource value: 0x7F0800A4
+ public const int notification_icon_background = 2131230884;
- // aapt resource value: 0x7f0200ae
- public const int notification_template_icon_bg = 2130837678;
+ // aapt resource value: 0x7F0800A5
+ public const int notification_template_icon_bg = 2131230885;
- // aapt resource value: 0x7f0200af
- public const int notification_template_icon_low_bg = 2130837679;
+ // aapt resource value: 0x7F0800A6
+ public const int notification_template_icon_low_bg = 2131230886;
- // aapt resource value: 0x7f02009e
- public const int notification_tile_bg = 2130837662;
+ // aapt resource value: 0x7F0800A7
+ public const int notification_tile_bg = 2131230887;
- // aapt resource value: 0x7f02009f
- public const int notify_panel_notification_icon_bg = 2130837663;
+ // aapt resource value: 0x7F0800A8
+ public const int notify_panel_notification_icon_bg = 2131230888;
- // aapt resource value: 0x7f0200a0
- public const int screenshot = 2130837664;
+ // aapt resource value: 0x7F0800A9
+ public const int screenshot = 2131230889;
- // aapt resource value: 0x7f0200a1
- public const int screenshot_def = 2130837665;
+ // aapt resource value: 0x7F0800AA
+ public const int screenshot_def = 2131230890;
- // aapt resource value: 0x7f0200a2
- public const int screenshot_sel = 2130837666;
+ // aapt resource value: 0x7F0800AB
+ public const int screenshot_sel = 2131230891;
- // aapt resource value: 0x7f0200a3
- public const int selector_pickerview_btn = 2130837667;
+ // aapt resource value: 0x7F0800AC
+ public const int selector_pickerview_btn = 2131230892;
- // aapt resource value: 0x7f0200a4
- public const int sure_background_def = 2130837668;
+ // aapt resource value: 0x7F0800AD
+ public const int sure_background_def = 2131230893;
- // aapt resource value: 0x7f0200a5
- public const int sure_background_sel = 2130837669;
+ // aapt resource value: 0x7F0800AE
+ public const int sure_background_sel = 2131230894;
- // aapt resource value: 0x7f0200a6
- public const int tip_background = 2130837670;
+ // aapt resource value: 0x7F0800AF
+ public const int tip_background = 2131230895;
- // aapt resource value: 0x7f0200a7
- public const int tooltip_frame_dark = 2130837671;
+ // aapt resource value: 0x7F0800B0
+ public const int tooltip_frame_dark = 2131230896;
- // aapt resource value: 0x7f0200a8
- public const int tooltip_frame_light = 2130837672;
+ // aapt resource value: 0x7F0800B1
+ public const int tooltip_frame_light = 2131230897;
- // aapt resource value: 0x7f0200a9
- public const int unlock = 2130837673;
+ // aapt resource value: 0x7F0800B2
+ public const int unlock = 2131230898;
- // aapt resource value: 0x7f0200aa
- public const int unlock_def = 2130837674;
+ // aapt resource value: 0x7F0800B3
+ public const int unlock_def = 2131230899;
- // aapt resource value: 0x7f0200ab
- public const int unlock_disable = 2130837675;
+ // aapt resource value: 0x7F0800B4
+ public const int unlock_disable = 2131230900;
- // aapt resource value: 0x7f0200ac
- public const int unlock_sel = 2130837676;
+ // aapt resource value: 0x7F0800B5
+ public const int unlock_sel = 2131230901;
- // aapt resource value: 0x7f0200ad
- public const int video_background = 2130837677;
+ // aapt resource value: 0x7F0800B6
+ public const int video_background = 2131230902;
static Drawable()
{
@@ -3111,902 +3090,902 @@
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: 0x7f09008e
- public const int Custom = 2131296398;
+ // aapt resource value: 0x7F090016
+ public const int action_bar = 2131296278;
- // aapt resource value: 0x7f09008d
- public const int CustomLabel = 2131296397;
+ // aapt resource value: 0x7F090017
+ public const int action_bar_activity_content = 2131296279;
- // aapt resource value: 0x7f090054
- public const int FILL = 2131296340;
+ // aapt resource value: 0x7F090018
+ public const int action_bar_container = 2131296280;
- // aapt resource value: 0x7f090055
- public const int FILL_STROKE = 2131296341;
+ // aapt resource value: 0x7F090019
+ public const int action_bar_root = 2131296281;
- // aapt resource value: 0x7f090029
- public const int FUNCTION = 2131296297;
+ // aapt resource value: 0x7F09001A
+ public const int action_bar_spinner = 2131296282;
- // aapt resource value: 0x7f09004f
- public const int FixedBehind = 2131296335;
+ // aapt resource value: 0x7F09001B
+ public const int action_bar_subtitle = 2131296283;
- // aapt resource value: 0x7f090050
- public const int FixedFront = 2131296336;
+ // aapt resource value: 0x7F09001C
+ public const int action_bar_title = 2131296284;
- // aapt resource value: 0x7f09002a
- public const int META = 2131296298;
+ // aapt resource value: 0x7F09001D
+ public const int action_container = 2131296285;
- // aapt resource value: 0x7f090051
- public const int MatchLayout = 2131296337;
+ // aapt resource value: 0x7F09001E
+ public const int action_context_bar = 2131296286;
- // aapt resource value: 0x7f090088
- public const int Notice = 2131296392;
+ // aapt resource value: 0x7F09001F
+ public const int action_divider = 2131296287;
- // aapt resource value: 0x7f09008c
- public const int Password = 2131296396;
+ // aapt resource value: 0x7F090020
+ public const int action_image = 2131296288;
- // aapt resource value: 0x7f09008b
- public const int PasswordLabel = 2131296395;
+ // aapt resource value: 0x7F090021
+ public const int action_menu_divider = 2131296289;
- // aapt resource value: 0x7f09002b
- public const int SHIFT = 2131296299;
+ // aapt resource value: 0x7F090022
+ public const int action_menu_presenter = 2131296290;
- // aapt resource value: 0x7f09008a
- public const int SSID = 2131296394;
+ // aapt resource value: 0x7F090023
+ public const int action_mode_bar = 2131296291;
- // aapt resource value: 0x7f090089
- public const int SSIDLabel = 2131296393;
+ // aapt resource value: 0x7F090024
+ public const int action_mode_bar_stub = 2131296292;
- // aapt resource value: 0x7f090056
- public const int STROKE = 2131296342;
+ // aapt resource value: 0x7F090025
+ public const int action_mode_close_button = 2131296293;
- // aapt resource value: 0x7f09002c
- public const int SYM = 2131296300;
+ // aapt resource value: 0x7F090026
+ public const int action_text = 2131296294;
- // aapt resource value: 0x7f090052
- public const int Scale = 2131296338;
+ // aapt resource value: 0x7F090028
+ public const int activity_chooser_view_content = 2131296296;
- // aapt resource value: 0x7f090053
- public const int Translate = 2131296339;
+ // aapt resource value: 0x7F090029
+ public const int add = 2131296297;
- // aapt resource value: 0x7f0900e5
- public const int action0 = 2131296485;
+ // aapt resource value: 0x7F09002A
+ public const int alertTitle = 2131296298;
- // aapt resource value: 0x7f090079
- public const int action_bar = 2131296377;
+ // aapt resource value: 0x7F09002B
+ public const int all = 2131296299;
- // aapt resource value: 0x7f090001
- public const int action_bar_activity_content = 2131296257;
+ // aapt resource value: 0x7F090000
+ public const int ALT = 2131296256;
- // aapt resource value: 0x7f090078
- public const int action_bar_container = 2131296376;
+ // aapt resource value: 0x7F09002C
+ public const int always = 2131296300;
- // aapt resource value: 0x7f090074
- public const int action_bar_root = 2131296372;
+ // aapt resource value: 0x7F09002D
+ public const int async = 2131296301;
- // aapt resource value: 0x7f090002
- public const int action_bar_spinner = 2131296258;
+ // aapt resource value: 0x7F09002E
+ public const int auto = 2131296302;
- // aapt resource value: 0x7f090058
- public const int action_bar_subtitle = 2131296344;
+ // aapt resource value: 0x7F09002F
+ public const int autoAccept = 2131296303;
- // aapt resource value: 0x7f090057
- public const int action_bar_title = 2131296343;
+ // aapt resource value: 0x7F090030
+ public const int autoTest = 2131296304;
- // aapt resource value: 0x7f0900e2
- public const int action_container = 2131296482;
+ // aapt resource value: 0x7F090031
+ public const int beginning = 2131296305;
- // aapt resource value: 0x7f09007a
- public const int action_context_bar = 2131296378;
+ // aapt resource value: 0x7F090032
+ public const int blocking = 2131296306;
- // aapt resource value: 0x7f0900e9
- public const int action_divider = 2131296489;
+ // aapt resource value: 0x7F090033
+ public const int bottom = 2131296307;
- // aapt resource value: 0x7f0900e3
- public const int action_image = 2131296483;
+ // aapt resource value: 0x7F090034
+ public const int btnCancel = 2131296308;
- // aapt resource value: 0x7f090003
- public const int action_menu_divider = 2131296259;
+ // aapt resource value: 0x7F090035
+ public const int btnSubmit = 2131296309;
- // aapt resource value: 0x7f090004
- public const int action_menu_presenter = 2131296260;
+ // aapt resource value: 0x7F090036
+ public const int buttonPanel = 2131296310;
- // aapt resource value: 0x7f090076
- public const int action_mode_bar = 2131296374;
+ // aapt resource value: 0x7F090037
+ public const int call_accept = 2131296311;
- // aapt resource value: 0x7f090075
- public const int action_mode_bar_stub = 2131296373;
+ // aapt resource value: 0x7F090038
+ public const int camera0 = 2131296312;
- // aapt resource value: 0x7f090059
- public const int action_mode_close_button = 2131296345;
+ // aapt resource value: 0x7F090039
+ public const int camera1 = 2131296313;
- // aapt resource value: 0x7f0900e4
- public const int action_text = 2131296484;
+ // aapt resource value: 0x7F09003A
+ public const int cancel_action = 2131296314;
- // aapt resource value: 0x7f0900f2
- public const int actions = 2131296498;
+ // aapt resource value: 0x7F09003B
+ public const int center = 2131296315;
- // aapt resource value: 0x7f09005a
- public const int activity_chooser_view_content = 2131296346;
+ // aapt resource value: 0x7F09003C
+ public const int center_horizontal = 2131296316;
- // aapt resource value: 0x7f090021
- public const int add = 2131296289;
+ // aapt resource value: 0x7F09003D
+ public const int center_vertical = 2131296317;
- // aapt resource value: 0x7f09006d
- public const int alertTitle = 2131296365;
+ // aapt resource value: 0x7F09003E
+ public const int checkbox = 2131296318;
- // aapt resource value: 0x7f090047
- public const int all = 2131296327;
+ // aapt resource value: 0x7F09003F
+ public const int chronometer = 2131296319;
- // aapt resource value: 0x7f09002d
- public const int always = 2131296301;
+ // aapt resource value: 0x7F090040
+ public const int clip_horizontal = 2131296320;
- // aapt resource value: 0x7f09004b
- public const int async = 2131296331;
+ // aapt resource value: 0x7F090041
+ public const int clip_vertical = 2131296321;
- // aapt resource value: 0x7f090039
- public const int auto = 2131296313;
+ // aapt resource value: 0x7F090042
+ public const int collapseActionView = 2131296322;
- // aapt resource value: 0x7f0900fb
- public const int autoAccept = 2131296507;
+ // aapt resource value: 0x7F090043
+ public const int configAVMsg = 2131296323;
- // aapt resource value: 0x7f0900fc
- public const int autoTest = 2131296508;
+ // aapt resource value: 0x7F090044
+ public const int container = 2131296324;
- // aapt resource value: 0x7f090024
- public const int beginning = 2131296292;
+ // aapt resource value: 0x7F090045
+ public const int content = 2131296325;
- // aapt resource value: 0x7f09004c
- public const int blocking = 2131296332;
+ // aapt resource value: 0x7F090046
+ public const int contentPanel = 2131296326;
- // aapt resource value: 0x7f090032
- public const int bottom = 2131296306;
+ // aapt resource value: 0x7F090047
+ public const int content_container = 2131296327;
- // aapt resource value: 0x7f0900cd
- public const int btnCancel = 2131296461;
+ // aapt resource value: 0x7F090048
+ public const int coordinator = 2131296328;
- // aapt resource value: 0x7f0900cf
- public const int btnSubmit = 2131296463;
+ // aapt resource value: 0x7F090001
+ public const int CTRL = 2131296257;
- // aapt resource value: 0x7f090060
- public const int buttonPanel = 2131296352;
+ // aapt resource value: 0x7F090049
+ public const int custom = 2131296329;
- // aapt resource value: 0x7f0900fd
- public const int call_accept = 2131296509;
+ // aapt resource value: 0x7F090002
+ public const int Custom = 2131296258;
- // aapt resource value: 0x7f090121
- public const int camera0 = 2131296545;
+ // aapt resource value: 0x7F090003
+ public const int CustomLabel = 2131296259;
- // aapt resource value: 0x7f090122
- public const int camera1 = 2131296546;
+ // aapt resource value: 0x7F09004A
+ public const int customPanel = 2131296330;
- // aapt resource value: 0x7f0900e6
- public const int cancel_action = 2131296486;
+ // aapt resource value: 0x7F09004B
+ public const int day = 2131296331;
- // aapt resource value: 0x7f09003a
- public const int center = 2131296314;
+ // aapt resource value: 0x7F09004C
+ public const int decor_content_parent = 2131296332;
- // aapt resource value: 0x7f09003b
- public const int center_horizontal = 2131296315;
+ // aapt resource value: 0x7F09004D
+ public const int default_activity_button = 2131296333;
- // aapt resource value: 0x7f09003c
- public const int center_vertical = 2131296316;
+ // aapt resource value: 0x7F09004E
+ public const int description = 2131296334;
- // aapt resource value: 0x7f090070
- public const int checkbox = 2131296368;
+ // aapt resource value: 0x7F09004F
+ public const int design_bottom_sheet = 2131296335;
- // aapt resource value: 0x7f0900ee
- public const int chronometer = 2131296494;
+ // aapt resource value: 0x7F090050
+ public const int design_menu_item_action_area = 2131296336;
- // aapt resource value: 0x7f090043
- public const int clip_horizontal = 2131296323;
+ // aapt resource value: 0x7F090051
+ public const int design_menu_item_action_area_stub = 2131296337;
- // aapt resource value: 0x7f090044
- public const int clip_vertical = 2131296324;
+ // aapt resource value: 0x7F090052
+ public const int design_menu_item_text = 2131296338;
- // aapt resource value: 0x7f09002e
- public const int collapseActionView = 2131296302;
+ // aapt resource value: 0x7F090053
+ public const int design_navigation_view = 2131296339;
- // aapt resource value: 0x7f090117
- public const int configAVMsg = 2131296535;
+ // aapt resource value: 0x7F090054
+ public const int disableHome = 2131296340;
- // aapt resource value: 0x7f0900a3
- public const int container = 2131296419;
+ // aapt resource value: 0x7F090055
+ public const int disableReportBytes = 2131296341;
- // aapt resource value: 0x7f09009c
- public const int content = 2131296412;
+ // aapt resource value: 0x7F090056
+ public const int edit_query = 2131296342;
- // aapt resource value: 0x7f090063
- public const int contentPanel = 2131296355;
+ // aapt resource value: 0x7F090057
+ public const int enableReportBytes = 2131296343;
- // aapt resource value: 0x7f0900d1
- public const int content_container = 2131296465;
+ // aapt resource value: 0x7F090058
+ public const int end = 2131296344;
- // aapt resource value: 0x7f0900a4
- public const int coordinator = 2131296420;
+ // aapt resource value: 0x7F090059
+ public const int end_padder = 2131296345;
- // aapt resource value: 0x7f09006a
- public const int custom = 2131296362;
+ // aapt resource value: 0x7F09005A
+ public const int enterAlways = 2131296346;
- // aapt resource value: 0x7f090069
- public const int customPanel = 2131296361;
+ // aapt resource value: 0x7F09005B
+ public const int enterAlwaysCollapsed = 2131296347;
- // aapt resource value: 0x7f0900dd
- public const int day = 2131296477;
+ // aapt resource value: 0x7F09005C
+ public const int exitUntilCollapsed = 2131296348;
- // aapt resource value: 0x7f090077
- public const int decor_content_parent = 2131296375;
+ // aapt resource value: 0x7F09005E
+ public const int expanded_menu = 2131296350;
- // aapt resource value: 0x7f09005d
- public const int default_activity_button = 2131296349;
+ // aapt resource value: 0x7F09005D
+ public const int expand_activities_button = 2131296349;
- // aapt resource value: 0x7f09009e
- public const int description = 2131296414;
+ // aapt resource value: 0x7F090004
+ public const int FILL = 2131296260;
- // aapt resource value: 0x7f0900a6
- public const int design_bottom_sheet = 2131296422;
+ // aapt resource value: 0x7F09005F
+ public const int fill = 2131296351;
- // aapt resource value: 0x7f0900ad
- public const int design_menu_item_action_area = 2131296429;
+ // aapt resource value: 0x7F090060
+ public const int fill_horizontal = 2131296352;
- // aapt resource value: 0x7f0900ac
- public const int design_menu_item_action_area_stub = 2131296428;
+ // aapt resource value: 0x7F090005
+ public const int FILL_STROKE = 2131296261;
- // aapt resource value: 0x7f0900ab
- public const int design_menu_item_text = 2131296427;
+ // aapt resource value: 0x7F090061
+ public const int fill_vertical = 2131296353;
- // aapt resource value: 0x7f0900aa
- public const int design_navigation_view = 2131296426;
+ // aapt resource value: 0x7F090062
+ public const int fingerprint_icon = 2131296354;
- // aapt resource value: 0x7f090015
- public const int disableHome = 2131296277;
+ // aapt resource value: 0x7F090063
+ public const int @fixed = 2131296355;
- // aapt resource value: 0x7f090116
- public const int disableReportBytes = 2131296534;
+ // aapt resource value: 0x7F090007
+ public const int FixedBehind = 2131296263;
- // aapt resource value: 0x7f09007b
- public const int edit_query = 2131296379;
+ // aapt resource value: 0x7F090008
+ public const int FixedFront = 2131296264;
- // aapt resource value: 0x7f090115
- public const int enableReportBytes = 2131296533;
+ // aapt resource value: 0x7F090064
+ public const int forever = 2131296356;
- // aapt resource value: 0x7f090025
- public const int end = 2131296293;
+ // aapt resource value: 0x7F090006
+ public const int FUNCTION = 2131296262;
- // aapt resource value: 0x7f0900f4
- public const int end_padder = 2131296500;
+ // aapt resource value: 0x7F090065
+ public const int gd_btn_back = 2131296357;
- // aapt resource value: 0x7f090034
- public const int enterAlways = 2131296308;
+ // aapt resource value: 0x7F090066
+ public const int gd_btn_myLocation = 2131296358;
- // aapt resource value: 0x7f090035
- public const int enterAlwaysCollapsed = 2131296309;
+ // aapt resource value: 0x7F090067
+ public const int gd_btn_save = 2131296359;
- // aapt resource value: 0x7f090036
- public const int exitUntilCollapsed = 2131296310;
-
- // aapt resource value: 0x7f09005b
- public const int expand_activities_button = 2131296347;
-
- // aapt resource value: 0x7f09006f
- public const int expanded_menu = 2131296367;
-
- // aapt resource value: 0x7f090045
- public const int fill = 2131296325;
-
- // aapt resource value: 0x7f090046
- public const int fill_horizontal = 2131296326;
-
- // aapt resource value: 0x7f09003d
- public const int fill_vertical = 2131296317;
-
- // aapt resource value: 0x7f09009f
- public const int fingerprint_icon = 2131296415;
-
- // aapt resource value: 0x7f090049
- public const int @fixed = 2131296329;
+ // aapt resource value: 0x7F090068
+ public const int gd_img_search_delete = 2131296360;
- // aapt resource value: 0x7f09004d
- public const int forever = 2131296333;
+ // aapt resource value: 0x7F090069
+ public const int gd_ll_myhome = 2131296361;
- // aapt resource value: 0x7f0900c2
- public const int gd_btn_back = 2131296450;
+ // aapt resource value: 0x7F09006A
+ public const int gd_ll_search = 2131296362;
- // aapt resource value: 0x7f0900cb
- public const int gd_btn_myLocation = 2131296459;
+ // aapt resource value: 0x7F09006B
+ public const int gd_mapView = 2131296363;
- // aapt resource value: 0x7f0900ca
- public const int gd_btn_save = 2131296458;
+ // aapt resource value: 0x7F09006C
+ public const int gd_rl_topview = 2131296364;
- // aapt resource value: 0x7f0900c7
- public const int gd_img_search_delete = 2131296455;
+ // aapt resource value: 0x7F09006D
+ public const int gd_tv_activity_title = 2131296365;
- // aapt resource value: 0x7f0900c9
- public const int gd_ll_myhome = 2131296457;
+ // aapt resource value: 0x7F09006E
+ public const int gd_tv_radius = 2131296366;
- // aapt resource value: 0x7f0900c5
- public const int gd_ll_search = 2131296453;
+ // aapt resource value: 0x7F09006F
+ public const int gd_tv_search_title = 2131296367;
- // aapt resource value: 0x7f0900c4
- public const int gd_mapView = 2131296452;
+ // aapt resource value: 0x7F090070
+ public const int hangup = 2131296368;
- // aapt resource value: 0x7f0900c1
- public const int gd_rl_topview = 2131296449;
+ // aapt resource value: 0x7F090071
+ public const int hangupMonitorIn = 2131296369;
- // aapt resource value: 0x7f0900c3
- public const int gd_tv_activity_title = 2131296451;
+ // aapt resource value: 0x7F090072
+ public const int hdl_gallery_rootView = 2131296370;
- // aapt resource value: 0x7f0900c8
- public const int gd_tv_radius = 2131296456;
+ // aapt resource value: 0x7F090073
+ public const int hdl_gallery_viewPager = 2131296371;
- // aapt resource value: 0x7f0900c6
- public const int gd_tv_search_title = 2131296454;
+ // aapt resource value: 0x7F090074
+ public const int hdl_options1 = 2131296372;
- // aapt resource value: 0x7f0900ff
- public const int hangup = 2131296511;
+ // aapt resource value: 0x7F090075
+ public const int hdl_options2 = 2131296373;
- // aapt resource value: 0x7f090101
- public const int hangupMonitorIn = 2131296513;
+ // aapt resource value: 0x7F090076
+ public const int hdl_options3 = 2131296374;
- // aapt resource value: 0x7f0900bf
- public const int hdl_gallery_rootView = 2131296447;
+ // aapt resource value: 0x7F090077
+ public const int hdl_pickerview_ll = 2131296375;
- // aapt resource value: 0x7f0900c0
- public const int hdl_gallery_viewPager = 2131296448;
+ // aapt resource value: 0x7F090078
+ public const int hide = 2131296376;
- // aapt resource value: 0x7f0900d3
- public const int hdl_options1 = 2131296467;
+ // aapt resource value: 0x7F090079
+ public const int home = 2131296377;
- // aapt resource value: 0x7f0900d4
- public const int hdl_options2 = 2131296468;
+ // aapt resource value: 0x7F09007A
+ public const int homeAsUp = 2131296378;
- // aapt resource value: 0x7f0900d5
- public const int hdl_options3 = 2131296469;
+ // aapt resource value: 0x7F09007B
+ public const int hour = 2131296379;
- // aapt resource value: 0x7f0900d2
- public const int hdl_pickerview_ll = 2131296466;
+ // aapt resource value: 0x7F09007C
+ public const int icon = 2131296380;
- // aapt resource value: 0x7f090094
- public const int hide = 2131296404;
+ // aapt resource value: 0x7F09007D
+ public const int icon_back = 2131296381;
- // aapt resource value: 0x7f090005
- public const int home = 2131296261;
+ // aapt resource value: 0x7F09007E
+ public const int icon_group = 2131296382;
- // aapt resource value: 0x7f090016
- public const int homeAsUp = 2131296278;
+ // aapt resource value: 0x7F09007F
+ public const int icon_screenshot = 2131296383;
- // aapt resource value: 0x7f0900de
- public const int hour = 2131296478;
+ // aapt resource value: 0x7F090080
+ public const int icon_unlock = 2131296384;
- // aapt resource value: 0x7f09005f
- public const int icon = 2131296351;
+ // aapt resource value: 0x7F090081
+ public const int ifRoom = 2131296385;
- // aapt resource value: 0x7f090098
- public const int icon_back = 2131296408;
+ // aapt resource value: 0x7F090082
+ public const int image = 2131296386;
- // aapt resource value: 0x7f0900f3
- public const int icon_group = 2131296499;
+ // aapt resource value: 0x7F090083
+ public const int img_call = 2131296387;
- // aapt resource value: 0x7f0900b2
- public const int icon_screenshot = 2131296434;
+ // aapt resource value: 0x7F090084
+ public const int img_hangup = 2131296388;
- // aapt resource value: 0x7f0900b3
- public const int icon_unlock = 2131296435;
+ // aapt resource value: 0x7F090085
+ public const int info = 2131296389;
- // aapt resource value: 0x7f09002f
- public const int ifRoom = 2131296303;
+ // aapt resource value: 0x7F090086
+ public const int italic = 2131296390;
- // aapt resource value: 0x7f09005c
- public const int image = 2131296348;
+ // aapt resource value: 0x7F090087
+ public const int item_touch_helper_previous_elevation = 2131296391;
- // aapt resource value: 0x7f0900b9
- public const int img_call = 2131296441;
+ // aapt resource value: 0x7F090088
+ public const int largeLabel = 2131296392;
- // aapt resource value: 0x7f0900b6
- public const int img_hangup = 2131296438;
+ // aapt resource value: 0x7F090089
+ public const int left = 2131296393;
- // aapt resource value: 0x7f0900ef
- public const int info = 2131296495;
+ // aapt resource value: 0x7F09008A
+ public const int line1 = 2131296394;
- // aapt resource value: 0x7f09004e
- public const int italic = 2131296334;
+ // aapt resource value: 0x7F09008B
+ public const int line3 = 2131296395;
- // aapt resource value: 0x7f090000
- public const int item_touch_helper_previous_elevation = 2131296256;
+ // aapt resource value: 0x7F09008C
+ public const int listMode = 2131296396;
- // aapt resource value: 0x7f0900a2
- public const int largeLabel = 2131296418;
+ // aapt resource value: 0x7F09008D
+ public const int list_item = 2131296397;
- // aapt resource value: 0x7f09003e
- public const int left = 2131296318;
+ // aapt resource value: 0x7F09008E
+ public const int localDoorUnlock = 2131296398;
- // aapt resource value: 0x7f09000d
- public const int line1 = 2131296269;
+ // aapt resource value: 0x7F09008F
+ public const int localVideo = 2131296399;
- // aapt resource value: 0x7f09000e
- public const int line3 = 2131296270;
+ // aapt resource value: 0x7F090090
+ public const int masked = 2131296400;
- // aapt resource value: 0x7f090012
- public const int listMode = 2131296274;
+ // aapt resource value: 0x7F09000A
+ public const int MatchLayout = 2131296266;
- // aapt resource value: 0x7f09005e
- public const int list_item = 2131296350;
+ // aapt resource value: 0x7F090091
+ public const int media_actions = 2131296401;
- // aapt resource value: 0x7f090113
- public const int localDoorUnlock = 2131296531;
+ // aapt resource value: 0x7F090092
+ public const int message = 2131296402;
- // aapt resource value: 0x7f09009a
- public const int localVideo = 2131296410;
+ // aapt resource value: 0x7F090009
+ public const int META = 2131296265;
- // aapt resource value: 0x7f09012a
- public const int masked = 2131296554;
+ // aapt resource value: 0x7F090093
+ public const int middle = 2131296403;
- // aapt resource value: 0x7f0900e8
- public const int media_actions = 2131296488;
+ // aapt resource value: 0x7F090094
+ public const int min = 2131296404;
- // aapt resource value: 0x7f09011f
- public const int message = 2131296543;
+ // aapt resource value: 0x7F090095
+ public const int mini = 2131296405;
- // aapt resource value: 0x7f090026
- public const int middle = 2131296294;
+ // aapt resource value: 0x7F090096
+ public const int monitor = 2131296406;
- // aapt resource value: 0x7f0900df
- public const int min = 2131296479;
+ // aapt resource value: 0x7F090097
+ public const int month = 2131296407;
- // aapt resource value: 0x7f090048
- public const int mini = 2131296328;
+ // aapt resource value: 0x7F090098
+ public const int multiply = 2131296408;
- // aapt resource value: 0x7f090100
- public const int monitor = 2131296512;
+ // aapt resource value: 0x7F090099
+ public const int myButton = 2131296409;
- // aapt resource value: 0x7f0900dc
- public const int month = 2131296476;
+ // aapt resource value: 0x7F09009A
+ public const int navigation_header_container = 2131296410;
- // aapt resource value: 0x7f09001c
- public const int multiply = 2131296284;
+ // aapt resource value: 0x7F09009B
+ public const int never = 2131296411;
- // aapt resource value: 0x7f0900e1
- public const int myButton = 2131296481;
+ // aapt resource value: 0x7F09009C
+ public const int none = 2131296412;
- // aapt resource value: 0x7f0900a9
- public const int navigation_header_container = 2131296425;
+ // aapt resource value: 0x7F09009D
+ public const int normal = 2131296413;
- // aapt resource value: 0x7f090030
- public const int never = 2131296304;
+ // aapt resource value: 0x7F09000B
+ public const int Notice = 2131296267;
- // aapt resource value: 0x7f090017
- public const int none = 2131296279;
+ // aapt resource value: 0x7F09009E
+ public const int notification_background = 2131296414;
- // aapt resource value: 0x7f090013
- public const int normal = 2131296275;
+ // aapt resource value: 0x7F09009F
+ public const int notification_main_column = 2131296415;
- // aapt resource value: 0x7f0900f1
- public const int notification_background = 2131296497;
+ // aapt resource value: 0x7F0900A0
+ public const int notification_main_column_container = 2131296416;
- // aapt resource value: 0x7f0900eb
- public const int notification_main_column = 2131296491;
+ // aapt resource value: 0x7F0900A1
+ public const int options1 = 2131296417;
- // aapt resource value: 0x7f0900ea
- public const int notification_main_column_container = 2131296490;
+ // aapt resource value: 0x7F0900A2
+ public const int options2 = 2131296418;
- // aapt resource value: 0x7f0900d7
- public const int options1 = 2131296471;
+ // aapt resource value: 0x7F0900A3
+ public const int options3 = 2131296419;
- // aapt resource value: 0x7f0900d8
- public const int options2 = 2131296472;
+ // aapt resource value: 0x7F0900A4
+ public const int optionspicker = 2131296420;
- // aapt resource value: 0x7f0900d9
- public const int options3 = 2131296473;
+ // aapt resource value: 0x7F0900A5
+ public const int outmost_container = 2131296421;
- // aapt resource value: 0x7f0900d6
- public const int optionspicker = 2131296470;
+ // aapt resource value: 0x7F0900A6
+ public const int parallax = 2131296422;
- // aapt resource value: 0x7f0900d0
- public const int outmost_container = 2131296464;
+ // aapt resource value: 0x7F0900A7
+ public const int parentPanel = 2131296423;
- // aapt resource value: 0x7f090041
- public const int parallax = 2131296321;
+ // aapt resource value: 0x7F09000C
+ public const int Password = 2131296268;
- // aapt resource value: 0x7f090062
- public const int parentPanel = 2131296354;
+ // aapt resource value: 0x7F09000D
+ public const int PasswordLabel = 2131296269;
- // aapt resource value: 0x7f0900fe
- public const int peerAddress = 2131296510;
+ // aapt resource value: 0x7F0900A8
+ public const int peerAddress = 2131296424;
- // aapt resource value: 0x7f090042
- public const int pin = 2131296322;
+ // aapt resource value: 0x7F0900A9
+ public const int pin = 2131296425;
- // aapt resource value: 0x7f090006
- public const int progress_circular = 2131296262;
+ // aapt resource value: 0x7F0900AA
+ public const int progress_circular = 2131296426;
- // aapt resource value: 0x7f090007
- public const int progress_horizontal = 2131296263;
+ // aapt resource value: 0x7F0900AB
+ public const int progress_horizontal = 2131296427;
- // aapt resource value: 0x7f090072
- public const int radio = 2131296370;
+ // aapt resource value: 0x7F0900AC
+ public const int radio = 2131296428;
- // aapt resource value: 0x7f090096
- public const int remoteFrame = 2131296406;
+ // aapt resource value: 0x7F0900AD
+ public const int remoteFrame = 2131296429;
- // aapt resource value: 0x7f090095
- public const int remoteFrameContainer = 2131296405;
+ // aapt resource value: 0x7F0900AE
+ public const int remoteFrameContainer = 2131296430;
- // aapt resource value: 0x7f090097
- public const int remoteVideo = 2131296407;
+ // aapt resource value: 0x7F0900AF
+ public const int remoteVideo = 2131296431;
- // aapt resource value: 0x7f0900f7
- public const int requestA = 2131296503;
+ // aapt resource value: 0x7F0900B0
+ public const int requestA = 2131296432;
- // aapt resource value: 0x7f09010c
- public const int requestMasterAudio = 2131296524;
+ // aapt resource value: 0x7F0900B1
+ public const int requestMasterAudio = 2131296433;
- // aapt resource value: 0x7f09010d
- public const int requestMasterVideo = 2131296525;
+ // aapt resource value: 0x7F0900B2
+ public const int requestMasterVideo = 2131296434;
- // aapt resource value: 0x7f0900f8
- public const int requestV = 2131296504;
+ // aapt resource value: 0x7F0900B3
+ public const int requestV = 2131296435;
- // aapt resource value: 0x7f09010e
- public const int reverseCall = 2131296526;
+ // aapt resource value: 0x7F0900B4
+ public const int reverseCall = 2131296436;
- // aapt resource value: 0x7f09010f
- public const int reverseCallInfo = 2131296527;
+ // aapt resource value: 0x7F0900B5
+ public const int reverseCallInfo = 2131296437;
- // aapt resource value: 0x7f09003f
- public const int right = 2131296319;
+ // aapt resource value: 0x7F0900B6
+ public const int right = 2131296438;
- // aapt resource value: 0x7f0900f0
- public const int right_icon = 2131296496;
+ // aapt resource value: 0x7F0900B7
+ public const int right_icon = 2131296439;
- // aapt resource value: 0x7f0900ec
- public const int right_side = 2131296492;
+ // aapt resource value: 0x7F0900B8
+ public const int right_side = 2131296440;
- // aapt resource value: 0x7f0900b8
- public const int rl_call = 2131296440;
+ // aapt resource value: 0x7F0900B9
+ public const int rl_call = 2131296441;
- // aapt resource value: 0x7f0900b5
- public const int rl_hangup = 2131296437;
+ // aapt resource value: 0x7F0900BA
+ public const int rl_hangup = 2131296442;
- // aapt resource value: 0x7f0900bb
+ // aapt resource value: 0x7F0900BB
public const int rl_sceenshot = 2131296443;
- // aapt resource value: 0x7f0900bd
- public const int rl_unlock = 2131296445;
+ // aapt resource value: 0x7F0900BC
+ public const int rl_unlock = 2131296444;
- // aapt resource value: 0x7f0900cc
- public const int rv_topbar = 2131296460;
+ // aapt resource value: 0x7F0900BD
+ public const int rv_topbar = 2131296445;
- // aapt resource value: 0x7f09001d
- public const int screen = 2131296285;
+ // aapt resource value: 0x7F090013
+ public const int Scale = 2131296275;
- // aapt resource value: 0x7f090037
- public const int scroll = 2131296311;
+ // aapt resource value: 0x7F0900BE
+ public const int screen = 2131296446;
- // aapt resource value: 0x7f090068
- public const int scrollIndicatorDown = 2131296360;
+ // aapt resource value: 0x7F0900BF
+ public const int scroll = 2131296447;
- // aapt resource value: 0x7f090064
- public const int scrollIndicatorUp = 2131296356;
+ // aapt resource value: 0x7F0900C3
+ public const int scrollable = 2131296451;
- // aapt resource value: 0x7f090065
- public const int scrollView = 2131296357;
+ // aapt resource value: 0x7F0900C0
+ public const int scrollIndicatorDown = 2131296448;
- // aapt resource value: 0x7f09004a
- public const int scrollable = 2131296330;
+ // aapt resource value: 0x7F0900C1
+ public const int scrollIndicatorUp = 2131296449;
- // aapt resource value: 0x7f09007d
- public const int search_badge = 2131296381;
+ // aapt resource value: 0x7F0900C2
+ public const int scrollView = 2131296450;
- // aapt resource value: 0x7f09007c
- public const int search_bar = 2131296380;
+ // aapt resource value: 0x7F0900C4
+ public const int search_badge = 2131296452;
- // aapt resource value: 0x7f09007e
- public const int search_button = 2131296382;
+ // aapt resource value: 0x7F0900C5
+ public const int search_bar = 2131296453;
- // aapt resource value: 0x7f090083
- public const int search_close_btn = 2131296387;
+ // aapt resource value: 0x7F0900C6
+ public const int search_button = 2131296454;
- // aapt resource value: 0x7f09007f
- public const int search_edit_frame = 2131296383;
+ // aapt resource value: 0x7F0900C7
+ public const int search_close_btn = 2131296455;
- // aapt resource value: 0x7f090085
- public const int search_go_btn = 2131296389;
+ // aapt resource value: 0x7F0900C8
+ public const int search_edit_frame = 2131296456;
- // aapt resource value: 0x7f090080
- public const int search_mag_icon = 2131296384;
+ // aapt resource value: 0x7F0900C9
+ public const int search_go_btn = 2131296457;
- // aapt resource value: 0x7f090081
- public const int search_plate = 2131296385;
+ // aapt resource value: 0x7F0900CA
+ public const int search_mag_icon = 2131296458;
- // aapt resource value: 0x7f090082
- public const int search_src_text = 2131296386;
+ // aapt resource value: 0x7F0900CB
+ public const int search_plate = 2131296459;
- // aapt resource value: 0x7f090086
- public const int search_voice_btn = 2131296390;
+ // aapt resource value: 0x7F0900CC
+ public const int search_src_text = 2131296460;
- // aapt resource value: 0x7f0900e0
- public const int second = 2131296480;
+ // aapt resource value: 0x7F0900CD
+ public const int search_voice_btn = 2131296461;
- // aapt resource value: 0x7f090087
- public const int select_dialog_listview = 2131296391;
+ // aapt resource value: 0x7F0900CE
+ public const int second = 2131296462;
- // aapt resource value: 0x7f0900f9
- public const int sendA = 2131296505;
+ // aapt resource value: 0x7F0900CF
+ public const int select_dialog_listview = 2131296463;
- // aapt resource value: 0x7f09010b
- public const int sendCustomData = 2131296523;
+ // aapt resource value: 0x7F0900D0
+ public const int sendA = 2131296464;
- // aapt resource value: 0x7f0900fa
- public const int sendV = 2131296506;
+ // aapt resource value: 0x7F0900D1
+ public const int sendCustomData = 2131296465;
- // aapt resource value: 0x7f090071
- public const int shortcut = 2131296369;
+ // aapt resource value: 0x7F0900D2
+ public const int sendV = 2131296466;
- // aapt resource value: 0x7f090093
- public const int show = 2131296403;
+ // aapt resource value: 0x7F09000E
+ public const int SHIFT = 2131296270;
- // aapt resource value: 0x7f090018
- public const int showCustom = 2131296280;
+ // aapt resource value: 0x7F0900D3
+ public const int shortcut = 2131296467;
- // aapt resource value: 0x7f090019
- public const int showHome = 2131296281;
+ // aapt resource value: 0x7F0900D4
+ public const int show = 2131296468;
- // aapt resource value: 0x7f09001a
- public const int showTitle = 2131296282;
+ // aapt resource value: 0x7F0900D5
+ public const int showCustom = 2131296469;
- // aapt resource value: 0x7f0900a1
- public const int smallLabel = 2131296417;
+ // aapt resource value: 0x7F0900D6
+ public const int showHome = 2131296470;
- // aapt resource value: 0x7f0900a8
- public const int snackbar_action = 2131296424;
+ // aapt resource value: 0x7F0900D7
+ public const int showTitle = 2131296471;
- // aapt resource value: 0x7f0900a7
- public const int snackbar_text = 2131296423;
+ // aapt resource value: 0x7F0900D8
+ public const int smallLabel = 2131296472;
- // aapt resource value: 0x7f090038
- public const int snap = 2131296312;
+ // aapt resource value: 0x7F0900D9
+ public const int snackbar_action = 2131296473;
- // aapt resource value: 0x7f09010a
- public const int snapshot = 2131296522;
+ // aapt resource value: 0x7F0900DA
+ public const int snackbar_text = 2131296474;
- // aapt resource value: 0x7f090061
- public const int spacer = 2131296353;
+ // aapt resource value: 0x7F0900DB
+ public const int snap = 2131296475;
- // aapt resource value: 0x7f090008
- public const int split_action_bar = 2131296264;
+ // aapt resource value: 0x7F0900DC
+ public const int snapshot = 2131296476;
- // aapt resource value: 0x7f09001e
- public const int src_atop = 2131296286;
+ // aapt resource value: 0x7F0900DD
+ public const int spacer = 2131296477;
- // aapt resource value: 0x7f09001f
- public const int src_in = 2131296287;
+ // aapt resource value: 0x7F0900DE
+ public const int split_action_bar = 2131296478;
- // aapt resource value: 0x7f090020
- public const int src_over = 2131296288;
+ // aapt resource value: 0x7F0900DF
+ public const int src_atop = 2131296479;
- // aapt resource value: 0x7f09011a
- public const int srl_classics_arrow = 2131296538;
+ // aapt resource value: 0x7F0900E0
+ public const int src_in = 2131296480;
- // aapt resource value: 0x7f09011d
- public const int srl_classics_center = 2131296541;
+ // aapt resource value: 0x7F0900E1
+ public const int src_over = 2131296481;
- // aapt resource value: 0x7f09011c
- public const int srl_classics_progress = 2131296540;
+ // aapt resource value: 0x7F0900E2
+ public const int srl_classics_arrow = 2131296482;
- // aapt resource value: 0x7f09011b
- public const int srl_classics_title = 2131296539;
+ // aapt resource value: 0x7F0900E3
+ public const int srl_classics_center = 2131296483;
- // aapt resource value: 0x7f09011e
- public const int srl_classics_update = 2131296542;
+ // aapt resource value: 0x7F0900E4
+ public const int srl_classics_progress = 2131296484;
- // aapt resource value: 0x7f090040
- public const int start = 2131296320;
+ // aapt resource value: 0x7F0900E5
+ public const int srl_classics_title = 2131296485;
- // aapt resource value: 0x7f090118
- public const int startAVMsg = 2131296536;
+ // aapt resource value: 0x7F0900E6
+ public const int srl_classics_update = 2131296486;
- // aapt resource value: 0x7f090112
- public const int startDoorKey = 2131296530;
+ // aapt resource value: 0x7F09000F
+ public const int SSID = 2131296271;
- // aapt resource value: 0x7f090106
- public const int startLocalRecord = 2131296518;
+ // aapt resource value: 0x7F090010
+ public const int SSIDLabel = 2131296272;
- // aapt resource value: 0x7f090110
- public const int startReadCard = 2131296528;
+ // aapt resource value: 0x7F0900E7
+ public const int start = 2131296487;
- // aapt resource value: 0x7f090104
- public const int startRecord = 2131296516;
+ // aapt resource value: 0x7F0900E8
+ public const int startAVMsg = 2131296488;
- // aapt resource value: 0x7f090108
- public const int startRecordLocalAudio = 2131296520;
+ // aapt resource value: 0x7F0900E9
+ public const int startDoorKey = 2131296489;
- // aapt resource value: 0x7f090102
- public const int startRecordPeerAudio = 2131296514;
+ // aapt resource value: 0x7F0900EA
+ public const int startLocalRecord = 2131296490;
- // aapt resource value: 0x7f090124
- public const int startStream = 2131296548;
+ // aapt resource value: 0x7F0900EB
+ public const int startReadCard = 2131296491;
- // aapt resource value: 0x7f09008f
- public const int startV1 = 2131296399;
+ // aapt resource value: 0x7F0900EC
+ public const int startRecord = 2131296492;
- // aapt resource value: 0x7f090091
- public const int startV1V4 = 2131296401;
+ // aapt resource value: 0x7F0900ED
+ public const int startRecordLocalAudio = 2131296493;
+
+ // aapt resource value: 0x7F0900EE
+ public const int startRecordPeerAudio = 2131296494;
+
+ // aapt resource value: 0x7F0900EF
+ public const int startStream = 2131296495;
+
+ // aapt resource value: 0x7F0900F0
+ public const int startV1 = 2131296496;
+
+ // aapt resource value: 0x7F0900F1
+ public const int startV1V4 = 2131296497;
+
+ // aapt resource value: 0x7F0900F2
+ public const int startV4 = 2131296498;
+
+ // aapt resource value: 0x7F0900F3
+ public const int start_stop = 2131296499;
+
+ // aapt resource value: 0x7F0900F4
+ public const int start_stop_stream = 2131296500;
- // aapt resource value: 0x7f090090
- public const int startV4 = 2131296400;
+ // aapt resource value: 0x7F0900F5
+ public const int status = 2131296501;
- // aapt resource value: 0x7f0900f5
- public const int start_stop = 2131296501;
+ // aapt resource value: 0x7F0900F6
+ public const int status_bar_latest_event_content = 2131296502;
- // aapt resource value: 0x7f0900f6
- public const int start_stop_stream = 2131296502;
+ // aapt resource value: 0x7F0900F7
+ public const int stop = 2131296503;
- // aapt resource value: 0x7f0900a0
- public const int status = 2131296416;
+ // aapt resource value: 0x7F0900F8
+ public const int stopAVMsg = 2131296504;
- // aapt resource value: 0x7f0900e7
- public const int status_bar_latest_event_content = 2131296487;
+ // aapt resource value: 0x7F0900F9
+ public const int stopDoorKey = 2131296505;
- // aapt resource value: 0x7f090092
- public const int stop = 2131296402;
+ // aapt resource value: 0x7F0900FA
+ public const int stopLocalRecord = 2131296506;
- // aapt resource value: 0x7f090119
- public const int stopAVMsg = 2131296537;
+ // aapt resource value: 0x7F0900FB
+ public const int stopReadCard = 2131296507;
- // aapt resource value: 0x7f090114
- public const int stopDoorKey = 2131296532;
+ // aapt resource value: 0x7F0900FC
+ public const int stopRecord = 2131296508;
- // aapt resource value: 0x7f090107
- public const int stopLocalRecord = 2131296519;
+ // aapt resource value: 0x7F0900FD
+ public const int stopRecordLocalAudio = 2131296509;
- // aapt resource value: 0x7f090111
- public const int stopReadCard = 2131296529;
+ // aapt resource value: 0x7F0900FE
+ public const int stopRecordPeerAudio = 2131296510;
- // aapt resource value: 0x7f090105
- public const int stopRecord = 2131296517;
+ // aapt resource value: 0x7F0900FF
+ public const int stopStream = 2131296511;
- // aapt resource value: 0x7f090109
- public const int stopRecordLocalAudio = 2131296521;
+ // aapt resource value: 0x7F090011
+ public const int STROKE = 2131296273;
- // aapt resource value: 0x7f090103
- public const int stopRecordPeerAudio = 2131296515;
+ // aapt resource value: 0x7F090100
+ public const int submenuarrow = 2131296512;
- // aapt resource value: 0x7f090125
- public const int stopStream = 2131296549;
+ // aapt resource value: 0x7F090101
+ public const int submit_area = 2131296513;
- // aapt resource value: 0x7f090073
- public const int submenuarrow = 2131296371;
+ // aapt resource value: 0x7F090102
+ public const int subtitle = 2131296514;
- // aapt resource value: 0x7f090084
- public const int submit_area = 2131296388;
+ // aapt resource value: 0x7F090012
+ public const int SYM = 2131296274;
- // aapt resource value: 0x7f09009d
- public const int subtitle = 2131296413;
+ // aapt resource value: 0x7F090103
+ public const int tabMode = 2131296515;
- // aapt resource value: 0x7f090014
- public const int tabMode = 2131296276;
+ // aapt resource value: 0x7F090104
+ public const int text = 2131296516;
- // aapt resource value: 0x7f09000f
- public const int text = 2131296271;
+ // aapt resource value: 0x7F090105
+ public const int text2 = 2131296517;
- // aapt resource value: 0x7f090010
- public const int text2 = 2131296272;
+ // aapt resource value: 0x7F090109
+ public const int textinput_counter = 2131296521;
- // aapt resource value: 0x7f090067
- public const int textSpacerNoButtons = 2131296359;
+ // aapt resource value: 0x7F09010A
+ public const int textinput_error = 2131296522;
- // aapt resource value: 0x7f090066
- public const int textSpacerNoTitle = 2131296358;
+ // aapt resource value: 0x7F090106
+ public const int textSpacerNoButtons = 2131296518;
- // aapt resource value: 0x7f0900ae
- public const int text_input_password_toggle = 2131296430;
+ // aapt resource value: 0x7F090107
+ public const int textSpacerNoTitle = 2131296519;
- // aapt resource value: 0x7f09000a
- public const int textinput_counter = 2131296266;
+ // aapt resource value: 0x7F090108
+ public const int text_input_password_toggle = 2131296520;
- // aapt resource value: 0x7f09000b
- public const int textinput_error = 2131296267;
+ // aapt resource value: 0x7F09010B
+ public const int time = 2131296523;
- // aapt resource value: 0x7f0900ed
- public const int time = 2131296493;
+ // aapt resource value: 0x7F09010C
+ public const int timepicker = 2131296524;
- // aapt resource value: 0x7f0900da
- public const int timepicker = 2131296474;
+ // aapt resource value: 0x7F09010D
+ public const int title = 2131296525;
- // aapt resource value: 0x7f090011
- public const int title = 2131296273;
+ // aapt resource value: 0x7F09010E
+ public const int titleDividerNoCustom = 2131296526;
- // aapt resource value: 0x7f09006e
- public const int titleDividerNoCustom = 2131296366;
+ // aapt resource value: 0x7F09010F
+ public const int title_template = 2131296527;
- // aapt resource value: 0x7f09006c
- public const int title_template = 2131296364;
+ // aapt resource value: 0x7F090110
+ public const int top = 2131296528;
- // aapt resource value: 0x7f090033
- public const int top = 2131296307;
+ // aapt resource value: 0x7F090111
+ public const int topPanel = 2131296529;
- // aapt resource value: 0x7f09006b
- public const int topPanel = 2131296363;
+ // aapt resource value: 0x7F090112
+ public const int touch_outside = 2131296530;
- // aapt resource value: 0x7f0900a5
- public const int touch_outside = 2131296421;
+ // aapt resource value: 0x7F090014
+ public const int Translate = 2131296276;
- // aapt resource value: 0x7f0900ce
- public const int tvTitle = 2131296462;
+ // aapt resource value: 0x7F090113
+ public const int tvTitle = 2131296531;
- // aapt resource value: 0x7f0900ba
- public const int tv_call = 2131296442;
+ // aapt resource value: 0x7F090114
+ public const int tv_call = 2131296532;
- // aapt resource value: 0x7f0900b0
- public const int tv_content = 2131296432;
+ // aapt resource value: 0x7F090115
+ public const int tv_content = 2131296533;
- // aapt resource value: 0x7f0900b7
- public const int tv_hangup = 2131296439;
+ // aapt resource value: 0x7F090116
+ public const int tv_hangup = 2131296534;
- // aapt resource value: 0x7f090099
- public const int tv_name = 2131296409;
+ // aapt resource value: 0x7F090117
+ public const int tv_name = 2131296535;
- // aapt resource value: 0x7f0900b1
- public const int tv_ok = 2131296433;
+ // aapt resource value: 0x7F090118
+ public const int tv_ok = 2131296536;
- // aapt resource value: 0x7f09009b
- public const int tv_roomName = 2131296411;
+ // aapt resource value: 0x7F090119
+ public const int tv_roomName = 2131296537;
- // aapt resource value: 0x7f0900bc
- public const int tv_screenshot = 2131296444;
+ // aapt resource value: 0x7F09011A
+ public const int tv_screenshot = 2131296538;
- // aapt resource value: 0x7f0900b4
- public const int tv_tip = 2131296436;
+ // aapt resource value: 0x7F09011B
+ public const int tv_tip = 2131296539;
- // aapt resource value: 0x7f0900af
- public const int tv_title = 2131296431;
+ // aapt resource value: 0x7F09011C
+ public const int tv_title = 2131296540;
- // aapt resource value: 0x7f0900be
- public const int tv_unlock = 2131296446;
+ // aapt resource value: 0x7F09011D
+ public const int tv_unlock = 2131296541;
- // aapt resource value: 0x7f090127
- public const int tv_zxing_back = 2131296551;
+ // aapt resource value: 0x7F09011E
+ public const int tv_zxing_back = 2131296542;
- // aapt resource value: 0x7f090128
- public const int tv_zxing_flash = 2131296552;
+ // aapt resource value: 0x7F09011F
+ public const int tv_zxing_flash = 2131296543;
- // aapt resource value: 0x7f090126
- public const int tv_zxing_scan = 2131296550;
+ // aapt resource value: 0x7F090120
+ public const int tv_zxing_scan = 2131296544;
- // aapt resource value: 0x7f090022
- public const int uniform = 2131296290;
+ // aapt resource value: 0x7F090121
+ public const int uniform = 2131296545;
- // aapt resource value: 0x7f090009
- public const int up = 2131296265;
+ // aapt resource value: 0x7F090122
+ public const int up = 2131296546;
- // aapt resource value: 0x7f09001b
- public const int useLogo = 2131296283;
+ // aapt resource value: 0x7F090123
+ public const int useLogo = 2131296547;
- // aapt resource value: 0x7f090123
- public const int uvc = 2131296547;
+ // aapt resource value: 0x7F090124
+ public const int uvc = 2131296548;
- // aapt resource value: 0x7f090120
- public const int videoParent = 2131296544;
+ // aapt resource value: 0x7F090125
+ public const int videoParent = 2131296549;
- // aapt resource value: 0x7f09000c
- public const int view_offset_helper = 2131296268;
+ // aapt resource value: 0x7F090126
+ public const int view_offset_helper = 2131296550;
- // aapt resource value: 0x7f090129
- public const int visible = 2131296553;
+ // aapt resource value: 0x7F090127
+ public const int visible = 2131296551;
- // aapt resource value: 0x7f090031
- public const int withText = 2131296305;
+ // aapt resource value: 0x7F090128
+ public const int withText = 2131296552;
- // aapt resource value: 0x7f090023
- public const int wrap_content = 2131296291;
+ // aapt resource value: 0x7F090129
+ public const int wrap_content = 2131296553;
- // aapt resource value: 0x7f0900db
- public const int year = 2131296475;
+ // aapt resource value: 0x7F09012A
+ public const int year = 2131296554;
static Id()
{
@@ -4021,38 +4000,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()
{
@@ -4067,257 +4046,257 @@
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 activity_elian = 2130968603;
+ // aapt resource value: 0x7F0B001B
+ public const int activity_elian = 2131427355;
- // aapt resource value: 0x7f04001c
- public const int activity_main = 2130968604;
+ // aapt resource value: 0x7F0B001C
+ public const int activity_main = 2131427356;
- // aapt resource value: 0x7f04001d
- public const int activity_video_phone = 2130968605;
+ // aapt resource value: 0x7F0B001D
+ public const int activity_video_phone = 2131427357;
- // aapt resource value: 0x7f04001e
- public const int biometric_prompt_dialog_content = 2130968606;
+ // aapt resource value: 0x7F0B001E
+ public const int biometric_prompt_dialog_content = 2131427358;
- // aapt resource value: 0x7f04001f
- public const int design_bottom_navigation_item = 2130968607;
+ // aapt resource value: 0x7F0B001F
+ public const int design_bottom_navigation_item = 2131427359;
- // aapt resource value: 0x7f040020
- public const int design_bottom_sheet_dialog = 2130968608;
+ // aapt resource value: 0x7F0B0020
+ public const int design_bottom_sheet_dialog = 2131427360;
- // aapt resource value: 0x7f040021
- public const int design_layout_snackbar = 2130968609;
+ // aapt resource value: 0x7F0B0021
+ public const int design_layout_snackbar = 2131427361;
- // aapt resource value: 0x7f040022
- public const int design_layout_snackbar_include = 2130968610;
+ // aapt resource value: 0x7F0B0022
+ public const int design_layout_snackbar_include = 2131427362;
- // aapt resource value: 0x7f040023
- public const int design_layout_tab_icon = 2130968611;
+ // aapt resource value: 0x7F0B0023
+ public const int design_layout_tab_icon = 2131427363;
- // aapt resource value: 0x7f040024
- public const int design_layout_tab_text = 2130968612;
+ // aapt resource value: 0x7F0B0024
+ public const int design_layout_tab_text = 2131427364;
- // aapt resource value: 0x7f040025
- public const int design_menu_item_action_area = 2130968613;
+ // aapt resource value: 0x7F0B0025
+ public const int design_menu_item_action_area = 2131427365;
- // aapt resource value: 0x7f040026
- public const int design_navigation_item = 2130968614;
+ // aapt resource value: 0x7F0B0026
+ public const int design_navigation_item = 2131427366;
- // aapt resource value: 0x7f040027
- public const int design_navigation_item_header = 2130968615;
+ // aapt resource value: 0x7F0B0027
+ public const int design_navigation_item_header = 2131427367;
- // aapt resource value: 0x7f040028
- public const int design_navigation_item_separator = 2130968616;
+ // aapt resource value: 0x7F0B0028
+ public const int design_navigation_item_separator = 2131427368;
- // aapt resource value: 0x7f040029
- public const int design_navigation_item_subheader = 2130968617;
+ // aapt resource value: 0x7F0B0029
+ public const int design_navigation_item_subheader = 2131427369;
- // aapt resource value: 0x7f04002a
- public const int design_navigation_menu = 2130968618;
+ // aapt resource value: 0x7F0B002A
+ public const int design_navigation_menu = 2131427370;
- // aapt resource value: 0x7f04002b
- public const int design_navigation_menu_item = 2130968619;
+ // aapt resource value: 0x7F0B002B
+ public const int design_navigation_menu_item = 2131427371;
- // aapt resource value: 0x7f04002c
- public const int design_text_input_password_icon = 2130968620;
+ // aapt resource value: 0x7F0B002C
+ public const int design_text_input_password_icon = 2131427372;
- // aapt resource value: 0x7f04002d
- public const int dialog_tip = 2130968621;
+ // aapt resource value: 0x7F0B002D
+ public const int dialog_tip = 2131427373;
- // aapt resource value: 0x7f04002e
- public const int fragment_call = 2130968622;
+ // aapt resource value: 0x7F0B002E
+ public const int fragment_call = 2131427374;
- // aapt resource value: 0x7f04002f
- public const int fragment_monitor = 2130968623;
+ // aapt resource value: 0x7F0B002F
+ public const int fragment_monitor = 2131427375;
- // aapt resource value: 0x7f040030
- public const int hdl_gallery_banner_view_layout = 2130968624;
+ // aapt resource value: 0x7F0B0030
+ public const int hdl_gallery_banner_view_layout = 2131427376;
- // aapt resource value: 0x7f040031
- public const int hdl_widget_activity_crop_image = 2130968625;
+ // aapt resource value: 0x7F0B0031
+ public const int hdl_widget_activity_crop_image = 2131427377;
- // aapt resource value: 0x7f040032
- public const int hdl_widget_activity_geofence_round = 2130968626;
+ // aapt resource value: 0x7F0B0032
+ public const int hdl_widget_activity_geofence_round = 2131427378;
- // aapt resource value: 0x7f040033
- public const int hdl_widget_air_button = 2130968627;
+ // aapt resource value: 0x7F0B0033
+ public const int hdl_widget_air_button = 2131427379;
- // aapt resource value: 0x7f040034
- public const int hdl_widget_include_pickerview_topbar = 2130968628;
+ // aapt resource value: 0x7F0B0034
+ public const int hdl_widget_include_pickerview_topbar = 2131427380;
- // aapt resource value: 0x7f040035
- public const int hdl_widget_layout_basepickerview = 2130968629;
+ // aapt resource value: 0x7F0B0035
+ public const int hdl_widget_layout_basepickerview = 2131427381;
- // aapt resource value: 0x7f040036
- public const int hdl_widget_pickerview = 2130968630;
+ // aapt resource value: 0x7F0B0036
+ public const int hdl_widget_pickerview = 2131427382;
- // aapt resource value: 0x7f040037
- public const int hdl_widget_pickerview_options = 2130968631;
+ // aapt resource value: 0x7F0B0037
+ public const int hdl_widget_pickerview_options = 2131427383;
- // aapt resource value: 0x7f040038
- public const int hdl_widget_pickerview_time = 2130968632;
+ // aapt resource value: 0x7F0B0038
+ public const int hdl_widget_pickerview_time = 2131427384;
- // aapt resource value: 0x7f040039
- public const int Main = 2130968633;
+ // aapt resource value: 0x7F0B0039
+ public const int Main = 2131427385;
- // aapt resource value: 0x7f04003a
- public const int notification_action = 2130968634;
+ // aapt resource value: 0x7F0B003A
+ public const int notification_action = 2131427386;
- // aapt resource value: 0x7f04003b
- public const int notification_action_tombstone = 2130968635;
+ // aapt resource value: 0x7F0B003B
+ public const int notification_action_tombstone = 2131427387;
- // aapt resource value: 0x7f04003c
- public const int notification_media_action = 2130968636;
+ // aapt resource value: 0x7F0B003C
+ public const int notification_media_action = 2131427388;
- // aapt resource value: 0x7f04003d
- public const int notification_media_cancel_action = 2130968637;
+ // aapt resource value: 0x7F0B003D
+ public const int notification_media_cancel_action = 2131427389;
- // aapt resource value: 0x7f04003e
- public const int notification_template_big_media = 2130968638;
+ // aapt resource value: 0x7F0B003E
+ public const int notification_template_big_media = 2131427390;
- // aapt resource value: 0x7f04003f
- public const int notification_template_big_media_custom = 2130968639;
+ // aapt resource value: 0x7F0B003F
+ public const int notification_template_big_media_custom = 2131427391;
- // aapt resource value: 0x7f040040
- public const int notification_template_big_media_narrow = 2130968640;
+ // aapt resource value: 0x7F0B0040
+ public const int notification_template_big_media_narrow = 2131427392;
- // aapt resource value: 0x7f040041
- public const int notification_template_big_media_narrow_custom = 2130968641;
+ // aapt resource value: 0x7F0B0041
+ public const int notification_template_big_media_narrow_custom = 2131427393;
- // aapt resource value: 0x7f040042
- public const int notification_template_custom_big = 2130968642;
+ // aapt resource value: 0x7F0B0042
+ public const int notification_template_custom_big = 2131427394;
- // aapt resource value: 0x7f040043
- public const int notification_template_icon_group = 2130968643;
+ // aapt resource value: 0x7F0B0043
+ public const int notification_template_icon_group = 2131427395;
- // aapt resource value: 0x7f040044
- public const int notification_template_lines_media = 2130968644;
+ // aapt resource value: 0x7F0B0044
+ public const int notification_template_lines_media = 2131427396;
- // aapt resource value: 0x7f040045
- public const int notification_template_media = 2130968645;
+ // aapt resource value: 0x7F0B0045
+ public const int notification_template_media = 2131427397;
- // aapt resource value: 0x7f040046
- public const int notification_template_media_custom = 2130968646;
+ // aapt resource value: 0x7F0B0046
+ public const int notification_template_media_custom = 2131427398;
- // aapt resource value: 0x7f040047
- public const int notification_template_part_chronometer = 2130968647;
+ // aapt resource value: 0x7F0B0047
+ public const int notification_template_part_chronometer = 2131427399;
- // aapt resource value: 0x7f040048
- public const int notification_template_part_time = 2130968648;
+ // aapt resource value: 0x7F0B0048
+ public const int notification_template_part_time = 2131427400;
- // aapt resource value: 0x7f040049
- public const int select_dialog_item_material = 2130968649;
+ // aapt resource value: 0x7F0B0049
+ public const int select_dialog_item_material = 2131427401;
- // aapt resource value: 0x7f04004a
- public const int select_dialog_multichoice_material = 2130968650;
+ // aapt resource value: 0x7F0B004A
+ public const int select_dialog_multichoice_material = 2131427402;
- // aapt resource value: 0x7f04004b
- public const int select_dialog_singlechoice_material = 2130968651;
+ // aapt resource value: 0x7F0B004B
+ public const int select_dialog_singlechoice_material = 2131427403;
- // aapt resource value: 0x7f04004c
- public const int simple_demo = 2130968652;
+ // aapt resource value: 0x7F0B004C
+ public const int simple_demo = 2131427404;
- // aapt resource value: 0x7f04004d
- public const int srl_classics_footer = 2130968653;
+ // aapt resource value: 0x7F0B004D
+ public const int srl_classics_footer = 2131427405;
- // aapt resource value: 0x7f04004e
- public const int srl_classics_header = 2130968654;
+ // aapt resource value: 0x7F0B004E
+ public const int srl_classics_header = 2131427406;
- // aapt resource value: 0x7f04004f
- public const int support_simple_spinner_dropdown_item = 2130968655;
+ // aapt resource value: 0x7F0B004F
+ public const int support_simple_spinner_dropdown_item = 2131427407;
- // aapt resource value: 0x7f040050
- public const int test_surfaceview = 2130968656;
+ // aapt resource value: 0x7F0B0050
+ public const int test_surfaceview = 2131427408;
- // aapt resource value: 0x7f040051
- public const int tooltip = 2130968657;
+ // aapt resource value: 0x7F0B0051
+ public const int tooltip = 2131427409;
- // aapt resource value: 0x7f040052
- public const int video_device = 2130968658;
+ // aapt resource value: 0x7F0B0052
+ public const int video_device = 2131427410;
- // aapt resource value: 0x7f040053
- public const int zxing_layout = 2130968659;
+ // aapt resource value: 0x7F0B0053
+ public const int zxing_layout = 2131427411;
static Layout()
{
@@ -4332,14 +4311,14 @@
public partial class Mipmap
{
- // aapt resource value: 0x7f030000
- public const int ic_launcher = 2130903040;
+ // aapt resource value: 0x7F0C0002
+ public const int Icon = 2131492866;
- // aapt resource value: 0x7f030001
- public const int ic_launcher_round = 2130903041;
+ // aapt resource value: 0x7F0C0000
+ public const int ic_launcher = 2131492864;
- // aapt resource value: 0x7f030002
- public const int Icon = 2130903042;
+ // aapt resource value: 0x7F0C0001
+ public const int ic_launcher_round = 2131492865;
static Mipmap()
{
@@ -4354,242 +4333,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: 0x7f0a0029
- public const int app_name = 2131361833;
+ // 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: 0x7f0a002a
- public const int not_recognized_fingerprint_hint = 2131361834;
+ // 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: 0x7f0a002c
- public const int srl_component_falsify = 2131361836;
+ // aapt resource value: 0x7F0D003C
+ public const int srl_component_falsify = 2131558460;
- // aapt resource value: 0x7f0a002d
- public const int srl_content_empty = 2131361837;
+ // aapt resource value: 0x7F0D003D
+ public const int srl_content_empty = 2131558461;
- // aapt resource value: 0x7f0a002e
- public const int srl_footer_failed = 2131361838;
+ // aapt resource value: 0x7F0D003E
+ public const int srl_footer_failed = 2131558462;
- // aapt resource value: 0x7f0a002f
- public const int srl_footer_finish = 2131361839;
+ // aapt resource value: 0x7F0D003F
+ public const int srl_footer_finish = 2131558463;
- // aapt resource value: 0x7f0a0030
- public const int srl_footer_loading = 2131361840;
+ // aapt resource value: 0x7F0D0040
+ public const int srl_footer_loading = 2131558464;
- // aapt resource value: 0x7f0a0031
- public const int srl_footer_nothing = 2131361841;
+ // aapt resource value: 0x7F0D0041
+ public const int srl_footer_nothing = 2131558465;
- // aapt resource value: 0x7f0a0032
- public const int srl_footer_pulling = 2131361842;
+ // aapt resource value: 0x7F0D0042
+ public const int srl_footer_pulling = 2131558466;
- // aapt resource value: 0x7f0a0033
- public const int srl_footer_refreshing = 2131361843;
+ // aapt resource value: 0x7F0D0043
+ public const int srl_footer_refreshing = 2131558467;
- // aapt resource value: 0x7f0a0034
- public const int srl_footer_release = 2131361844;
+ // aapt resource value: 0x7F0D0044
+ public const int srl_footer_release = 2131558468;
- // aapt resource value: 0x7f0a0035
- public const int srl_header_failed = 2131361845;
+ // aapt resource value: 0x7F0D0045
+ public const int srl_header_failed = 2131558469;
- // aapt resource value: 0x7f0a0036
- public const int srl_header_finish = 2131361846;
+ // aapt resource value: 0x7F0D0046
+ public const int srl_header_finish = 2131558470;
- // aapt resource value: 0x7f0a0037
- public const int srl_header_loading = 2131361847;
+ // aapt resource value: 0x7F0D0047
+ public const int srl_header_loading = 2131558471;
- // aapt resource value: 0x7f0a0038
- public const int srl_header_pulling = 2131361848;
+ // aapt resource value: 0x7F0D0048
+ public const int srl_header_pulling = 2131558472;
- // aapt resource value: 0x7f0a0039
- public const int srl_header_refreshing = 2131361849;
+ // aapt resource value: 0x7F0D0049
+ public const int srl_header_refreshing = 2131558473;
- // aapt resource value: 0x7f0a003a
- public const int srl_header_release = 2131361850;
+ // aapt resource value: 0x7F0D004A
+ public const int srl_header_release = 2131558474;
- // aapt resource value: 0x7f0a003b
- public const int srl_header_secondary = 2131361851;
+ // aapt resource value: 0x7F0D004B
+ public const int srl_header_secondary = 2131558475;
- // aapt resource value: 0x7f0a003c
- public const int srl_header_update = 2131361852;
+ // 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: 0x7f0a002b
- public const int touch_fingerprint_sensor_hint = 2131361835;
+ // aapt resource value: 0x7F0D004E
+ public const int touch_fingerprint_sensor_hint = 2131558478;
static String()
{
@@ -4604,1214 +4583,1214 @@
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: 0x7f0b018a
- public const int AppTheme = 2131427722;
+ // aapt resource value: 0x7F0E0006
+ public const int AppTheme = 2131623942;
- // aapt resource value: 0x7f0b00a2
- public const int Base_AlertDialog_AppCompat = 2131427490;
+ // aapt resource value: 0x7F0E0007
+ public const int Base_AlertDialog_AppCompat = 2131623943;
- // aapt resource value: 0x7f0b00a3
- public const int Base_AlertDialog_AppCompat_Light = 2131427491;
+ // aapt resource value: 0x7F0E0008
+ public const int Base_AlertDialog_AppCompat_Light = 2131623944;
- // aapt resource value: 0x7f0b00a4
- public const int Base_Animation_AppCompat_Dialog = 2131427492;
+ // aapt resource value: 0x7F0E0009
+ public const int Base_Animation_AppCompat_Dialog = 2131623945;
- // aapt resource value: 0x7f0b00a5
- public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
+ // aapt resource value: 0x7F0E000A
+ public const int Base_Animation_AppCompat_DropDownUp = 2131623946;
- // aapt resource value: 0x7f0b00a6
- public const int Base_Animation_AppCompat_Tooltip = 2131427494;
+ // aapt resource value: 0x7F0E000B
+ public const int Base_Animation_AppCompat_Tooltip = 2131623947;
- // aapt resource value: 0x7f0b00a7
- public const int Base_DialogWindowTitle_AppCompat = 2131427495;
+ // aapt resource value: 0x7F0E000D
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131623949;
- // aapt resource value: 0x7f0b00a8
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
+ // aapt resource value: 0x7F0E000C
+ public const int Base_DialogWindowTitle_AppCompat = 2131623948;
- // aapt resource value: 0x7f0b0039
- public const int Base_TextAppearance_AppCompat = 2131427385;
+ // aapt resource value: 0x7F0E000E
+ public const int Base_TextAppearance_AppCompat = 2131623950;
- // aapt resource value: 0x7f0b003a
- public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
+ // aapt resource value: 0x7F0E000F
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131623951;
- // aapt resource value: 0x7f0b003b
- public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
+ // aapt resource value: 0x7F0E0010
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131623952;
- // aapt resource value: 0x7f0b0027
- public const int Base_TextAppearance_AppCompat_Button = 2131427367;
+ // aapt resource value: 0x7F0E0011
+ public const int Base_TextAppearance_AppCompat_Button = 2131623953;
- // aapt resource value: 0x7f0b003c
- public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
+ // aapt resource value: 0x7F0E0012
+ public const int Base_TextAppearance_AppCompat_Caption = 2131623954;
- // aapt resource value: 0x7f0b003d
- public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
+ // aapt resource value: 0x7F0E0013
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131623955;
- // aapt resource value: 0x7f0b003e
- public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
+ // aapt resource value: 0x7F0E0014
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131623956;
- // aapt resource value: 0x7f0b003f
- public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
+ // aapt resource value: 0x7F0E0015
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131623957;
- // aapt resource value: 0x7f0b0040
- public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
+ // aapt resource value: 0x7F0E0016
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131623958;
- // aapt resource value: 0x7f0b0041
- public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
+ // aapt resource value: 0x7F0E0017
+ public const int Base_TextAppearance_AppCompat_Headline = 2131623959;
- // aapt resource value: 0x7f0b000b
- public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
+ // aapt resource value: 0x7F0E0018
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131623960;
- // aapt resource value: 0x7f0b0042
- public const int Base_TextAppearance_AppCompat_Large = 2131427394;
+ // aapt resource value: 0x7F0E0019
+ public const int Base_TextAppearance_AppCompat_Large = 2131623961;
- // aapt resource value: 0x7f0b000c
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
+ // aapt resource value: 0x7F0E001A
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623962;
- // aapt resource value: 0x7f0b0043
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
+ // aapt resource value: 0x7F0E001B
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623963;
- // aapt resource value: 0x7f0b0044
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
+ // aapt resource value: 0x7F0E001C
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623964;
- // aapt resource value: 0x7f0b0045
- public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
+ // aapt resource value: 0x7F0E001D
+ public const int Base_TextAppearance_AppCompat_Medium = 2131623965;
- // aapt resource value: 0x7f0b000d
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
+ // aapt resource value: 0x7F0E001E
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623966;
- // aapt resource value: 0x7f0b0046
- public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
+ // aapt resource value: 0x7F0E001F
+ public const int Base_TextAppearance_AppCompat_Menu = 2131623967;
- // aapt resource value: 0x7f0b00a9
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
+ // aapt resource value: 0x7F0E0020
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131623968;
- // aapt resource value: 0x7f0b0047
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
+ // aapt resource value: 0x7F0E0021
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623969;
- // aapt resource value: 0x7f0b0048
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
+ // aapt resource value: 0x7F0E0022
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623970;
- // aapt resource value: 0x7f0b0049
- public const int Base_TextAppearance_AppCompat_Small = 2131427401;
+ // aapt resource value: 0x7F0E0023
+ public const int Base_TextAppearance_AppCompat_Small = 2131623971;
- // aapt resource value: 0x7f0b000e
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
+ // aapt resource value: 0x7F0E0024
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623972;
- // aapt resource value: 0x7f0b004a
- public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
+ // aapt resource value: 0x7F0E0025
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131623973;
- // aapt resource value: 0x7f0b000f
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
+ // aapt resource value: 0x7F0E0026
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623974;
- // aapt resource value: 0x7f0b004b
- public const int Base_TextAppearance_AppCompat_Title = 2131427403;
+ // aapt resource value: 0x7F0E0027
+ public const int Base_TextAppearance_AppCompat_Title = 2131623975;
- // aapt resource value: 0x7f0b0010
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
+ // aapt resource value: 0x7F0E0028
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623976;
- // aapt resource value: 0x7f0b00aa
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
+ // aapt resource value: 0x7F0E0029
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131623977;
- // aapt resource value: 0x7f0b008e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
+ // aapt resource value: 0x7F0E002A
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623978;
- // aapt resource value: 0x7f0b004c
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
+ // aapt resource value: 0x7F0E002B
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623979;
- // aapt resource value: 0x7f0b004d
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
+ // aapt resource value: 0x7F0E002C
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623980;
- // aapt resource value: 0x7f0b004e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
+ // aapt resource value: 0x7F0E002D
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623981;
- // aapt resource value: 0x7f0b004f
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
+ // aapt resource value: 0x7F0E002E
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623982;
- // aapt resource value: 0x7f0b0050
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
+ // aapt resource value: 0x7F0E002F
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623983;
- // aapt resource value: 0x7f0b0051
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
+ // aapt resource value: 0x7F0E0030
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623984;
- // aapt resource value: 0x7f0b0052
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
+ // aapt resource value: 0x7F0E0031
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623985;
- // aapt resource value: 0x7f0b0095
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
+ // aapt resource value: 0x7F0E0032
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623986;
- // aapt resource value: 0x7f0b0096
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
+ // aapt resource value: 0x7F0E0033
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623987;
- // aapt resource value: 0x7f0b008f
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
+ // aapt resource value: 0x7F0E0034
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623988;
- // aapt resource value: 0x7f0b00ab
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
+ // aapt resource value: 0x7F0E0035
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623989;
- // aapt resource value: 0x7f0b0053
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
+ // aapt resource value: 0x7F0E0036
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623990;
- // aapt resource value: 0x7f0b0054
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
+ // aapt resource value: 0x7F0E0037
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623991;
- // aapt resource value: 0x7f0b0055
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
+ // aapt resource value: 0x7F0E0038
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623992;
- // aapt resource value: 0x7f0b0056
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
+ // aapt resource value: 0x7F0E0039
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623993;
- // aapt resource value: 0x7f0b0057
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
+ // aapt resource value: 0x7F0E003A
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623994;
- // aapt resource value: 0x7f0b00ac
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
+ // aapt resource value: 0x7F0E003B
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623995;
- // aapt resource value: 0x7f0b0058
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
+ // aapt resource value: 0x7F0E003C
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623996;
- // aapt resource value: 0x7f0b0059
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
+ // aapt resource value: 0x7F0E003D
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623997;
- // aapt resource value: 0x7f0b005a
- public const int Base_Theme_AppCompat = 2131427418;
+ // aapt resource value: 0x7F0E004C
+ public const int Base_ThemeOverlay_AppCompat = 2131624012;
- // aapt resource value: 0x7f0b00ad
- public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
+ // aapt resource value: 0x7F0E004D
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624013;
- // aapt resource value: 0x7f0b0011
- public const int Base_Theme_AppCompat_Dialog = 2131427345;
+ // aapt resource value: 0x7F0E004E
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131624014;
- // aapt resource value: 0x7f0b0012
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
+ // aapt resource value: 0x7F0E004F
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624015;
- // aapt resource value: 0x7f0b00ae
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
+ // aapt resource value: 0x7F0E0050
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624016;
- // aapt resource value: 0x7f0b0013
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
+ // aapt resource value: 0x7F0E0051
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624017;
- // aapt resource value: 0x7f0b0001
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
+ // aapt resource value: 0x7F0E0052
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131624018;
- // aapt resource value: 0x7f0b005b
- public const int Base_Theme_AppCompat_Light = 2131427419;
+ // aapt resource value: 0x7F0E003E
+ public const int Base_Theme_AppCompat = 2131623998;
- // aapt resource value: 0x7f0b00af
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
+ // aapt resource value: 0x7F0E003F
+ public const int Base_Theme_AppCompat_CompactMenu = 2131623999;
- // aapt resource value: 0x7f0b0014
- public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
+ // aapt resource value: 0x7F0E0040
+ public const int Base_Theme_AppCompat_Dialog = 2131624000;
- // aapt resource value: 0x7f0b0015
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
+ // aapt resource value: 0x7F0E0044
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624004;
- // aapt resource value: 0x7f0b00b0
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
+ // aapt resource value: 0x7F0E0041
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131624001;
- // aapt resource value: 0x7f0b0016
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
+ // aapt resource value: 0x7F0E0042
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624002;
- // aapt resource value: 0x7f0b0002
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
+ // aapt resource value: 0x7F0E0043
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624003;
- // aapt resource value: 0x7f0b00b1
- public const int Base_ThemeOverlay_AppCompat = 2131427505;
+ // aapt resource value: 0x7F0E0045
+ public const int Base_Theme_AppCompat_Light = 2131624005;
- // aapt resource value: 0x7f0b00b2
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
+ // aapt resource value: 0x7F0E0046
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624006;
- // aapt resource value: 0x7f0b00b3
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
+ // aapt resource value: 0x7F0E0047
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131624007;
- // aapt resource value: 0x7f0b00b4
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
+ // aapt resource value: 0x7F0E004B
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624011;
- // aapt resource value: 0x7f0b0017
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
+ // aapt resource value: 0x7F0E0048
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624008;
- // aapt resource value: 0x7f0b0018
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
+ // aapt resource value: 0x7F0E0049
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624009;
- // aapt resource value: 0x7f0b00b5
- public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
+ // aapt resource value: 0x7F0E004A
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624010;
- // aapt resource value: 0x7f0b0019
- public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
+ // aapt resource value: 0x7F0E0055
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624021;
- // aapt resource value: 0x7f0b001a
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
+ // aapt resource value: 0x7F0E0053
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131624019;
- // aapt resource value: 0x7f0b001b
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
+ // aapt resource value: 0x7F0E0054
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624020;
- // aapt resource value: 0x7f0b0023
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
+ // aapt resource value: 0x7F0E0056
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624022;
- // aapt resource value: 0x7f0b0024
- public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
+ // aapt resource value: 0x7F0E0057
+ public const int Base_V12_Widget_AppCompat_EditText = 2131624023;
- // aapt resource value: 0x7f0b016a
- public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
+ // aapt resource value: 0x7F0E0058
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131624024;
- // aapt resource value: 0x7f0b005c
- public const int Base_V21_Theme_AppCompat = 2131427420;
+ // aapt resource value: 0x7F0E005D
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624029;
- // aapt resource value: 0x7f0b005d
- public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
+ // aapt resource value: 0x7F0E0059
+ public const int Base_V21_Theme_AppCompat = 2131624025;
- // aapt resource value: 0x7f0b005e
- public const int Base_V21_Theme_AppCompat_Light = 2131427422;
+ // aapt resource value: 0x7F0E005A
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131624026;
- // aapt resource value: 0x7f0b005f
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
+ // aapt resource value: 0x7F0E005B
+ public const int Base_V21_Theme_AppCompat_Light = 2131624027;
- // aapt resource value: 0x7f0b0060
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
+ // aapt resource value: 0x7F0E005C
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624028;
- // aapt resource value: 0x7f0b0166
- public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
+ // aapt resource value: 0x7F0E005E
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131624030;
- // aapt resource value: 0x7f0b008c
- public const int Base_V22_Theme_AppCompat = 2131427468;
+ // aapt resource value: 0x7F0E005F
+ public const int Base_V22_Theme_AppCompat = 2131624031;
- // aapt resource value: 0x7f0b008d
- public const int Base_V22_Theme_AppCompat_Light = 2131427469;
+ // aapt resource value: 0x7F0E0060
+ public const int Base_V22_Theme_AppCompat_Light = 2131624032;
- // aapt resource value: 0x7f0b0090
- public const int Base_V23_Theme_AppCompat = 2131427472;
+ // aapt resource value: 0x7F0E0061
+ public const int Base_V23_Theme_AppCompat = 2131624033;
- // aapt resource value: 0x7f0b0091
- public const int Base_V23_Theme_AppCompat_Light = 2131427473;
+ // aapt resource value: 0x7F0E0062
+ public const int Base_V23_Theme_AppCompat_Light = 2131624034;
- // aapt resource value: 0x7f0b0099
- public const int Base_V26_Theme_AppCompat = 2131427481;
+ // aapt resource value: 0x7F0E0063
+ public const int Base_V26_Theme_AppCompat = 2131624035;
- // aapt resource value: 0x7f0b009a
- public const int Base_V26_Theme_AppCompat_Light = 2131427482;
+ // aapt resource value: 0x7F0E0064
+ public const int Base_V26_Theme_AppCompat_Light = 2131624036;
- // aapt resource value: 0x7f0b009b
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
+ // aapt resource value: 0x7F0E0065
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131624037;
- // aapt resource value: 0x7f0b0168
- public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
+ // aapt resource value: 0x7F0E0066
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131624038;
- // aapt resource value: 0x7f0b00b6
- public const int Base_V7_Theme_AppCompat = 2131427510;
+ // aapt resource value: 0x7F0E006B
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624043;
- // aapt resource value: 0x7f0b00b7
- public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
+ // aapt resource value: 0x7F0E0067
+ public const int Base_V7_Theme_AppCompat = 2131624039;
- // aapt resource value: 0x7f0b00b8
- public const int Base_V7_Theme_AppCompat_Light = 2131427512;
+ // aapt resource value: 0x7F0E0068
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131624040;
- // aapt resource value: 0x7f0b00b9
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
+ // aapt resource value: 0x7F0E0069
+ public const int Base_V7_Theme_AppCompat_Light = 2131624041;
- // aapt resource value: 0x7f0b00ba
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
+ // aapt resource value: 0x7F0E006A
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624042;
- // aapt resource value: 0x7f0b00bb
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
+ // aapt resource value: 0x7F0E006C
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624044;
- // aapt resource value: 0x7f0b00bc
- public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
+ // aapt resource value: 0x7F0E006D
+ public const int Base_V7_Widget_AppCompat_EditText = 2131624045;
- // aapt resource value: 0x7f0b00bd
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
+ // aapt resource value: 0x7F0E006E
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131624046;
- // aapt resource value: 0x7f0b00be
- public const int Base_Widget_AppCompat_ActionBar = 2131427518;
+ // aapt resource value: 0x7F0E006F
+ public const int Base_Widget_AppCompat_ActionBar = 2131624047;
- // aapt resource value: 0x7f0b00bf
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
+ // aapt resource value: 0x7F0E0070
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624048;
- // aapt resource value: 0x7f0b00c0
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
+ // aapt resource value: 0x7F0E0071
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624049;
- // aapt resource value: 0x7f0b0061
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
+ // aapt resource value: 0x7F0E0072
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624050;
- // aapt resource value: 0x7f0b0062
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
+ // aapt resource value: 0x7F0E0073
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624051;
- // aapt resource value: 0x7f0b0063
- public const int Base_Widget_AppCompat_ActionButton = 2131427427;
+ // aapt resource value: 0x7F0E0074
+ public const int Base_Widget_AppCompat_ActionButton = 2131624052;
- // aapt resource value: 0x7f0b0064
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
+ // aapt resource value: 0x7F0E0075
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624053;
- // aapt resource value: 0x7f0b0065
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
+ // aapt resource value: 0x7F0E0076
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624054;
- // aapt resource value: 0x7f0b00c1
- public const int Base_Widget_AppCompat_ActionMode = 2131427521;
+ // aapt resource value: 0x7F0E0077
+ public const int Base_Widget_AppCompat_ActionMode = 2131624055;
- // aapt resource value: 0x7f0b00c2
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
+ // aapt resource value: 0x7F0E0078
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131624056;
- // aapt resource value: 0x7f0b0025
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
+ // aapt resource value: 0x7F0E0079
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624057;
- // aapt resource value: 0x7f0b0066
- public const int Base_Widget_AppCompat_Button = 2131427430;
+ // aapt resource value: 0x7F0E007A
+ public const int Base_Widget_AppCompat_Button = 2131624058;
- // aapt resource value: 0x7f0b0067
- public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
+ // aapt resource value: 0x7F0E0080
+ public const int Base_Widget_AppCompat_ButtonBar = 2131624064;
- // aapt resource value: 0x7f0b0068
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
+ // aapt resource value: 0x7F0E0081
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624065;
- // aapt resource value: 0x7f0b00c3
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
+ // aapt resource value: 0x7F0E007B
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131624059;
- // aapt resource value: 0x7f0b0092
- public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
+ // aapt resource value: 0x7F0E007C
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624060;
- // aapt resource value: 0x7f0b0069
- public const int Base_Widget_AppCompat_Button_Small = 2131427433;
+ // aapt resource value: 0x7F0E007D
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624061;
- // aapt resource value: 0x7f0b006a
- public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
+ // aapt resource value: 0x7F0E007E
+ public const int Base_Widget_AppCompat_Button_Colored = 2131624062;
- // aapt resource value: 0x7f0b00c4
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
+ // aapt resource value: 0x7F0E007F
+ public const int Base_Widget_AppCompat_Button_Small = 2131624063;
- // aapt resource value: 0x7f0b006b
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
+ // aapt resource value: 0x7F0E0082
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624066;
- // aapt resource value: 0x7f0b006c
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
+ // aapt resource value: 0x7F0E0083
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624067;
- // aapt resource value: 0x7f0b00c5
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
+ // aapt resource value: 0x7F0E0084
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624068;
- // aapt resource value: 0x7f0b0000
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
+ // aapt resource value: 0x7F0E0085
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624069;
- // aapt resource value: 0x7f0b00c6
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
+ // aapt resource value: 0x7F0E0086
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624070;
- // aapt resource value: 0x7f0b006d
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
+ // aapt resource value: 0x7F0E0087
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624071;
- // aapt resource value: 0x7f0b0026
- public const int Base_Widget_AppCompat_EditText = 2131427366;
+ // aapt resource value: 0x7F0E0088
+ public const int Base_Widget_AppCompat_EditText = 2131624072;
- // aapt resource value: 0x7f0b006e
- public const int Base_Widget_AppCompat_ImageButton = 2131427438;
+ // aapt resource value: 0x7F0E0089
+ public const int Base_Widget_AppCompat_ImageButton = 2131624073;
- // aapt resource value: 0x7f0b00c7
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
+ // aapt resource value: 0x7F0E008A
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131624074;
- // aapt resource value: 0x7f0b00c8
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
+ // aapt resource value: 0x7F0E008B
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624075;
- // aapt resource value: 0x7f0b00c9
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
+ // aapt resource value: 0x7F0E008C
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624076;
- // aapt resource value: 0x7f0b006f
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
+ // aapt resource value: 0x7F0E008D
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624077;
- // aapt resource value: 0x7f0b0070
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
+ // aapt resource value: 0x7F0E008E
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624078;
- // aapt resource value: 0x7f0b0071
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
+ // aapt resource value: 0x7F0E008F
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624079;
- // aapt resource value: 0x7f0b0072
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
+ // aapt resource value: 0x7F0E0090
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624080;
- // aapt resource value: 0x7f0b0073
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
+ // aapt resource value: 0x7F0E0091
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624081;
- // aapt resource value: 0x7f0b00ca
- public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
+ // aapt resource value: 0x7F0E0092
+ public const int Base_Widget_AppCompat_ListMenuView = 2131624082;
- // aapt resource value: 0x7f0b0074
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
+ // aapt resource value: 0x7F0E0093
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131624083;
- // aapt resource value: 0x7f0b0075
- public const int Base_Widget_AppCompat_ListView = 2131427445;
+ // aapt resource value: 0x7F0E0094
+ public const int Base_Widget_AppCompat_ListView = 2131624084;
- // aapt resource value: 0x7f0b0076
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
+ // aapt resource value: 0x7F0E0095
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131624085;
- // aapt resource value: 0x7f0b0077
- public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
+ // aapt resource value: 0x7F0E0096
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131624086;
- // aapt resource value: 0x7f0b0078
- public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
+ // aapt resource value: 0x7F0E0097
+ public const int Base_Widget_AppCompat_PopupMenu = 2131624087;
- // aapt resource value: 0x7f0b0079
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
+ // aapt resource value: 0x7F0E0098
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624088;
- // aapt resource value: 0x7f0b00cb
- public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
+ // aapt resource value: 0x7F0E0099
+ public const int Base_Widget_AppCompat_PopupWindow = 2131624089;
- // aapt resource value: 0x7f0b001c
- public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
+ // aapt resource value: 0x7F0E009A
+ public const int Base_Widget_AppCompat_ProgressBar = 2131624090;
- // aapt resource value: 0x7f0b001d
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
+ // aapt resource value: 0x7F0E009B
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624091;
- // aapt resource value: 0x7f0b007a
- public const int Base_Widget_AppCompat_RatingBar = 2131427450;
+ // aapt resource value: 0x7F0E009C
+ public const int Base_Widget_AppCompat_RatingBar = 2131624092;
- // aapt resource value: 0x7f0b0093
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
+ // aapt resource value: 0x7F0E009D
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624093;
- // aapt resource value: 0x7f0b0094
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
+ // aapt resource value: 0x7F0E009E
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131624094;
- // aapt resource value: 0x7f0b00cc
- public const int Base_Widget_AppCompat_SearchView = 2131427532;
+ // aapt resource value: 0x7F0E009F
+ public const int Base_Widget_AppCompat_SearchView = 2131624095;
- // aapt resource value: 0x7f0b00cd
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
+ // aapt resource value: 0x7F0E00A0
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624096;
- // aapt resource value: 0x7f0b007b
- public const int Base_Widget_AppCompat_SeekBar = 2131427451;
+ // aapt resource value: 0x7F0E00A1
+ public const int Base_Widget_AppCompat_SeekBar = 2131624097;
- // aapt resource value: 0x7f0b00ce
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
+ // aapt resource value: 0x7F0E00A2
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624098;
- // aapt resource value: 0x7f0b007c
- public const int Base_Widget_AppCompat_Spinner = 2131427452;
+ // aapt resource value: 0x7F0E00A3
+ public const int Base_Widget_AppCompat_Spinner = 2131624099;
- // aapt resource value: 0x7f0b0003
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
+ // aapt resource value: 0x7F0E00A4
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624100;
- // aapt resource value: 0x7f0b007d
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
+ // aapt resource value: 0x7F0E00A5
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624101;
- // aapt resource value: 0x7f0b009c
- public const int Base_Widget_AppCompat_Toolbar = 2131427484;
+ // aapt resource value: 0x7F0E00A6
+ public const int Base_Widget_AppCompat_Toolbar = 2131624102;
- // aapt resource value: 0x7f0b007e
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
+ // aapt resource value: 0x7F0E00A7
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624103;
- // aapt resource value: 0x7f0b0167
- public const int Base_Widget_Design_AppBarLayout = 2131427687;
+ // aapt resource value: 0x7F0E00A8
+ public const int Base_Widget_Design_AppBarLayout = 2131624104;
- // aapt resource value: 0x7f0b016b
- public const int Base_Widget_Design_TabLayout = 2131427691;
+ // aapt resource value: 0x7F0E00A9
+ public const int Base_Widget_Design_TabLayout = 2131624105;
- // aapt resource value: 0x7f0b018b
- public const int BottomSheetDialogAnimation = 2131427723;
+ // aapt resource value: 0x7F0E00AA
+ public const int BottomSheetDialogAnimation = 2131624106;
- // aapt resource value: 0x7f0b0192
- public const int DialogTheme = 2131427730;
+ // aapt resource value: 0x7F0E0190
+ public const int custom_dialog2 = 2131624336;
- // aapt resource value: 0x7f0b0190
- public const int MyTheme = 2131427728;
+ // aapt resource value: 0x7F0E00AB
+ public const int DialogTheme = 2131624107;
- // aapt resource value: 0x7f0b0191
- public const int MyTheme1 = 2131427729;
+ // aapt resource value: 0x7F0E00AC
+ public const int MyTheme = 2131624108;
- // aapt resource value: 0x7f0b001e
- public const int Platform_AppCompat = 2131427358;
+ // aapt resource value: 0x7F0E00AD
+ public const int MyTheme1 = 2131624109;
- // aapt resource value: 0x7f0b001f
- public const int Platform_AppCompat_Light = 2131427359;
+ // aapt resource value: 0x7F0E0191
+ public const int picker_view_scale_anim = 2131624337;
- // aapt resource value: 0x7f0b007f
- public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+ // aapt resource value: 0x7F0E0192
+ public const int picker_view_slide_anim = 2131624338;
- // aapt resource value: 0x7f0b0080
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+ // aapt resource value: 0x7F0E00AE
+ public const int Platform_AppCompat = 2131624110;
- // aapt resource value: 0x7f0b0081
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+ // aapt resource value: 0x7F0E00AF
+ public const int Platform_AppCompat_Light = 2131624111;
- // aapt resource value: 0x7f0b0020
- public const int Platform_V11_AppCompat = 2131427360;
+ // aapt resource value: 0x7F0E00B0
+ public const int Platform_ThemeOverlay_AppCompat = 2131624112;
- // aapt resource value: 0x7f0b0021
- public const int Platform_V11_AppCompat_Light = 2131427361;
+ // aapt resource value: 0x7F0E00B1
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624113;
- // aapt resource value: 0x7f0b0028
- public const int Platform_V14_AppCompat = 2131427368;
+ // aapt resource value: 0x7F0E00B2
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131624114;
- // aapt resource value: 0x7f0b0029
- public const int Platform_V14_AppCompat_Light = 2131427369;
+ // aapt resource value: 0x7F0E00B3
+ public const int Platform_V11_AppCompat = 2131624115;
- // aapt resource value: 0x7f0b0082
- public const int Platform_V21_AppCompat = 2131427458;
+ // aapt resource value: 0x7F0E00B4
+ public const int Platform_V11_AppCompat_Light = 2131624116;
- // aapt resource value: 0x7f0b0083
- public const int Platform_V21_AppCompat_Light = 2131427459;
+ // aapt resource value: 0x7F0E00B5
+ public const int Platform_V14_AppCompat = 2131624117;
- // aapt resource value: 0x7f0b0097
- public const int Platform_V25_AppCompat = 2131427479;
+ // aapt resource value: 0x7F0E00B6
+ public const int Platform_V14_AppCompat_Light = 2131624118;
- // aapt resource value: 0x7f0b0098
- public const int Platform_V25_AppCompat_Light = 2131427480;
+ // aapt resource value: 0x7F0E00B7
+ public const int Platform_V21_AppCompat = 2131624119;
- // aapt resource value: 0x7f0b0022
- public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+ // aapt resource value: 0x7F0E00B8
+ public const int Platform_V21_AppCompat_Light = 2131624120;
- // aapt resource value: 0x7f0b002b
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+ // aapt resource value: 0x7F0E00B9
+ public const int Platform_V25_AppCompat = 2131624121;
- // aapt resource value: 0x7f0b002c
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+ // aapt resource value: 0x7F0E00BA
+ public const int Platform_V25_AppCompat_Light = 2131624122;
- // aapt resource value: 0x7f0b002d
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+ // aapt resource value: 0x7F0E00BB
+ public const int Platform_Widget_AppCompat_Spinner = 2131624123;
- // aapt resource value: 0x7f0b002e
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+ // aapt resource value: 0x7F0E00BC
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624124;
- // aapt resource value: 0x7f0b002f
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+ // aapt resource value: 0x7F0E00BD
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624125;
- // aapt resource value: 0x7f0b0030
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+ // aapt resource value: 0x7F0E00BE
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624126;
- // aapt resource value: 0x7f0b0031
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+ // aapt resource value: 0x7F0E00BF
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624127;
- // aapt resource value: 0x7f0b0032
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+ // aapt resource value: 0x7F0E00C0
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624128;
- // aapt resource value: 0x7f0b0033
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+ // aapt resource value: 0x7F0E00C1
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624129;
- // aapt resource value: 0x7f0b0034
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+ // aapt resource value: 0x7F0E00C7
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624135;
- // aapt resource value: 0x7f0b0035
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+ // aapt resource value: 0x7F0E00C2
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624130;
- // aapt resource value: 0x7f0b0036
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+ // aapt resource value: 0x7F0E00C3
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624131;
- // aapt resource value: 0x7f0b0037
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+ // aapt resource value: 0x7F0E00C4
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624132;
- // aapt resource value: 0x7f0b0038
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+ // aapt resource value: 0x7F0E00C5
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624133;
- // aapt resource value: 0x7f0b00cf
- public const int TextAppearance_AppCompat = 2131427535;
+ // aapt resource value: 0x7F0E00C6
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624134;
- // aapt resource value: 0x7f0b00d0
- public const int TextAppearance_AppCompat_Body1 = 2131427536;
+ // aapt resource value: 0x7F0E00C8
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624136;
- // aapt resource value: 0x7f0b00d1
- public const int TextAppearance_AppCompat_Body2 = 2131427537;
+ // aapt resource value: 0x7F0E00C9
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624137;
- // aapt resource value: 0x7f0b00d2
- public const int TextAppearance_AppCompat_Button = 2131427538;
+ // aapt resource value: 0x7F0E00CA
+ public const int TextAppearance_AppCompat = 2131624138;
- // aapt resource value: 0x7f0b00d3
- public const int TextAppearance_AppCompat_Caption = 2131427539;
+ // aapt resource value: 0x7F0E00CB
+ public const int TextAppearance_AppCompat_Body1 = 2131624139;
- // aapt resource value: 0x7f0b00d4
- public const int TextAppearance_AppCompat_Display1 = 2131427540;
+ // aapt resource value: 0x7F0E00CC
+ public const int TextAppearance_AppCompat_Body2 = 2131624140;
- // aapt resource value: 0x7f0b00d5
- public const int TextAppearance_AppCompat_Display2 = 2131427541;
+ // aapt resource value: 0x7F0E00CD
+ public const int TextAppearance_AppCompat_Button = 2131624141;
- // aapt resource value: 0x7f0b00d6
- public const int TextAppearance_AppCompat_Display3 = 2131427542;
+ // aapt resource value: 0x7F0E00CE
+ public const int TextAppearance_AppCompat_Caption = 2131624142;
- // aapt resource value: 0x7f0b00d7
- public const int TextAppearance_AppCompat_Display4 = 2131427543;
+ // aapt resource value: 0x7F0E00CF
+ public const int TextAppearance_AppCompat_Display1 = 2131624143;
- // aapt resource value: 0x7f0b00d8
- public const int TextAppearance_AppCompat_Headline = 2131427544;
+ // aapt resource value: 0x7F0E00D0
+ public const int TextAppearance_AppCompat_Display2 = 2131624144;
- // aapt resource value: 0x7f0b00d9
- public const int TextAppearance_AppCompat_Inverse = 2131427545;
+ // aapt resource value: 0x7F0E00D1
+ public const int TextAppearance_AppCompat_Display3 = 2131624145;
- // aapt resource value: 0x7f0b00da
- public const int TextAppearance_AppCompat_Large = 2131427546;
+ // aapt resource value: 0x7F0E00D2
+ public const int TextAppearance_AppCompat_Display4 = 2131624146;
- // aapt resource value: 0x7f0b00db
- public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
+ // aapt resource value: 0x7F0E00D3
+ public const int TextAppearance_AppCompat_Headline = 2131624147;
- // aapt resource value: 0x7f0b00dc
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
+ // aapt resource value: 0x7F0E00D4
+ public const int TextAppearance_AppCompat_Inverse = 2131624148;
- // aapt resource value: 0x7f0b00dd
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
+ // aapt resource value: 0x7F0E00D5
+ public const int TextAppearance_AppCompat_Large = 2131624149;
- // aapt resource value: 0x7f0b00de
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
+ // aapt resource value: 0x7F0E00D6
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131624150;
- // aapt resource value: 0x7f0b00df
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
+ // aapt resource value: 0x7F0E00D7
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624151;
- // aapt resource value: 0x7f0b00e0
- public const int TextAppearance_AppCompat_Medium = 2131427552;
+ // aapt resource value: 0x7F0E00D8
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624152;
- // aapt resource value: 0x7f0b00e1
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
+ // aapt resource value: 0x7F0E00D9
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624153;
- // aapt resource value: 0x7f0b00e2
- public const int TextAppearance_AppCompat_Menu = 2131427554;
+ // aapt resource value: 0x7F0E00DA
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624154;
- // aapt resource value: 0x7f0b0084
- public const int TextAppearance_AppCompat_Notification = 2131427460;
+ // aapt resource value: 0x7F0E00DB
+ public const int TextAppearance_AppCompat_Medium = 2131624155;
- // aapt resource value: 0x7f0b0085
- public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
+ // aapt resource value: 0x7F0E00DC
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131624156;
- // aapt resource value: 0x7f0b0086
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
+ // aapt resource value: 0x7F0E00DD
+ public const int TextAppearance_AppCompat_Menu = 2131624157;
- // aapt resource value: 0x7f0b00e3
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
+ // aapt resource value: 0x7F0E00DE
+ public const int TextAppearance_AppCompat_Notification = 2131624158;
- // aapt resource value: 0x7f0b00e4
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
+ // aapt resource value: 0x7F0E00DF
+ public const int TextAppearance_AppCompat_Notification_Info = 2131624159;
- // aapt resource value: 0x7f0b0087
- public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
+ // aapt resource value: 0x7F0E00E0
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624160;
- // aapt resource value: 0x7f0b0088
- public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
+ // aapt resource value: 0x7F0E00E1
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131624161;
- // aapt resource value: 0x7f0b0089
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
+ // aapt resource value: 0x7F0E00E2
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624162;
- // aapt resource value: 0x7f0b008a
- public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
+ // aapt resource value: 0x7F0E00E3
+ public const int TextAppearance_AppCompat_Notification_Media = 2131624163;
- // aapt resource value: 0x7f0b008b
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
+ // aapt resource value: 0x7F0E00E4
+ public const int TextAppearance_AppCompat_Notification_Time = 2131624164;
- // aapt resource value: 0x7f0b00e5
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+ // aapt resource value: 0x7F0E00E5
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624165;
- // aapt resource value: 0x7f0b00e6
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+ // aapt resource value: 0x7F0E00E6
+ public const int TextAppearance_AppCompat_Notification_Title = 2131624166;
- // aapt resource value: 0x7f0b00e7
- public const int TextAppearance_AppCompat_Small = 2131427559;
+ // aapt resource value: 0x7F0E00E7
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624167;
- // aapt resource value: 0x7f0b00e8
- public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+ // aapt resource value: 0x7F0E00E8
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624168;
- // aapt resource value: 0x7f0b00e9
- public const int TextAppearance_AppCompat_Subhead = 2131427561;
+ // aapt resource value: 0x7F0E00E9
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131624169;
- // aapt resource value: 0x7f0b00ea
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+ // aapt resource value: 0x7F0E00EA
+ public const int TextAppearance_AppCompat_Small = 2131624170;
- // aapt resource value: 0x7f0b00eb
- public const int TextAppearance_AppCompat_Title = 2131427563;
+ // aapt resource value: 0x7F0E00EB
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131624171;
- // aapt resource value: 0x7f0b00ec
- public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+ // aapt resource value: 0x7F0E00EC
+ public const int TextAppearance_AppCompat_Subhead = 2131624172;
- // aapt resource value: 0x7f0b002a
- public const int TextAppearance_AppCompat_Tooltip = 2131427370;
+ // aapt resource value: 0x7F0E00ED
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624173;
- // aapt resource value: 0x7f0b00ed
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+ // aapt resource value: 0x7F0E00EE
+ public const int TextAppearance_AppCompat_Title = 2131624174;
- // aapt resource value: 0x7f0b00ee
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+ // aapt resource value: 0x7F0E00EF
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131624175;
- // aapt resource value: 0x7f0b00ef
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+ // aapt resource value: 0x7F0E00F0
+ public const int TextAppearance_AppCompat_Tooltip = 2131624176;
- // aapt resource value: 0x7f0b00f0
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+ // aapt resource value: 0x7F0E00F1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624177;
- // aapt resource value: 0x7f0b00f1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+ // aapt resource value: 0x7F0E00F2
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624178;
- // aapt resource value: 0x7f0b00f2
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+ // aapt resource value: 0x7F0E00F3
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624179;
- // aapt resource value: 0x7f0b00f3
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+ // aapt resource value: 0x7F0E00F4
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624180;
- // aapt resource value: 0x7f0b00f4
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+ // aapt resource value: 0x7F0E00F5
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624181;
- // aapt resource value: 0x7f0b00f5
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+ // aapt resource value: 0x7F0E00F6
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624182;
- // aapt resource value: 0x7f0b00f6
- public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+ // aapt resource value: 0x7F0E00F7
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624183;
- // aapt resource value: 0x7f0b00f7
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
+ // aapt resource value: 0x7F0E00F8
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624184;
- // aapt resource value: 0x7f0b00f8
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
+ // aapt resource value: 0x7F0E00F9
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624185;
- // aapt resource value: 0x7f0b00f9
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
+ // aapt resource value: 0x7F0E00FA
+ public const int TextAppearance_AppCompat_Widget_Button = 2131624186;
- // aapt resource value: 0x7f0b00fa
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
+ // aapt resource value: 0x7F0E00FB
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624187;
- // aapt resource value: 0x7f0b00fb
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
+ // aapt resource value: 0x7F0E00FC
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624188;
- // aapt resource value: 0x7f0b00fc
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
+ // aapt resource value: 0x7F0E00FD
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624189;
- // aapt resource value: 0x7f0b00fd
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
+ // aapt resource value: 0x7F0E00FE
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624190;
- // aapt resource value: 0x7f0b00fe
- public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
+ // aapt resource value: 0x7F0E00FF
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624191;
- // aapt resource value: 0x7f0b00ff
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
+ // aapt resource value: 0x7F0E0100
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624192;
- // aapt resource value: 0x7f0b0183
- public const int TextAppearance_Compat_Notification = 2131427715;
+ // aapt resource value: 0x7F0E0101
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624193;
- // aapt resource value: 0x7f0b0184
- public const int TextAppearance_Compat_Notification_Info = 2131427716;
+ // aapt resource value: 0x7F0E0102
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131624194;
- // aapt resource value: 0x7f0b0160
- public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
+ // aapt resource value: 0x7F0E0103
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624195;
- // aapt resource value: 0x7f0b0189
- public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
+ // aapt resource value: 0x7F0E0104
+ public const int TextAppearance_Compat_Notification = 2131624196;
- // aapt resource value: 0x7f0b0164
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
+ // aapt resource value: 0x7F0E0105
+ public const int TextAppearance_Compat_Notification_Info = 2131624197;
- // aapt resource value: 0x7f0b0161
- public const int TextAppearance_Compat_Notification_Media = 2131427681;
+ // aapt resource value: 0x7F0E0106
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131624198;
- // aapt resource value: 0x7f0b0185
- public const int TextAppearance_Compat_Notification_Time = 2131427717;
+ // aapt resource value: 0x7F0E0107
+ public const int TextAppearance_Compat_Notification_Line2 = 2131624199;
- // aapt resource value: 0x7f0b0162
- public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
+ // aapt resource value: 0x7F0E0108
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131624200;
- // aapt resource value: 0x7f0b0186
- public const int TextAppearance_Compat_Notification_Title = 2131427718;
+ // aapt resource value: 0x7F0E0109
+ public const int TextAppearance_Compat_Notification_Media = 2131624201;
- // aapt resource value: 0x7f0b0163
- public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
+ // aapt resource value: 0x7F0E010A
+ public const int TextAppearance_Compat_Notification_Time = 2131624202;
- // aapt resource value: 0x7f0b016c
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
+ // aapt resource value: 0x7F0E010B
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131624203;
- // aapt resource value: 0x7f0b016d
- public const int TextAppearance_Design_Counter = 2131427693;
+ // aapt resource value: 0x7F0E010C
+ public const int TextAppearance_Compat_Notification_Title = 2131624204;
- // aapt resource value: 0x7f0b016e
- public const int TextAppearance_Design_Counter_Overflow = 2131427694;
+ // aapt resource value: 0x7F0E010D
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131624205;
- // aapt resource value: 0x7f0b016f
- public const int TextAppearance_Design_Error = 2131427695;
+ // aapt resource value: 0x7F0E010E
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624206;
- // aapt resource value: 0x7f0b0170
- public const int TextAppearance_Design_Hint = 2131427696;
+ // aapt resource value: 0x7F0E010F
+ public const int TextAppearance_Design_Counter = 2131624207;
- // aapt resource value: 0x7f0b0171
- public const int TextAppearance_Design_Snackbar_Message = 2131427697;
+ // aapt resource value: 0x7F0E0110
+ public const int TextAppearance_Design_Counter_Overflow = 2131624208;
- // aapt resource value: 0x7f0b0172
- public const int TextAppearance_Design_Tab = 2131427698;
+ // aapt resource value: 0x7F0E0111
+ public const int TextAppearance_Design_Error = 2131624209;
- // aapt resource value: 0x7f0b0100
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
+ // aapt resource value: 0x7F0E0112
+ public const int TextAppearance_Design_Hint = 2131624210;
- // aapt resource value: 0x7f0b0101
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
+ // aapt resource value: 0x7F0E0113
+ public const int TextAppearance_Design_Snackbar_Message = 2131624211;
- // aapt resource value: 0x7f0b0102
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
+ // aapt resource value: 0x7F0E0114
+ public const int TextAppearance_Design_Tab = 2131624212;
- // aapt resource value: 0x7f0b0103
- public const int Theme_AppCompat = 2131427587;
+ // aapt resource value: 0x7F0E0115
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624213;
- // aapt resource value: 0x7f0b0104
- public const int Theme_AppCompat_CompactMenu = 2131427588;
+ // aapt resource value: 0x7F0E0116
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624214;
- // aapt resource value: 0x7f0b0004
- public const int Theme_AppCompat_DayNight = 2131427332;
+ // aapt resource value: 0x7F0E0117
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624215;
- // aapt resource value: 0x7f0b0005
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
+ // aapt resource value: 0x7F0E0134
+ public const int ThemeOverlay_AppCompat = 2131624244;
- // aapt resource value: 0x7f0b0006
- public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
+ // aapt resource value: 0x7F0E0135
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131624245;
- // aapt resource value: 0x7f0b0007
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
+ // aapt resource value: 0x7F0E0136
+ public const int ThemeOverlay_AppCompat_Dark = 2131624246;
- // aapt resource value: 0x7f0b0008
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
+ // aapt resource value: 0x7F0E0137
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624247;
- // aapt resource value: 0x7f0b0009
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
+ // aapt resource value: 0x7F0E0138
+ public const int ThemeOverlay_AppCompat_Dialog = 2131624248;
- // aapt resource value: 0x7f0b000a
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
+ // aapt resource value: 0x7F0E0139
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624249;
- // aapt resource value: 0x7f0b0105
- public const int Theme_AppCompat_Dialog = 2131427589;
+ // aapt resource value: 0x7F0E013A
+ public const int ThemeOverlay_AppCompat_Light = 2131624250;
- // aapt resource value: 0x7f0b0106
- public const int Theme_AppCompat_Dialog_Alert = 2131427590;
+ // aapt resource value: 0x7F0E0118
+ public const int Theme_AppCompat = 2131624216;
- // aapt resource value: 0x7f0b0107
- public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
+ // aapt resource value: 0x7F0E0119
+ public const int Theme_AppCompat_CompactMenu = 2131624217;
- // aapt resource value: 0x7f0b0108
- public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
+ // aapt resource value: 0x7F0E011A
+ public const int Theme_AppCompat_DayNight = 2131624218;
- // aapt resource value: 0x7f0b0109
- public const int Theme_AppCompat_Light = 2131427593;
+ // aapt resource value: 0x7F0E011B
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624219;
- // aapt resource value: 0x7f0b010a
- public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
+ // aapt resource value: 0x7F0E011C
+ public const int Theme_AppCompat_DayNight_Dialog = 2131624220;
- // aapt resource value: 0x7f0b010b
- public const int Theme_AppCompat_Light_Dialog = 2131427595;
+ // aapt resource value: 0x7F0E011F
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624223;
- // aapt resource value: 0x7f0b010c
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
+ // aapt resource value: 0x7F0E011D
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624221;
- // aapt resource value: 0x7f0b010d
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
+ // aapt resource value: 0x7F0E011E
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624222;
- // aapt resource value: 0x7f0b010e
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
+ // aapt resource value: 0x7F0E0120
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131624224;
- // aapt resource value: 0x7f0b010f
- public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
+ // aapt resource value: 0x7F0E0121
+ public const int Theme_AppCompat_Dialog = 2131624225;
- // aapt resource value: 0x7f0b0110
- public const int Theme_AppCompat_NoActionBar = 2131427600;
+ // aapt resource value: 0x7F0E0124
+ public const int Theme_AppCompat_DialogWhenLarge = 2131624228;
- // aapt resource value: 0x7f0b018c
- public const int Theme_BiometricPromptDialog = 2131427724;
+ // aapt resource value: 0x7F0E0122
+ public const int Theme_AppCompat_Dialog_Alert = 2131624226;
- // aapt resource value: 0x7f0b0173
- public const int Theme_Design = 2131427699;
+ // aapt resource value: 0x7F0E0123
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131624227;
- // aapt resource value: 0x7f0b0174
- public const int Theme_Design_BottomSheetDialog = 2131427700;
+ // aapt resource value: 0x7F0E0125
+ public const int Theme_AppCompat_Light = 2131624229;
- // aapt resource value: 0x7f0b0175
- public const int Theme_Design_Light = 2131427701;
+ // aapt resource value: 0x7F0E0126
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131624230;
- // aapt resource value: 0x7f0b0176
- public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
+ // aapt resource value: 0x7F0E0127
+ public const int Theme_AppCompat_Light_Dialog = 2131624231;
- // aapt resource value: 0x7f0b0177
- public const int Theme_Design_Light_NoActionBar = 2131427703;
+ // aapt resource value: 0x7F0E012A
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624234;
- // aapt resource value: 0x7f0b0178
- public const int Theme_Design_NoActionBar = 2131427704;
+ // aapt resource value: 0x7F0E0128
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131624232;
- // aapt resource value: 0x7f0b0111
- public const int ThemeOverlay_AppCompat = 2131427601;
+ // aapt resource value: 0x7F0E0129
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624233;
- // aapt resource value: 0x7f0b0112
- public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
+ // aapt resource value: 0x7F0E012B
+ public const int Theme_AppCompat_Light_NoActionBar = 2131624235;
- // aapt resource value: 0x7f0b0113
- public const int ThemeOverlay_AppCompat_Dark = 2131427603;
+ // aapt resource value: 0x7F0E012C
+ public const int Theme_AppCompat_NoActionBar = 2131624236;
- // aapt resource value: 0x7f0b0114
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
+ // aapt resource value: 0x7F0E012D
+ public const int Theme_BiometricPromptDialog = 2131624237;
- // aapt resource value: 0x7f0b0115
- public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
+ // aapt resource value: 0x7F0E012E
+ public const int Theme_Design = 2131624238;
- // aapt resource value: 0x7f0b0116
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
+ // aapt resource value: 0x7F0E012F
+ public const int Theme_Design_BottomSheetDialog = 2131624239;
- // aapt resource value: 0x7f0b0117
- public const int ThemeOverlay_AppCompat_Light = 2131427607;
+ // aapt resource value: 0x7F0E0130
+ public const int Theme_Design_Light = 2131624240;
- // aapt resource value: 0x7f0b0118
- public const int Widget_AppCompat_ActionBar = 2131427608;
+ // aapt resource value: 0x7F0E0131
+ public const int Theme_Design_Light_BottomSheetDialog = 2131624241;
- // aapt resource value: 0x7f0b0119
- public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
+ // aapt resource value: 0x7F0E0132
+ public const int Theme_Design_Light_NoActionBar = 2131624242;
- // aapt resource value: 0x7f0b011a
- public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
+ // aapt resource value: 0x7F0E0133
+ public const int Theme_Design_NoActionBar = 2131624243;
- // aapt resource value: 0x7f0b011b
- public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
+ // aapt resource value: 0x7F0E013B
+ public const int Widget_AppCompat_ActionBar = 2131624251;
- // aapt resource value: 0x7f0b011c
- public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
+ // aapt resource value: 0x7F0E013C
+ public const int Widget_AppCompat_ActionBar_Solid = 2131624252;
- // aapt resource value: 0x7f0b011d
- public const int Widget_AppCompat_ActionButton = 2131427613;
+ // aapt resource value: 0x7F0E013D
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131624253;
- // aapt resource value: 0x7f0b011e
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
+ // aapt resource value: 0x7F0E013E
+ public const int Widget_AppCompat_ActionBar_TabText = 2131624254;
- // aapt resource value: 0x7f0b011f
- public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
+ // aapt resource value: 0x7F0E013F
+ public const int Widget_AppCompat_ActionBar_TabView = 2131624255;
- // aapt resource value: 0x7f0b0120
- public const int Widget_AppCompat_ActionMode = 2131427616;
+ // aapt resource value: 0x7F0E0140
+ public const int Widget_AppCompat_ActionButton = 2131624256;
- // aapt resource value: 0x7f0b0121
- public const int Widget_AppCompat_ActivityChooserView = 2131427617;
+ // aapt resource value: 0x7F0E0141
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131624257;
- // aapt resource value: 0x7f0b0122
- public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
+ // aapt resource value: 0x7F0E0142
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131624258;
- // aapt resource value: 0x7f0b0123
- public const int Widget_AppCompat_Button = 2131427619;
+ // aapt resource value: 0x7F0E0143
+ public const int Widget_AppCompat_ActionMode = 2131624259;
- // aapt resource value: 0x7f0b0124
- public const int Widget_AppCompat_Button_Borderless = 2131427620;
+ // aapt resource value: 0x7F0E0144
+ public const int Widget_AppCompat_ActivityChooserView = 2131624260;
- // aapt resource value: 0x7f0b0125
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
+ // aapt resource value: 0x7F0E0145
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131624261;
- // aapt resource value: 0x7f0b0126
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
+ // aapt resource value: 0x7F0E0146
+ public const int Widget_AppCompat_Button = 2131624262;
- // aapt resource value: 0x7f0b0127
- public const int Widget_AppCompat_Button_Colored = 2131427623;
+ // aapt resource value: 0x7F0E014C
+ public const int Widget_AppCompat_ButtonBar = 2131624268;
- // aapt resource value: 0x7f0b0128
- public const int Widget_AppCompat_Button_Small = 2131427624;
+ // aapt resource value: 0x7F0E014D
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624269;
- // aapt resource value: 0x7f0b0129
- public const int Widget_AppCompat_ButtonBar = 2131427625;
+ // aapt resource value: 0x7F0E0147
+ public const int Widget_AppCompat_Button_Borderless = 2131624263;
- // aapt resource value: 0x7f0b012a
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
+ // aapt resource value: 0x7F0E0148
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131624264;
- // aapt resource value: 0x7f0b012b
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
+ // aapt resource value: 0x7F0E0149
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624265;
- // aapt resource value: 0x7f0b012c
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
+ // aapt resource value: 0x7F0E014A
+ public const int Widget_AppCompat_Button_Colored = 2131624266;
- // aapt resource value: 0x7f0b012d
- public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
+ // aapt resource value: 0x7F0E014B
+ public const int Widget_AppCompat_Button_Small = 2131624267;
- // aapt resource value: 0x7f0b012e
- public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
+ // aapt resource value: 0x7F0E014E
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624270;
- // aapt resource value: 0x7f0b012f
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
+ // aapt resource value: 0x7F0E014F
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624271;
- // aapt resource value: 0x7f0b0130
- public const int Widget_AppCompat_EditText = 2131427632;
+ // aapt resource value: 0x7F0E0150
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131624272;
- // aapt resource value: 0x7f0b0131
- public const int Widget_AppCompat_ImageButton = 2131427633;
+ // aapt resource value: 0x7F0E0151
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131624273;
- // aapt resource value: 0x7f0b0132
- public const int Widget_AppCompat_Light_ActionBar = 2131427634;
+ // aapt resource value: 0x7F0E0152
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131624274;
- // aapt resource value: 0x7f0b0133
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
+ // aapt resource value: 0x7F0E0153
+ public const int Widget_AppCompat_EditText = 2131624275;
- // aapt resource value: 0x7f0b0134
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
+ // aapt resource value: 0x7F0E0154
+ public const int Widget_AppCompat_ImageButton = 2131624276;
- // aapt resource value: 0x7f0b0135
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
+ // aapt resource value: 0x7F0E0155
+ public const int Widget_AppCompat_Light_ActionBar = 2131624277;
- // aapt resource value: 0x7f0b0136
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
+ // aapt resource value: 0x7F0E0156
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624278;
- // aapt resource value: 0x7f0b0137
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
+ // aapt resource value: 0x7F0E0157
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624279;
- // aapt resource value: 0x7f0b0138
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
+ // aapt resource value: 0x7F0E0158
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624280;
- // aapt resource value: 0x7f0b0139
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
+ // aapt resource value: 0x7F0E0159
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624281;
- // aapt resource value: 0x7f0b013a
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
+ // aapt resource value: 0x7F0E015A
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624282;
- // aapt resource value: 0x7f0b013b
- public const int Widget_AppCompat_Light_ActionButton = 2131427643;
+ // aapt resource value: 0x7F0E015B
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624283;
- // aapt resource value: 0x7f0b013c
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
+ // aapt resource value: 0x7F0E015C
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624284;
- // aapt resource value: 0x7f0b013d
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
+ // aapt resource value: 0x7F0E015D
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624285;
- // aapt resource value: 0x7f0b013e
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
+ // aapt resource value: 0x7F0E015E
+ public const int Widget_AppCompat_Light_ActionButton = 2131624286;
- // aapt resource value: 0x7f0b013f
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
+ // aapt resource value: 0x7F0E015F
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624287;
- // aapt resource value: 0x7f0b0140
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
+ // aapt resource value: 0x7F0E0160
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624288;
- // aapt resource value: 0x7f0b0141
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
+ // aapt resource value: 0x7F0E0161
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624289;
- // aapt resource value: 0x7f0b0142
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
+ // aapt resource value: 0x7F0E0162
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131624290;
- // aapt resource value: 0x7f0b0143
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
+ // aapt resource value: 0x7F0E0163
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624291;
- // aapt resource value: 0x7f0b0144
- public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
+ // aapt resource value: 0x7F0E0164
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624292;
- // aapt resource value: 0x7f0b0145
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
+ // aapt resource value: 0x7F0E0165
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131624293;
- // aapt resource value: 0x7f0b0146
- public const int Widget_AppCompat_Light_SearchView = 2131427654;
+ // aapt resource value: 0x7F0E0166
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131624294;
- // aapt resource value: 0x7f0b0147
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
+ // aapt resource value: 0x7F0E0167
+ public const int Widget_AppCompat_Light_PopupMenu = 2131624295;
- // aapt resource value: 0x7f0b0148
- public const int Widget_AppCompat_ListMenuView = 2131427656;
+ // aapt resource value: 0x7F0E0168
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624296;
- // aapt resource value: 0x7f0b0149
- public const int Widget_AppCompat_ListPopupWindow = 2131427657;
+ // aapt resource value: 0x7F0E0169
+ public const int Widget_AppCompat_Light_SearchView = 2131624297;
- // aapt resource value: 0x7f0b014a
- public const int Widget_AppCompat_ListView = 2131427658;
+ // aapt resource value: 0x7F0E016A
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624298;
- // aapt resource value: 0x7f0b014b
- public const int Widget_AppCompat_ListView_DropDown = 2131427659;
+ // aapt resource value: 0x7F0E016B
+ public const int Widget_AppCompat_ListMenuView = 2131624299;
- // aapt resource value: 0x7f0b014c
- public const int Widget_AppCompat_ListView_Menu = 2131427660;
+ // aapt resource value: 0x7F0E016C
+ public const int Widget_AppCompat_ListPopupWindow = 2131624300;
- // aapt resource value: 0x7f0b014d
- public const int Widget_AppCompat_PopupMenu = 2131427661;
+ // aapt resource value: 0x7F0E016D
+ public const int Widget_AppCompat_ListView = 2131624301;
- // aapt resource value: 0x7f0b014e
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
+ // aapt resource value: 0x7F0E016E
+ public const int Widget_AppCompat_ListView_DropDown = 2131624302;
- // aapt resource value: 0x7f0b014f
- public const int Widget_AppCompat_PopupWindow = 2131427663;
+ // aapt resource value: 0x7F0E016F
+ public const int Widget_AppCompat_ListView_Menu = 2131624303;
- // aapt resource value: 0x7f0b0150
- public const int Widget_AppCompat_ProgressBar = 2131427664;
+ // aapt resource value: 0x7F0E0170
+ public const int Widget_AppCompat_PopupMenu = 2131624304;
- // aapt resource value: 0x7f0b0151
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
+ // aapt resource value: 0x7F0E0171
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131624305;
- // aapt resource value: 0x7f0b0152
- public const int Widget_AppCompat_RatingBar = 2131427666;
+ // aapt resource value: 0x7F0E0172
+ public const int Widget_AppCompat_PopupWindow = 2131624306;
- // aapt resource value: 0x7f0b0153
- public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
+ // aapt resource value: 0x7F0E0173
+ public const int Widget_AppCompat_ProgressBar = 2131624307;
- // aapt resource value: 0x7f0b0154
- public const int Widget_AppCompat_RatingBar_Small = 2131427668;
+ // aapt resource value: 0x7F0E0174
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624308;
- // aapt resource value: 0x7f0b0155
- public const int Widget_AppCompat_SearchView = 2131427669;
+ // aapt resource value: 0x7F0E0175
+ public const int Widget_AppCompat_RatingBar = 2131624309;
- // aapt resource value: 0x7f0b0156
- public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
+ // aapt resource value: 0x7F0E0176
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131624310;
- // aapt resource value: 0x7f0b0157
- public const int Widget_AppCompat_SeekBar = 2131427671;
+ // aapt resource value: 0x7F0E0177
+ public const int Widget_AppCompat_RatingBar_Small = 2131624311;
- // aapt resource value: 0x7f0b0158
- public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
+ // aapt resource value: 0x7F0E0178
+ public const int Widget_AppCompat_SearchView = 2131624312;
- // aapt resource value: 0x7f0b0159
- public const int Widget_AppCompat_Spinner = 2131427673;
+ // aapt resource value: 0x7F0E0179
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131624313;
- // aapt resource value: 0x7f0b015a
- public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
+ // aapt resource value: 0x7F0E017A
+ public const int Widget_AppCompat_SeekBar = 2131624314;
- // aapt resource value: 0x7f0b015b
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
+ // aapt resource value: 0x7F0E017B
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131624315;
- // aapt resource value: 0x7f0b015c
- public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
+ // aapt resource value: 0x7F0E017C
+ public const int Widget_AppCompat_Spinner = 2131624316;
- // aapt resource value: 0x7f0b015d
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
+ // aapt resource value: 0x7F0E017D
+ public const int Widget_AppCompat_Spinner_DropDown = 2131624317;
- // aapt resource value: 0x7f0b015e
- public const int Widget_AppCompat_Toolbar = 2131427678;
+ // aapt resource value: 0x7F0E017E
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624318;
- // aapt resource value: 0x7f0b015f
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
+ // aapt resource value: 0x7F0E017F
+ public const int Widget_AppCompat_Spinner_Underlined = 2131624319;
- // aapt resource value: 0x7f0b0187
- public const int Widget_Compat_NotificationActionContainer = 2131427719;
+ // aapt resource value: 0x7F0E0180
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131624320;
- // aapt resource value: 0x7f0b0188
- public const int Widget_Compat_NotificationActionText = 2131427720;
+ // aapt resource value: 0x7F0E0181
+ public const int Widget_AppCompat_Toolbar = 2131624321;
- // aapt resource value: 0x7f0b0179
- public const int Widget_Design_AppBarLayout = 2131427705;
+ // aapt resource value: 0x7F0E0182
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624322;
- // aapt resource value: 0x7f0b017a
- public const int Widget_Design_BottomNavigationView = 2131427706;
+ // aapt resource value: 0x7F0E0183
+ public const int Widget_Compat_NotificationActionContainer = 2131624323;
- // aapt resource value: 0x7f0b017b
- public const int Widget_Design_BottomSheet_Modal = 2131427707;
+ // aapt resource value: 0x7F0E0184
+ public const int Widget_Compat_NotificationActionText = 2131624324;
- // aapt resource value: 0x7f0b017c
- public const int Widget_Design_CollapsingToolbar = 2131427708;
+ // aapt resource value: 0x7F0E0185
+ public const int Widget_Design_AppBarLayout = 2131624325;
- // aapt resource value: 0x7f0b017d
- public const int Widget_Design_CoordinatorLayout = 2131427709;
+ // aapt resource value: 0x7F0E0186
+ public const int Widget_Design_BottomNavigationView = 2131624326;
- // aapt resource value: 0x7f0b017e
- public const int Widget_Design_FloatingActionButton = 2131427710;
+ // aapt resource value: 0x7F0E0187
+ public const int Widget_Design_BottomSheet_Modal = 2131624327;
- // aapt resource value: 0x7f0b017f
- public const int Widget_Design_NavigationView = 2131427711;
+ // aapt resource value: 0x7F0E0188
+ public const int Widget_Design_CollapsingToolbar = 2131624328;
- // aapt resource value: 0x7f0b0180
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
+ // aapt resource value: 0x7F0E0189
+ public const int Widget_Design_CoordinatorLayout = 2131624329;
- // aapt resource value: 0x7f0b0181
- public const int Widget_Design_Snackbar = 2131427713;
+ // aapt resource value: 0x7F0E018A
+ public const int Widget_Design_FloatingActionButton = 2131624330;
- // aapt resource value: 0x7f0b0165
- public const int Widget_Design_TabLayout = 2131427685;
+ // aapt resource value: 0x7F0E018B
+ public const int Widget_Design_NavigationView = 2131624331;
- // aapt resource value: 0x7f0b0182
- public const int Widget_Design_TextInputLayout = 2131427714;
+ // aapt resource value: 0x7F0E018C
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131624332;
- // aapt resource value: 0x7f0b018d
- public const int custom_dialog2 = 2131427725;
+ // aapt resource value: 0x7F0E018D
+ public const int Widget_Design_Snackbar = 2131624333;
- // aapt resource value: 0x7f0b018e
- public const int picker_view_scale_anim = 2131427726;
+ // aapt resource value: 0x7F0E018E
+ public const int Widget_Design_TabLayout = 2131624334;
- // aapt resource value: 0x7f0b018f
- public const int picker_view_slide_anim = 2131427727;
+ // aapt resource value: 0x7F0E018F
+ public const int Widget_Design_TextInputLayout = 2131624335;
static Style()
{
@@ -5823,204 +5802,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;
@@ -6028,27 +5996,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;
@@ -6065,19 +6045,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;
@@ -6085,11 +6056,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;
@@ -6103,11 +6075,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;
@@ -6121,6 +6094,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,
@@ -6151,265 +6125,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;
@@ -6417,270 +6393,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;
@@ -6691,18 +6669,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;
@@ -6710,48 +6689,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;
@@ -6807,29 +6789,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;
@@ -6855,117 +6838,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;
@@ -6973,10 +6940,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;
@@ -6987,10 +6973,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;
@@ -7001,50 +6988,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;
@@ -7055,61 +7045,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;
@@ -7117,62 +7116,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;
@@ -7183,142 +7179,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;
@@ -7338,15 +7338,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,
@@ -7365,6 +7360,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};
@@ -7375,6 +7377,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,
@@ -7401,6 +7404,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,
@@ -7415,28 +7419,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;
@@ -7477,24 +7481,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,
@@ -7503,8 +7508,8 @@
16843055,
16843056,
16843057,
- 2130772171,
- 2130772172};
+ 2130968830,
+ 2130968934};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -7533,17 +7538,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;
@@ -7557,28 +7563,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;
@@ -7589,15 +7630,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;
@@ -7605,18 +7641,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;
@@ -7624,63 +7661,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;
@@ -7694,83 +7734,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;
@@ -7778,125 +7819,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;
@@ -7907,12 +7950,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;
@@ -7929,21 +7973,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;
@@ -7954,39 +7999,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,
@@ -8001,56 +8047,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;
@@ -8058,15 +8105,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,
@@ -8079,8 +8127,8 @@
16843107,
16843108,
16843692,
- 2130772022,
- 2130772028};
+ 2130968742,
+ 2130968961};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -8115,29 +8163,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;
@@ -8145,41 +8194,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;
@@ -8187,36 +8236,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;
@@ -8224,20 +8274,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;
@@ -8245,118 +8295,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;
@@ -8367,6 +8405,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,
@@ -8381,31 +8420,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()
{
@@ -8416,6 +8444,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/mipmap-hdpi/Icon.png b/ZigbeeApp/GateWay.Droid/Resources/mipmap-hdpi/Icon.png
index 19c6ac4..f20e01d 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/mipmap-hdpi/Icon.png
+++ b/ZigbeeApp/GateWay.Droid/Resources/mipmap-hdpi/Icon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png b/ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png
index 83858fd..78afca2 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png
+++ b/ZigbeeApp/GateWay.Droid/Resources/mipmap-mdpi/Icon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png b/ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png
index 191772c..cf85621 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png
+++ b/ZigbeeApp/GateWay.Droid/Resources/mipmap-xhdpi/Icon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png b/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png
index 51d110f..e184ac8 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png
+++ b/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxhdpi/Icon.png
Binary files differ
diff --git a/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png b/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png
index 2c8d4de..322b714 100755
--- a/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png
+++ b/ZigbeeApp/GateWay.Droid/Resources/mipmap-xxxhdpi/Icon.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Home.IOS.csproj b/ZigbeeApp/Home.Ios/Home.IOS.csproj
index 0d14059..575a8c7 100644
--- a/ZigbeeApp/Home.Ios/Home.IOS.csproj
+++ b/ZigbeeApp/Home.Ios/Home.IOS.csproj
@@ -444,8 +444,6 @@
<BundleResource Include="Resources\Phone\SmartSound\Nickname.png" />
<BundleResource Include="Resources\Phone\SmartSound\SoundIcon.png" />
<BundleResource Include="Resources\Phone\SmartSound\Tianmao.png" />
- <BundleResource Include="Resources\Phone\SmartSound\CheckBoxDef.png" />
- <BundleResource Include="Resources\Phone\SmartSound\CheckBoxSel.png" />
<BundleResource Include="Resources\Phone\RollerShade\Stop.png" />
<BundleResource Include="Resources\Phone\RollerShade\DownSelected.png" />
<BundleResource Include="Resources\Phone\RollerShade\Up.png" />
@@ -572,6 +570,7 @@
<BundleResource Include="Resources\Phone\Item\PersentIcon.png" />
<BundleResource Include="Resources\Phone\Item\WrongIcon.png" />
<BundleResource Include="Resources\Phone\Item\RoomIconBackground.png" />
+ <BundleResource Include="Resources\Phone\Item\AdjustSuccessIcon.png" />
<BundleResource Include="Resources\Phone\Item\PlusSign2.png" />
<BundleResource Include="Resources\Phone\Item\DateSearchIcon.png" />
<BundleResource Include="Resources\Phone\Item\Time.png" />
@@ -608,6 +607,7 @@
<BundleResource Include="Resources\Phone\Item\Category_FunctionBG.png" />
<BundleResource Include="Resources\Phone\Item\Remote.png" />
<BundleResource Include="Resources\Phone\Item\ScreeningType.png" />
+ <BundleResource Include="Resources\Phone\Item\TransferOfResidenceIcon.png" />
<BundleResource Include="Resources\Phone\Item\Safety.png" />
<BundleResource Include="Resources\Phone\Item\UpTriangle.png" />
<BundleResource Include="Resources\Phone\Item\CreatFloor.png" />
@@ -658,6 +658,7 @@
<BundleResource Include="Resources\Phone\Item\Floor.png" />
<BundleResource Include="Resources\Phone\Item\videoIntercom.png" />
<BundleResource Include="Resources\Phone\Item\MinusSign2.png" />
+ <BundleResource Include="Resources\Phone\Item\AdjustFailIcon.png" />
<BundleResource Include="Resources\Phone\Item\NotAuthority.png" />
<BundleResource Include="Resources\Phone\Item\IndoorUnitGround.png" />
<BundleResource Include="Resources\Phone\Item\FixedPositionSelected.png" />
diff --git a/ZigbeeApp/Home.Ios/Info.plist b/ZigbeeApp/Home.Ios/Info.plist
index 1185889..0921792 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.0120082402</string>
+ <string>1.1.0120091701</string>
<key>CFBundleVersion</key>
- <string>2020082402</string>
+ <string>2020091701</string>
<key>CFBundleURLTypes</key>
<array>
<dict>
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 568a03f..754fb8d 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -816,6 +816,133 @@
13602=鏃�
13603=鑾峰彇涓�...
13604=褰撳墠 浜害
+13605=妯℃澘
+13606=璇诲彇涓�
+13607=娣诲姞浣忓畢
+13608=鏂板缓浣忓畢
+13609=鑷畾涔�
+13610=椤圭洰鍚�
+13611=璇峰～鍐欓」鐩悕绉�
+13612=妤煎彿
+13613=1-100涔嬮棿
+13614=鍗曞厓鍙�
+13615=鎴峰彿
+13616=灞傚彿鍔犳埧鍙凤紝渚嬪0201
+13617=涓句緥锛氭垚閮介噾鍫傞噾鑼傚簻椤圭洰-2鏍�-3鍗曞厓-0201鎴�
+13618=閫夋嫨鍒涘缓鏂瑰紡
+13619=鏂瑰紡
+13620=鏈夋ā鏉�
+13621=鏃犳ā鏉�
+13622=鏃犺澶囧垱寤�
+13623=鏈夎澶囧垱寤�
+13624=鑷畾涔夋柊寤轰綇瀹�
+13625=鑷畾涔夊悕绉�
+13626=鑷畾涔夊唴瀹�
+13627=浣忓畢閰嶇疆
+13628=鏃犳ā鏉挎湁璁惧
+13629=鏈夋ā鏉挎湁璁惧
+13630=鏃犳ā鏉挎棤璁惧
+13631=鍖哄煙
+13632=璁惧鍜屽姛鑳�
+13633=妤煎眰鏁�
+13634=鎴块棿鏁�
+13635=璁惧鏁�
+13636=鍔熻兘鏁�
+13637=鏃犲睆缃戝叧
+13638=璺敱缃戝叧
+13639=鏈夌綉绾挎坊鍔犵綉鍏�
+13640=WIFI娣诲姞缃戝叧
+13641=璁惧鍒楄〃
+13642=宸叉悳绱㈣澶囨暟锛�
+13643=涓�
+13644=鍙栨秷鎼滅储
+13645=淇″彿
+13646=瑙ｇ粦
+13647=璁惧鍑哄巶鍚嶇О
+13648=璁惧澶囨敞鍚嶇О
+13649=鐐瑰嚮缂栬緫妤煎眰涓庡娉�
+13650=缃戝叧閫夋嫨
+13651=鍦烘櫙鍒楄〃
+13652=鏆傛棤鍦烘櫙,璇锋坊鍔�
+13653=铏氭嫙
+13654=鏈湴
+13655=杩滅▼
+13656=浣忓畢鍒楄〃
+13657=鎼滅储浣忓畢鍏抽敭璇�
+13658=鎴峰悕
+13659=淇敼鏃堕棿
+13660=纭鍒囨崲
+13661=璇疯緭鍏ヨ嚜瀹氫箟鍚嶇О
+13662=璇疯緭鑷畾涔夊唴瀹�
+13663=榛樿
+13664=鐢辫繎鍒拌繙
+13665=鐢辫繙鍒拌繎
+13666=杩斿洖{0}涓婚〉
+13667=淇濆瓨妯℃澘{0}鍒癆PP
+13668=淇濆瓨澶囦唤{0}鍒癆PP
+13669=鏈湴澶囦唤淇濆瓨鎴愬姛
+13670=澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
+13671=妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬ā鏉挎暟鎹�
+13672=閫夋嫨妯℃澘
+13673=宸查�夋ā鐗�
+13674=璇烽�夋嫨妯℃澘瀵硅薄
+13675={0}杩樻病鏈夐�夋嫨妯℃澘瀵硅薄,纭瑕佽繑鍥�?
+13676=妯℃澘涓搴旂殑缃戝叧
+13677=鍙栨秷缁戝畾
+13678=妯℃澘涓搴旂殑缃戝叧杩樻病璁剧疆{0}纭瑕佽繑鍥烇紵
+13679=妯℃澘涓澶囨暟锛�
+13680=璇烽�夋嫨妯℃澘涓殑璁惧
+13681=妯℃澘涓搴旂殑璁惧
+13683=妯℃澘
+13684=纭鍒犻櫎銆寋0}銆嶈澶囧強鍔熻兘锛�
+13685=妯＄増璁惧鏁颁笌缁戝畾璁惧鏁颁笉涓�鑷磠0}璇锋鏌ヨ澶�
+13686=瀵煎叆鍔熻兘涓庡満鏅�
+13687=鏈夎澶囨湭閫夋嫨妯℃澘
+13688=鎵嬫満浼犵綉鍏�
+13689=缃戝叧浼犺澶�
+13690=棰勮鎬昏�楁椂
+13691=涓�閿鍏�
+13692=妯℃澘涓㈠け,璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆
+13693=璇峰厛閫夋嫨缃戝叧鐨勬ā鏉垮璞�
+13694=璁惧涓庢ā鏉垮凡缁忓畬鍏ㄥ尮閰�
+13695=鏈湴澶囦唤
+13696=浜戠澶囦唤
+13697=鎭㈠鍒皗0}鏈湴
+13698=涓婁紶鍒皗0}浜戠
+13699=涓嬭浇鍒癆PP
+13700=纭畾涓嬭浇姝ゅ浠藉埌APP?
+13701=璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆椤圭洰绫诲瀷
+13702=纭畾涓婁紶鎸囧畾澶囦唤鍒颁簯绔�?
+13703=澶囦唤鏁版嵁涓嬭浇鎴愬姛
+13704=纭畾灏嗘暟鎹仮澶嶅埌鏈湴锛�
+13705=绉讳氦缁檣0}鐢ㄦ埛
+13706=鎺堟潈缁檣0}璋冭瘯浜哄憳
+13707=閰嶇疆{0}浣忓畢
+13708=鍒囨崲{0}浣忓畢
+13709=鏈湴妯℃澘
+13710=浜戠妯℃澘
+13711=鏈湴杩樻病鏈夋ā鏉�
+13712=妯℃澘瀵煎叆鎴愬姛
+13713=鍔熻兘鍦烘櫙宸插叏閮ㄥ鍏�
+13714=妯℃澘瀵煎叆澶辫触
+13715=鏌ョ湅鍘熷洜
+13716=瀵煎嚭鏂囨湰{0}璇存槑
+13717=杩樻病鏈夊垱寤哄尯鍩�
+13718=浜戠杩樻病鏈夋ā鏉�
+13719=涓嬭浇鎴愬姛
+13720=涓嬭浇澶辫触
+13721=淇濆瓨鍒颁簯绔�
+13722=璇疯緭鍏ユā鏉垮悕瀛�
+13723=妯℃澘鍚嶅瓧宸茬粡瀛樺湪
+13724=涓婁紶妯℃澘鎴愬姛
+13725=涓婁紶妯℃澘澶辫触
+13726=姝よ处鍙锋棤鏉冪櫥褰�
+13727=涓嬭浇妯℃澘澶辫触
+13728=缂栬緫浣忓畢鍚嶇О澶辫触
+13729=缂栬緫浣忓畢鍖哄煙澶辫触
+13730=涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+13731=涓嶈兘鑷繁鎺堟潈缁欒嚜宸�
+13732=鎺堟潈璐﹀彿
15000=瀵嗙爜闀垮害涓簕0}涓瓧绗�
@@ -1906,6 +2033,12 @@
16158=鏌ョ湅
16159=瀹氭椂鑷姩鍏抽棴
16160=涓嶅叧闂�
+16161=缁堟
+16162=姝ｅ湪绉讳氦缁欑敤鎴�,璇风◢鍚�...
+16163=姝ｅ湪鎺堟潈缁欒皟璇曚汉鍛�,璇风◢鍚�...
+16164=杩囨埛鎴愬姛
+16165=杩囨埛澶辫触
+16166=鎭枩{0}鎴愪负銆寋1}銆嶇鐞嗗憳
;鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
18004=鎸囧畾缃戝叧宸茬粡琚粦瀹�
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustFailIcon.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustFailIcon.png
new file mode 100755
index 0000000..e5d389f
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustFailIcon.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustSuccessIcon.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustSuccessIcon.png
new file mode 100755
index 0000000..4d08660
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/AdjustSuccessIcon.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidenceIcon.png b/ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidenceIcon.png
new file mode 100755
index 0000000..81b46bb
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/Item/TransferOfResidenceIcon.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png b/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png
deleted file mode 100755
index 69275db..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png.png b/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png.png
new file mode 100755
index 0000000..1c00059
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxDef.png.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png b/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png
deleted file mode 100755
index 1a75f53..0000000
--- a/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png
+++ /dev/null
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png.png b/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png.png
new file mode 100755
index 0000000..5dbc1ab
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/Resources/Phone/SmartSound/CheckBoxSel.png.png
Binary files differ
diff --git a/ZigbeeApp/Home.Ios/mono_crash.115869ea88.1.json b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.1.json
new file mode 100644
index 0000000..9af4732
--- /dev/null
+++ b/ZigbeeApp/Home.Ios/mono_crash.115869ea88.1.json
@@ -0,0 +1,775 @@
+{
+ "protocol_version" : "0.0.5",
+ "configuration" : {
+ "version" : "(6.6.0.155) (2019-08/296a9afdb24)",
+ "tlc" : "normal",
+ "sigsgev" : "altstack",
+ "notifications" : "kqueue",
+ "architecture" : "amd64",
+ "disabled_features" : "none",
+ "smallconfig" : "disabled",
+ "bigarrays" : "disabled",
+ "softdebug" : "enabled",
+ "interpreter" : "enabled",
+ "llvm_support" : "0",
+ "suspend" : "hybrid"
+ },
+ "memory" : {
+ "Resident Size" : "200802304",
+ "Virtual Size" : "4699275264",
+ "minor_gc_time" : "3758321",
+ "major_gc_time" : "4506282",
+ "minor_gc_count" : "17",
+ "major_gc_count" : "17",
+ "major_gc_time_concurrent" : "4039074"
+ },
+ "threads" : [
+ {
+ "is_managed" : false,
+ "offset_free_hash" : "0x0",
+ "offset_rich_hash" : "0x0",
+ "crashed" : false,
+ "native_thread_id" : "0x1159c85c0",
+ "thread_info_addr" : "0x7fe1dc006000",
+ "thread_name" : "tid_307",
+ "ctx" : {
+ "IP" : "0x7fff5c28186a",
+ "SP" : "0x7ffee8e05c98",
+ "BP" : "0x7ffee8e05d20"
+ },
+ "unmanaged_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106ead156",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107053775",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1070534a7",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106f17f3c",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c334b5d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106eaf5b6",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1070fd7c0",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1071182e1",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107050774",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10705058a",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106e726c2",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106dfc848",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c1493d5",
+ "native_offset" : "0x00000"
+ }
+
+ ]
+ },
+ {
+ "is_managed" : true,
+ "offset_free_hash" : "0x115869ea88",
+ "offset_rich_hash" : "0x115869ee42",
+ "crashed" : true,
+ "native_thread_id" : "0x70000d5e4000",
+ "thread_info_addr" : "0x7fe1dcd65000",
+ "thread_name" : "Thread Pool Worker",
+ "ctx" : {
+ "IP" : "0x7fff5c2842c6",
+ "SP" : "0x70000d5e2548",
+ "BP" : "0x70000d5e2580"
+ },
+ "managed_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "unregistered"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0000c"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001f80",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0001a"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001f27",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00028"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001f25",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00002"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000084",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x000ae"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000083",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x600006a",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00048"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x60000a1",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000067",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000075",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00057"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x0002a"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "unregistered"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0000c"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6004cdb",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0006a"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x60048c4",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000039",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00019"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000166",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00029"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000181",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00001"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe8",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00007"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001ec3",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00071"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001ec1",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe6",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00021"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fce",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00074"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe3",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x0002a"
+ }
+
+ ],
+ "unmanaged_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106ead156",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107053775",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107053dfa",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106f18f46",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106eb1c65",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106f182db",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c334b5d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10717e439",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c1ee6a6",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107122cb7",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107103b2f",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10712303e",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1071231bf",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106fbde76",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106fbe478",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10711119f",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1071114b0",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106fc07ab",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106fe3675",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000083",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x60000a1",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106e0d62d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10702cfa4",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1070313a6",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106fc86f4",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x00000",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x60048c4",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "2278D637-312B-4F39-AE26-3AE8170D7EC6",
+ "token" : "0x6000181",
+ "native_offset" : "0x0",
+ "filename" : "MonoDevelop.MSBuildBuilder.exe",
+ "sizeofimage" : "0x14000",
+ "timestamp" : "0xb4416f59",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001ec1",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "true",
+ "guid" : "7D0BC631-CADD-4A07-BF74-717847E90CFA",
+ "token" : "0x6001fe3",
+ "native_offset" : "0x0",
+ "filename" : "mscorlib.dll",
+ "sizeofimage" : "0x472000",
+ "timestamp" : "0xec216ac8",
+ "il_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106e0d62d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x10702cfa4",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107056ec0",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106f8928c",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107054373",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c33d2eb",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c340249",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c33c40d",
+ "native_offset" : "0x00000"
+ }
+
+ ]
+},
+{
+ "is_managed" : false,
+ "offset_free_hash" : "0x0",
+ "offset_rich_hash" : "0x0",
+ "crashed" : false,
+ "native_thread_id" : "0x70000c8cc000",
+ "thread_info_addr" : "0x7fe1dd018000",
+ "thread_name" : "Finalizer",
+ "ctx" : {
+ "IP" : "0x7fff5c27e266",
+ "SP" : "0x70000c8cbda8",
+ "BP" : "0x70000c8cbe50"
+ },
+ "unmanaged_frames" : [
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106ead156",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107053775",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x1070534a7",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x106f17f3c",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c334b5d",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x30",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x107054373",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c33d2eb",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c340249",
+ "native_offset" : "0x00000"
+ }
+,
+ {
+ "is_managed" : "false",
+ "native_address" : "0x7fff5c33c40d",
+ "native_offset" : "0x00000"
+ }
+
+ ]
+}
+]
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Common/CommonPage.cs b/ZigbeeApp/Shared/Common/CommonPage.cs
index d72d0b2..7f452cf 100755
--- a/ZigbeeApp/Shared/Common/CommonPage.cs
+++ b/ZigbeeApp/Shared/Common/CommonPage.cs
@@ -42,12 +42,11 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string CodeIDString = "1.1.0120082701";
+ public static string CodeIDString = "1.1.0120091701";
/// <summary>
/// 娉ㄥ唽鏉ユ簮(0:HDL On 1:Zigbee)
/// </summary>
public static int RegisterSoruceFromZIGBEE = 0;
- public static string Source = "ZIGBEE";
/// <summary>
/// Company 鐢ㄦ埛鍏徃鐢ㄤ簬鍏徃App瀹氬埗鐗� 榛樿0
/// </summary>
@@ -106,9 +105,9 @@
/// </summary>
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
- /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
+ /// <param name="timeout">瓒呮椂,榛樿5绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData, int timeout = 10)
+ public ResponseEntity.ResponsePack RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData, int timeout = 5)
{
string result = this.RequestHttpsZigbeeResultAsync(requestUrl, byteData, timeout);
if (result != null)
@@ -132,9 +131,9 @@
/// </summary>
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
- /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
+ /// <param name="timeout">瓒呮椂,榛樿5绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData, int timeout = 10)
+ public string RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData, int timeout = 5)
{
var result = RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData, "POST", timeout);
if (result != null)
@@ -151,9 +150,9 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
- /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
+ /// <param name="timeout">瓒呮椂,榛樿5绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 10)
+ public byte[] RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 5)
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
var fullUrl = $"{RequestHttpsHost}/{requestUrl}";
@@ -167,9 +166,9 @@
/// <param name="requestUrl">璇锋眰Url</param>
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
- /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
+ /// <param name="timeout">瓒呮椂,榛樿5绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public byte[] RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 10)
+ public byte[] RequestZigbeeHttpsByAdmin(string requestUrl, byte[] byteData, string requestMethod = "POST", int timeout = 5)
{
//璇锋眰Url鐨勫畬鎴愯矾寰�
var fullUrl = $"{Config.Instance.AdminRequestBaseUrl}/{requestUrl}";
@@ -184,9 +183,9 @@
/// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
/// <param name="token">token</param>
/// <param name="requestMethod">POST 鎴栬�� GET 绛夌瓑</param>
- /// <param name="timeout">瓒呮椂,榛樿10绉�</param>
+ /// <param name="timeout">瓒呮椂,榛樿5绉�</param>
/// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public byte[] DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST", int timeout = 10)
+ public byte[] DoRequestZigbeeHttpsInterface(string requestFullUrl, byte[] byteData, string token, string requestMethod = "POST", int timeout = 5)
{
try
{
@@ -199,6 +198,7 @@
webRequest.Timeout = timeout * 1000;
//鍙栨秷浣跨敤浠ｇ悊璁块棶
webRequest.Proxy = null;
+ webRequest.UseDefaultCredentials = false;
if (token != null)
{
//瀵瑰簲寰俊缃戝潃
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index 8031876..ec7fb84 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -165,6 +165,14 @@
this.DeleteGatewayFileByMemberModel();
//鍒濆鍖栫墿鐞嗚澶囨墍灞炴埧闂寸殑璁板綍
this.InitRealDeviceRoomId();
+
+#if DEBUG
+ if (UserCenterResourse.HideOption.CenterHideMenu == 1)
+ {
+ //妫�娴嬩竴浜涗唬鐮侀厤缃�(debug)
+ this.CheckOhtherSettion();
+ }
+#endif
}
/// <summary>
@@ -196,6 +204,38 @@
{
//杩欎釜缃戝叧瀵逛簬褰撳墠杩欎釜鎴愬憳鏉ヨ鏄潪娉曠殑
HdlGatewayLogic.Current.DeleteGatewayFile(gwId);
+ }
+ }
+ }
+
+ /// <summary>
+ /// 妫�娴嬩竴浜涗唬鐮侀厤缃�(debug)
+ /// </summary>
+ private void CheckOhtherSettion()
+ {
+ foreach (var item in Enum.GetValues(typeof(DeviceType)))
+ {
+ string itemName = item.ToString();
+ int itemValue = (int)item;
+ if (itemName == "UnKown" || itemName == "ZbGateway")
+ {
+ continue;
+ }
+ var device = this.NewDeviceObjectByDeviceId((DeviceType)itemValue);
+ string strMsg = string.Empty;
+ if (device == null)
+ {
+ strMsg = itemName + "娌℃湁瀹炶(1)";
+ }
+ device = CommonDevice.CommonDeviceByByteString(itemName, "{}");
+ if (device == null)
+ {
+ strMsg += "\r\n" + itemName + "娌℃湁瀹炶(2)";
+ }
+ if (strMsg != string.Empty)
+ {
+ this.ShowErrorMsg(strMsg);
+ return;
}
}
}
@@ -385,6 +425,12 @@
public void AddVirtualDeviceToMemory(CommonDevice device)
{
string mainKeys = this.GetDeviceMainKeys(device);
+ if (device is OTADevice)
+ {
+ this.dicOTADevice[mainKeys] = (OTADevice)device;
+ device.ReSave();
+ return;
+ }
this.dicAllDevice[mainKeys] = device;
//璁惧鍥炶矾鏀堕泦
@@ -765,6 +811,8 @@
this.dicDeviceEpoint[device.DeviceAddr].Remove(device.DeviceEpoint);
}
}
+ //鍒犻櫎妯℃澘鏁版嵁
+ Phone.TemplateData.TemplateCommonLogic.Current.DeleteDevice(device);
//鍒犻櫎璁惧鏂囦欢
string filePath = device.FilePath;
@@ -850,13 +898,25 @@
/// <summary>
/// 鍙戦�佸畾浣嶆寚浠ゅ埌璁惧
/// </summary>
- /// <param name="device"></param>
- public void SetFixedPositionCommand(CommonDevice device)
+ /// <param name="device">璁惧鍥炶矾</param>
+ /// <param name="isRealDevice">鏄惁鏄畾浣嶇湡瀹炶澶�</param>
+ public void SetFixedPositionCommand(CommonDevice device, bool isRealDevice = false)
{
//濡傛灉褰撳墠浣忓畢涓嶆槸铏氭嫙浣忓畢
if (Common.Config.Instance.Home.IsVirtually == false)
{
- device.IdentifyControl(device.DeviceAddr, device.DeviceEpoint, 5);
+ int epoint = device.DeviceEpoint;
+ //濡傛灉鏄畾浣嶇湡瀹炶澶囩殑璇�
+ if (isRealDevice == true)
+ {
+ var myType = this.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (myType.ConcreteType == DeviceConcreteType.DimmableLight_OneLoad)
+ {
+ //涓�璺皟鍏夊櫒闇�瑕佸彂8鍥炶矾
+ epoint = 8;
+ }
+ }
+ device.IdentifyControl(device.DeviceAddr, epoint, 5);
}
}
@@ -1386,7 +1446,7 @@
else
{
var infoContent = this.GetDeviceModelIdNameInfo("A419");
- return infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 : string.Empty;
+ return infoContent != null ? infoContent.A瀹樻柟鍚嶅瓧 + epointNo : string.Empty;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
@@ -1680,30 +1740,36 @@
/// <summary>
/// 鑾峰彇銆愯澶囧姛鑳界被鍨嬨�戠殑鑿滃崟鍥炬爣
/// </summary>
- /// <param name="specificType">鑷畾涔夎澶囩被鍨�</param>
+ /// <param name="deviceEnumInfo">鑷畾涔夎澶囩被鍨�</param>
/// <param name="unSelectPath">鍥剧墖鍦板潃</param>
/// <param name="selectPath">鍥剧墖鍦板潃</param>
/// <returns></returns>
- public void GetDeviceFunctionTypeMenuIcon(DeviceConcreteType specificType, ref string unSelectPath, ref string selectPath)
+ public void GetDeviceFunctionTypeMenuIcon(DeviceEnumInfo deviceEnumInfo, ref string unSelectPath, ref string selectPath)
{
//鏂伴灏忔ā鍧�
- if (specificType == DeviceConcreteType.Relay_FangyueFreshAirModul)
+ if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Relay_FangyueFreshAirModul)
{
unSelectPath = "Device/FreshAirEpoint.png";
selectPath = "Device/FreshAirEpointSelected.png";
return;
}
//PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
- else if (specificType == DeviceConcreteType.Sensor_PMTwoPointFive)
+ else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.Sensor_PMTwoPointFive)
{
unSelectPath = "Device/AirQualitySensorEpoint.png";
selectPath = "Device/AirQualitySensorEpointSelected.png";
return;
}
+ else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A绐楀笜)
+ {
+ unSelectPath = "ZigeeLogic/curtain.png";
+ selectPath = "ZigeeLogic/selectedcurtain.png";
+ return;
+ }
//涓婇潰闇�瑕佺壒娈婂鐞�
//鑾峰彇銆愯澶囩被鍨嬨�戠殑鍥炬爣
- this.GetDeviceObjectIcon(specificType, ref unSelectPath, ref selectPath);
+ this.GetDeviceObjectIcon(deviceEnumInfo.ConcreteType, ref unSelectPath, ref selectPath);
}
/// <summary>
@@ -2258,19 +2324,18 @@
/// <param name="saveRoadDevice">濡傛灉鍙湁涓�涓洖璺�,鏄惁鎶婂洖璺殑鎴块棿涓�璧蜂慨鏀�</param>
public void SaveRealDeviceRoomId(List<CommonDevice> listDevice, string roomId, bool saveRoadDevice = true)
{
- if (listDevice == null)
+ if (listDevice == null || listDevice.Count == 0)
{
return;
}
//濡傛灉璁惧鍙湁涓�涓洖璺紝濡傛灉鏀瑰彉浜嗙湡瀹炶澶囧尯鍩燂紝鍒欏畠鐨勫洖璺殑鍖哄煙涔熶竴璧锋敼浜�
- if (saveRoadDevice == true && listDevice != null && listDevice.Count == 1)
+ if (saveRoadDevice == true && listDevice.Count == 1)
{
- if (listDevice[0] is OTADevice)
+ if ((listDevice[0] is OTADevice) == false)
{
- //鍗曠函鍙槸Ota璁惧鍒欎笉澶勭悊
- return;
+ //ota璁惧涓嶉渶瑕佸鐞�
+ HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
}
- HdlRoomLogic.Current.ChangedRoom(listDevice[0], roomId, false);
}
bool save = false;
if (roomId == string.Empty)
@@ -2656,7 +2721,7 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- var contr = new ShowMsgControl(ShowMsgType.Error, msg);
+ var contr = new ShowMsgControl(Phone.ShowMsgType.Error, msg);
contr.Show();
});
}
@@ -2669,7 +2734,7 @@
{
HdlThreadLogic.Current.RunMain(() =>
{
- var contr = new ShowMsgControl(ShowMsgType.Tip, msg);
+ var contr = new ShowMsgControl(Phone.ShowMsgType.Tip, msg);
contr.Show();
});
}
@@ -3046,6 +3111,8 @@
else if (deviceType == DeviceType.FreshAirHumiditySensor) { device = new HumiditySensor(); }
else if (deviceType == DeviceType.ColorTemperatureLight) { device = new ColorTemperatureLight(); }
else if (deviceType == DeviceType.Buzzer) { device = new Buzzer(); }
+ else if (deviceType == DeviceType.Transverter) { device = new Transverter(); }
+ else if (deviceType == DeviceType.DimmerSwitch) { device = new DimmerSwitch(); }
else if (deviceType == DeviceType.OtaDevice || deviceType == DeviceType.OtaPanelDevice) { device = new OTADevice(); }
else { return null; }
@@ -3088,7 +3155,7 @@
mainDevice.IconPath = "Device/Light.png";
}
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//璋冨厜鍣ㄥ浐瀹氱伅鍏�
if (sendFucType == true)
@@ -3106,7 +3173,7 @@
mainDevice.IconPath = "Device/ColorLightTemperature.png";
}
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//鑹叉俯鐏浐瀹氱伅鍏�
if (sendFucType == true)
@@ -3125,7 +3192,7 @@
if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
{
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//缁х數鍣ㄩ粯璁や负鐏厜
if (sendFucType == true)
@@ -3145,7 +3212,7 @@
if (mainDevice.DfunctionType == DeviceFunctionType.A鏈畾涔�)
{
mainDevice.DfunctionType = DeviceFunctionType.A寮�鍏�;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A寮�鍏�)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A寮�鍏�)
{
//绌烘皵寮�鍏抽粯璁や负寮�鍏�
if (sendFucType == true)
@@ -3164,7 +3231,7 @@
mainDevice.IconPath = "Device/ColorLight.png";
}
mainDevice.DfunctionType = DeviceFunctionType.A鐏厜;
- if (device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
+ if (device.DeviceInfo != null && device.DeviceInfo.FunctionType != (int)DeviceFunctionType.A鐏厜)
{
//褰╃伅榛樿涓哄紑鍏�
if (sendFucType == true)
diff --git a/ZigbeeApp/Shared/Common/SendDataToServer.cs b/ZigbeeApp/Shared/Common/SendDataToServer.cs
index e19af91..955e873 100755
--- a/ZigbeeApp/Shared/Common/SendDataToServer.cs
+++ b/ZigbeeApp/Shared/Common/SendDataToServer.cs
@@ -185,6 +185,10 @@
public class LoginObj
{
/// <summary>
+ /// RequestVersion
+ /// </summary>
+ public string RequestVersion = CommonPage.RequestVersion;
+ /// <summary>
/// 鐢ㄦ埛璐︽埛
/// </summary>
public string Account;
@@ -193,15 +197,10 @@
/// </summary>
public string Password;
/// <summary>
- /// 鐧诲綍鏉ユ簮,涓昏鏄负浜嗗尯鍒嗘娆＄櫥褰曟槸鏉ユ簮OnApp杩樻槸Zigbee App
- /// 榛樿鍊�: null
+ /// 鐧诲綍鏉ユ簮,0:Zigbee
/// </summary>
- public string Source;
- /// <summary>
- /// Company 鍏徃缂栧彿(0:HDL鐭俊楠岃瘉鐮� 1:鐭俊鎺у埗 2:閰掑簵鎺у埗 3:蹇樿瀵嗙爜 100:瀹夋嵎鍢� 101:鎯冲ぉ 102:瀹夌櫨绾� 103:棣栧煄鐝戠幒)
- /// 榛樿鍊�: 0
- /// </summary>
- public int Company;
+ public string RequestSource = "0";
+
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
index 62a53db..8cf158b 100755
--- a/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AddOrEditorSceneForm.cs
@@ -120,18 +120,31 @@
//鍒濆鍖栨坊鍔犵洰鏍�
this.InitAddTargetControl();
- //鍒嗕韩鐨勫満鏅笉鑳戒繚瀛�
- if (this.editorScene == null || this.editorScene.IsSharedScene == false)
+ //瀹屾垚
+ var btnSave = new BottomClickButton();
+ btnSave.TextID = R.MyInternationalizationString.uFinish;
+ bodyFrameLayout.AddChidren(btnSave);
+ btnSave.ButtonClickEvent += (sender, e) =>
{
- //瀹屾垚
- var btnSave = new BottomClickButton();
- btnSave.TextID = R.MyInternationalizationString.uFinish;
- bodyFrameLayout.AddChidren(btnSave);
- btnSave.ButtonClickEvent += (sender, e) =>
- {
- //淇濆瓨鍦烘櫙鏁版嵁
- this.SaveSceneData();
- };
+ //淇濆瓨鍦烘櫙鏁版嵁
+ this.SaveSceneData();
+ };
+
+ //鍒嗕韩鐨勫満鏅笉鑳戒繚瀛�
+ if (this.editorScene != null && this.editorScene.IsSharedScene == true)
+ {
+ btnSave.CanClick = false;
+ }
+ else if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶈兘淇濆瓨
+ btnSave.CanClick = false;
+ }
+ //濡傛灉鏄湁妯℃澘,鏈夎澶囩殑鏃跺��,鍦ㄦ病鏈夊彂閫佹垚鍔熶箣鍓�
+ else if (Common.Config.Instance.Home.TemplateMode == 2
+ && Common.Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ btnSave.CanClick = false;
}
}
@@ -189,6 +202,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
btnZhezhao.MouseUpEventHandler += (sender, e) =>
{
//鎴块棿鍥剧墖閫夋嫨
@@ -249,6 +267,11 @@
this.nowRoomId = selectId;
};
}
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ rowBelong.CanClick = false;
+ }
}
#endregion
@@ -291,6 +314,17 @@
//鏄剧ず娣诲姞鐩爣鑿滃崟
this.ShowAddTargetMenu();
};
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ rowAddTarget.CanClick = false;
+ }
+ //濡傛灉鏄湁妯℃澘,鏈夎澶囩殑鏃跺��,鍦ㄦ病鏈夊彂閫佹垚鍔熶箣鍓�
+ if (Common.Config.Instance.Home.TemplateMode == 2
+ && Common.Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ rowAddTarget.CanClick = false;
+ }
HdlThreadLogic.Current.RunThread(() =>
{
@@ -400,6 +434,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//缂栬緫
var btnEditor = rowDevice.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
@@ -523,6 +562,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//鍒犻櫎
var btnDelete = rowScene.AddDeleteControl();
btnDelete.ButtonClickEvent += (sender, e) =>
@@ -589,6 +633,11 @@
//鍒嗕韩鐨勫満鏅笉鑳界紪杈�
if (this.editorScene == null || this.editorScene.IsSharedScene == false)
{
+ if (Common.Config.Instance.Home.IsShowTemplate == true)
+ {
+ //妯℃澘鍦烘櫙涓嶅厑璁哥紪杈�
+ return;
+ }
//缂栬緫
var btnEditor = rowDelay.AddEditorControl();
btnEditor.ButtonClickEvent += (sender, e) =>
diff --git a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
index 37e40de..96be5ac 100755
--- a/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/AdjustTargetAddDeviceForm.cs
@@ -294,7 +294,7 @@
//涓婁竴娆￠�夋嫨鐨勮彍鍗曞拰鏁版嵁
DeviceRowInfo nowSelectDeviceInfo = null;
- MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
+ MainPage.Controls.DeviceFunctionMenuControl oldSelectContr = null;
foreach (string strText in dicGroupDevice.Keys)
{
var rowInfo = dicGroupDevice[strText];
@@ -305,9 +305,9 @@
deviceFunctionMenuContr.AddChidren(devieFrame);
//鑿滃崟鍥剧墖鎺т欢
- var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();
+ var deviceObjContr = new MainPage.Controls.DeviceFunctionMenuControl();
devieFrame.AddChidren(deviceObjContr);
- deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
+ deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);
deviceObjContr.ButtonClickEvent += (sender, e) =>
{
//閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
@@ -583,7 +583,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
dic[typeInfo.BeloneText].IconPathSelected = path2;
dic[typeInfo.BeloneText].TextId = typeInfo.BeloneText;
diff --git a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
index 41140ca..0051a5f 100755
--- a/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/Category/CategoryMainForm.cs
@@ -91,7 +91,7 @@
topFrameLayout.BackgroundColor = ZigbeeColor.Current.GXCGrayBackgroundColor;
this.AddChidren(topFrameLayout);
//鏍囬鍒嗙被
- var btnTitle = new NormalViewControl(300, 95, true);
+ var btnTitle = new NormalViewControl(400, 95, true);
btnTitle.X = ControlCommonResourse.XXLeft;
btnTitle.Gravity = Gravity.CenterVertical;
btnTitle.TextID = R.MyInternationalizationString.Category;
@@ -396,7 +396,7 @@
frameDeviceBack.AddChidren(listDeviceView);
//涓婁竴娆￠�夋嫨鐨勮彍鍗�
- MainPage.Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
+ MainPage.Controls.DeviceFunctionMenuControl oldSelectContr = null;
DeviceRowInfo nowSelectDeviceInfo = null;
foreach (string strText in dicGroupDevice.Keys)
{
@@ -408,9 +408,9 @@
HorizontalView.AddChidren(devieFrame);
//鑿滃崟鍥剧墖鎺т欢
- var deviceObjContr = new MainPage.Controls.DeviceFunctionUnallocatedControl();
+ var deviceObjContr = new MainPage.Controls.DeviceFunctionMenuControl();
devieFrame.AddChidren(deviceObjContr);
- deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
+ deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);
deviceObjContr.ButtonClickEvent += (sender, e) =>
{
//閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
@@ -976,7 +976,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
dic[typeInfo.BeloneText].IconPathSelected = path2;
dic[typeInfo.BeloneText].Text = typeInfo.BeloneText;
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs b/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs
index 3089a89..4c0881f 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/CommonFormBase.cs
@@ -228,38 +228,10 @@
/// <param name="msg">淇℃伅</param>
/// <param name="action">鍗曞嚮纭鍚庢墽琛岀殑鍥炶皟鍑芥暟</param>
/// <param name="buttonText">鎸夐挳鐨勬枃鏈�</param>
- public void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null)
+ /// <param name="i_waitTime">绛夊緟鏃堕棿,鍗曚綅涓虹,璁剧疆纭鎸夐挳鍦ㄥ闀挎椂闂村悗鎵嶈兘澶熺偣鍑�</param>
+ public void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null, int i_waitTime = -1)
{
- //绌哄璞℃椂锛屼笉鏄剧ず
- if (string.IsNullOrEmpty(msg))
- {
- return;
- }
- HdlThreadLogic.Current.RunMain(() =>
- {
- 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();
- });
+ HdlMessageLogic.Current.ShowMassage(msgType, msg, action, buttonText, i_waitTime);
}
/// <summary>
@@ -289,6 +261,36 @@
}
/// <summary>
+ /// 璁＄畻鐪熷疄瀹藉害(鍙兘浠ュ悗浼氬彉鍔�,鎵�浠ュ０鏄庡嚭鏉ユ湁鐢ㄥ)
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetRealWidth(int i_size)
+ {
+ return HdlControlLogic.Current.GetRealWidth(i_size);
+ }
+
+ /// <summary>
+ /// 璁＄畻鐪熷疄楂樺害搴�(鍙兘浠ュ悗浼氬彉鍔�,鎵�浠ュ０鏄庡嚭鏉ユ湁鐢ㄥ)
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetRealHeight(int i_size)
+ {
+ return HdlControlLogic.Current.GetRealHeight(i_size);
+ }
+
+ /// <summary>
+ /// 璁＄畻鐪熷疄澶у皬(杩欎釜涓滆タ鏈夌壒娈婄敤澶�,鑰冭檻鍒板姞闀垮瀷灞忓箷鐨勬帶浠�,璋冪敤姝ゆ柟娉�)
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetRealSizeEx(int i_size)
+ {
+ return HdlControlLogic.Current.GetRealSizeEx(i_size);
+ }
+
+ /// <summary>
/// 鍒ゆ柇鎸囧畾鐨勭晫闈㈡槸鍚︽墦寮�
/// </summary>
/// <param name="formId"></param>
diff --git a/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs b/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
index c9767d5..05bff9a 100755
--- a/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
+++ b/ZigbeeApp/Shared/Phone/CommonForm/DialogCommonForm.cs
@@ -47,14 +47,14 @@
bodyFrameLayout.BackgroundColor = UserCenterColor.Current.DialogBackColor;
this.AddChidren(bodyFrameLayout);
- if (CloseFormByClickBack == true)
+ bodyFrameLayout.MouseUpEventHandler += (sender, e) =>
{
- bodyFrameLayout.MouseUpEventHandler += (sender, e) =>
+ if (CloseFormByClickBack == true)
{
//鍏抽棴鑷韩
this.CloseForm();
- };
- }
+ }
+ };
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
index 746574f..972c622 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/AddScenePage.cs
@@ -82,7 +82,7 @@
{
if (clickTag == "no" || tempScene == null)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.scenetip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
index 11d924f..8f019c6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CurrentDeviceState.cs
@@ -69,8 +69,9 @@
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(56),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
- SeekBarViewHeight = Application.GetRealHeight(5),//杩涘害鏉＄殑楂樺害10
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ SeekBarViewHeight = Application.GetRealHeight(6),//杩涘害鏉＄殑楂樺害10
+ SeekBarPadding = 30,
};
#endregion
#endregion
@@ -308,7 +309,7 @@
closeView.selectedIconBtn.Visible = true;
}
Send.dictionary(deviceConditionsInfo, "Range", "5");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "1");
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//鏀寔1鍜�2;1+2=3
};
///鐐瑰嚮鍙栨秷浜嬩欢
closeView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
@@ -318,8 +319,8 @@
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
openView.selectedIconBtn.Visible = false;
closeView.selectedIconBtn.Visible = true;
- Send.dictionary(deviceConditionsInfo, "Range", "1");
- Send.dictionary(deviceConditionsInfo, "AttriButeData1", "0");
+ Send.dictionary(deviceConditionsInfo, "Range", "8");//1
+ Send.dictionary(deviceConditionsInfo, "AttriButeData1", "3");//0
if (iASZonedevice.IasDeviceType == 13|| iASZonedevice.IasDeviceType == 541)
{
SelectedDeviceStatus = "";
@@ -489,13 +490,13 @@
{
if (devices["AttriButeId"] == "1281")
{
- if (devices.ContainsKey("IgnoreTime"))
+ if (devices.ContainsKey("IgnoreTime")&& devices["IgnoreTime"]!="0")
{
timeValue = int.Parse(devices["IgnoreTime"]);
}
else
{
- if (devices["AttriButeData1"] == "1")
+ if (devices["Range"]== "5")
{
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
@@ -1299,7 +1300,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
index 39bcd16..f333492 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/CustomText.cs
@@ -116,7 +116,7 @@
Common.Logic.CurrentLogic.LogicCustomPushText = textBox.Text.Trim();
if (string.IsNullOrEmpty(Common.Logic.CurrentLogic.LogicCustomPushText))
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.tiptextnull),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
index 4511258..cb2bb2a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Cycle.cs
@@ -157,7 +157,7 @@
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectweek),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 72ffbac..d74b351 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -331,7 +331,7 @@
{
if (conditionsIndex == -1)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.usertip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
index 5efe52a..cbdf5ce 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicCommunalPage.cs
@@ -176,7 +176,7 @@
///鍒犻櫎鎺т欢
selecteddevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -660,7 +660,7 @@
actiondevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index 55df661..8c94faa 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -246,7 +246,7 @@
logicRowlayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
index bad3e73..b8d2424 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/EverymonthPage.cs
@@ -162,7 +162,7 @@
if (monselectedlist.Count == 0)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectweek),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
index 20e4cce..ec2e8ae 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/IgnoreTime.cs
@@ -155,7 +155,7 @@
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.delaytip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
index ab5d4e5..0221cc3 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicDveiceStatus.cs
@@ -171,7 +171,9 @@
case DeviceType.IASZone:
{
var iASZonedevice = deviceinof as IASZone;
- var intvalue = conditions["AttriButeData1"];
+ //var intvalue = conditions["AttriButeData1"];
+ string if_value = "5";
+ var intvalue = conditions["Range"];
icon = $"ZigeeLogic/sensor{iASZonedevice.IasDeviceType}.png";
switch (iASZonedevice.IasDeviceType)
{
@@ -183,7 +185,9 @@
}
else
{
- if (conditions.ContainsKey("IgnoreTime"))
+
+
+ if (conditions.ContainsKey("IgnoreTime")&& conditions["IgnoreTime"]!="0")
{
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
@@ -217,9 +221,9 @@
case 21:
case 22:
{
- if (conditions.ContainsKey("IgnoreTime"))
- {
+ if (conditions.ContainsKey("IgnoreTime")&&conditions["IgnoreTime"] != "0")
+ {
int minute = int.Parse(conditions["IgnoreTime"]) / 60;
int second = int.Parse(conditions["IgnoreTime"]) % 60;
if (minute != 0 && second != 0)
@@ -245,7 +249,7 @@
}
else
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state = Language.StringByID(MyInternationalizationString.logicopen);
}
@@ -260,7 +264,7 @@
break;
case 40:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID(MyInternationalizationString.smokescreen);
}
@@ -269,7 +273,7 @@
break;
case 42:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID( MyInternationalizationString.waterleakage);
}
@@ -281,7 +285,7 @@
break;
case 43:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID( MyInternationalizationString.gas);
}
@@ -290,7 +294,7 @@
break;
case 277:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID( MyInternationalizationString.callthepolice);
}
@@ -299,7 +303,7 @@
break;
default:
{
- if (intvalue == "1")
+ if (intvalue == if_value)
{
state =Language.StringByID(MyInternationalizationString.callthepolice);
}
@@ -529,7 +533,7 @@
selecteddevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -917,7 +921,7 @@
{
var intvalue = int.Parse(tasks["Data1"]);
var colorTemperatureValue = 1000000 / (intvalue * 100);
- state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "K";
+ state += Language.StringByID(MyInternationalizationString.colorTemperature) + colorTemperatureValue.ToString() + "00K";
}
break;
}
@@ -1090,7 +1094,7 @@
actiondevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
index 100b8cb..34d8e4c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/CompleteView.cs
@@ -62,10 +62,13 @@
fraView.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
fraView.Height = Application.GetRealHeight(1+140 + 70 + 160 * n);//1浣滅敤灏辨槸瑕嗙洊搴曡壊
fraView.Y = Application.GetRealHeight(1920 - 140 - 70 - 160 * n);
- fraView.AddChidren(titleRow);
- fraView.AddChidren(Btncancel);
- fraView.AddChidren(Btntitle);
- fraView.AddChidren(Btncomplete);
+ if (titleRow.Parent == null)
+ {
+ fraView.AddChidren(titleRow);
+ fraView.AddChidren(Btncancel);
+ fraView.AddChidren(Btntitle);
+ fraView.AddChidren(Btncomplete);
+ }
return fraView;
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
index b5069a6..a7c0a11 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/MemberList.cs
@@ -327,7 +327,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
index 62ce91a..999cd5d 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Method.cs
@@ -594,7 +594,9 @@
}; break;
case 5:
{
- string len = "", text = "";
+ string len = "";
+ string text = "";
+ string weekStr = Language.StringByID(MyInternationalizationString.week1);
List<int> listvalueInt = new List<int>();
listvalueInt.Clear();
var maxvalue = Convert.ToString(currentLogic.TimeAttribute.WeekDay, 2);
@@ -610,44 +612,36 @@
if (strvalue == "1")
{
listvalueInt.Add(j + 1);
-
-
- if ((j + 1) == 1)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.mon1) + ",";
- //text += Language.StringByID(MyInternationalizationString.mon) + ",";
+ switch ((j + 1)) {
+ case 1: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.mon1) + ",";
+ }
+ break;
+ case 2: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.tue1) + ",";
+ }
+ break;
+ case 3: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.wed1) + ",";
+ }
+ break;
+ case 4: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.thu1) + ",";
+ }
+ break;
+ case 5: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.frl1) + ",";
+ }
+ break;
+ case 6: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.sat1) + ",";
+ }
+ break;
+ case 7: {
+ text += weekStr + Language.StringByID(MyInternationalizationString.sun1) + ",";
+ }
+ break;
}
- else if ((j + 1) == 2)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.tue1) + ",";
- //text += Language.StringByID(MyInternationalizationString.tue) + ",";
- }
- else if ((j + 1) == 3)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.wed1) + ",";
- //text += Language.StringByID(MyInternationalizationString.wed) + ",";
- }
- else if ((j + 1) == 4)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.thu1) + ",";
- //text += Language.StringByID(MyInternationalizationString.thu) + ",";
- }
- else if ((j + 1) == 5)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.frl1) + ",";
- //text += Language.StringByID(MyInternationalizationString.frl) + ",";
- }
- else if ((j + 1) == 6)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sat1) + ",";
- //text += Language.StringByID(MyInternationalizationString.sat) + ",";
- }
- else if ((j + 1) == 7)
- {
- text += Language.StringByID(MyInternationalizationString.week1) + Language.StringByID(MyInternationalizationString.sun1) + ",";
- //text += Language.StringByID(MyInternationalizationString.sun) + ",";
- }
-
}
}
@@ -668,8 +662,7 @@
//{
// btndisplaycycle.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
//}
- button.Text = Language.StringByID(MyInternationalizationString.week1) + text.Replace(Language.StringByID(MyInternationalizationString.week1), "").TrimEnd(',');
- //btndisplaycycle.Text = text.TrimEnd(',');
+ button.Text = weekStr + text.Replace(weekStr, "").TrimEnd(',');
}; break;
}
@@ -771,7 +764,7 @@
if (CurrentLogic.Conditions.Count == 0 || CurrentLogic.Actions.Count == 0)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.addnull),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -780,7 +773,7 @@
if (string.IsNullOrEmpty(name))
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.PleaseEnterLogicName),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
index 1292f36..a2bcb2a 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Nightlight.cs
@@ -15,10 +15,10 @@
}
string selectedDeviceStatus = "";
Dictionary<string, object> actionsInfo = null;
- List<Dictionary<string, string>> TaskList = null;
+ List<Dictionary<string, string>> TaskList = new List<Dictionary<string, string>>();
public void Show(CommonDevice common, bool edit,string str_if,Dictionary<string, object> editdeviceActionInfo = null)
{
- actionsInfo = editdeviceActionInfo;
+ #region 甯冨眬鐣岄潰
this.BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor;
TopView view = new TopView();
this.AddChidren(view.TopRowView());
@@ -26,6 +26,7 @@
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
RemoveFromParent();
+
};
var middle = new FrameLayout
{
@@ -34,48 +35,59 @@
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
};
this.AddChidren(middle);
-
+ //澶滅伅寮�鍏�
LogicView.LightView openView = new LogicView.LightView();
openView.titleBtn.Text = Language.StringByID(MyInternationalizationString.nightLightSwitch);
middle.AddChidren(openView.Show());
- openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- CurrentDeviceView("澶滅伅寮�鍏�", common, edit, openView.seletecdTextBtn);
- };
-
+
+ //浜害
LogicView.LightView brightnessView = new LogicView.LightView();
brightnessView.frameLayout.Y = openView.frameLayout.Bottom;
brightnessView.titleBtn.Text = Language.StringByID(MyInternationalizationString.brightness);
middle.AddChidren(brightnessView.Show());
- brightnessView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- CurrentDeviceView("浜害", common, edit, brightnessView.seletecdTextBtn);
- };
-
+
+ //鑹叉俯
LogicView.LightView colorTemperatureView = new LogicView.LightView();
colorTemperatureView.frameLayout.Y = brightnessView.frameLayout.Bottom;
colorTemperatureView.titleBtn.Text = Language.StringByID(MyInternationalizationString.colorTemperature);
middle.AddChidren(colorTemperatureView.Show());
- colorTemperatureView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
- {
- CurrentDeviceView("鑹叉俯", common, edit, colorTemperatureView.seletecdTextBtn);
- };
-
+
+ //铚傞福鍣�
LogicView.LightView buzzView = new LogicView.LightView();
buzzView.frameLayout.Y = colorTemperatureView.frameLayout.Bottom;
buzzView.titleBtn.Text = Language.StringByID(MyInternationalizationString.buzzer);
middle.AddChidren(buzzView.Show());
+ //淇濆瓨
+ LogicView.SaveView saveView = new LogicView.SaveView();
+ saveView.frameLayout.Y = middle.Height - Application.GetRealHeight(260);
+ middle.AddChidren(saveView.Show());
+ #endregion
+
+ #region 鐐瑰嚮浜嬩欢
+ //澶滅伅寮�鍏崇偣鍑讳簨浠�
+ openView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ CurrentDeviceView("澶滅伅寮�鍏�", common, edit, openView.seletecdTextBtn);
+ };
+ //浜害鐐瑰嚮浜嬩欢
+ brightnessView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ CurrentDeviceView("浜害", common, edit, brightnessView.seletecdTextBtn);
+ };
+ //鑹叉俯鐐瑰嚮浜嬩欢
+ colorTemperatureView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
+ {
+ CurrentDeviceView("鑹叉俯", common, edit, colorTemperatureView.seletecdTextBtn);
+ };
+ //铚傞福鍣ㄧ偣鍑讳簨浠�
buzzView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
CurrentDeviceView("铚傞福鍣�", common, edit, buzzView.seletecdTextBtn);
};
-
- LogicView.SaveView saveView = new LogicView.SaveView();
- saveView.frameLayout.Y = middle.Height - Application.GetRealHeight(260);
- middle.AddChidren(saveView.Show());
+ //淇濆瓨鐐瑰嚮浜嬩欢
saveView.clickviewBtn.MouseUpEventHandler += (sender, e) =>
{
- if (selectedDeviceStatus != "" && actionsInfo != null)
+ if (TaskList.Count!=0)
{
LogicIfon.AddDeviceActions(common, actionsInfo);
}
@@ -83,7 +95,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -109,69 +121,83 @@
}
};
+ #endregion
if (edit)
{
- foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
- {
- if (deviceinfo["LinkType"].ToString() == "0")
+ foreach (var deviceinfo in Common.Logic.CurrentLogic.Actions)
{
-
- if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
+ if (deviceinfo["LinkType"].ToString() == "0")
{
- TaskList = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
- foreach (var tasks in TaskList)
+
+ if (deviceinfo["DeviceAddr"].ToString() == common.DeviceAddr && deviceinfo["Epoint"].ToString() == common.DeviceEpoint.ToString())
{
- switch (tasks["TaskType"])
+ var taskLists = deviceinfo["TaskList"] as List<Dictionary<string, string>>;
+ foreach (var tasks in taskLists)
{
- case "1":
- {
- if (tasks["Data1"] == "0")
+ TaskList.Add(tasks);
+ switch (tasks["TaskType"])
+ {
+ case "1":
{
- openView.seletecdTextBtn.TextID = MyInternationalizationString.close;
+ if (tasks["Data1"] == "0")
+ {
+ openView.seletecdTextBtn.TextID = MyInternationalizationString.close;
+ }
+ else
+ {
+ openView.seletecdTextBtn.TextID = MyInternationalizationString.open;
+ }
}
- else
+ break;
+ case "3":
{
- openView.seletecdTextBtn.TextID = MyInternationalizationString.open;
+ var intvalue = int.Parse(tasks["Data1"]);
+ var lightbrightnessvalue = (intvalue * 100) / 254;
+ brightnessView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "%";
}
- }
- break;
- case "3":
- {
- var intvalue = int.Parse(tasks["Data1"]);
- var lightbrightnessvalue = (intvalue * 100) / 254;
- brightnessView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "%";
- }
- break;
- case "7":
- {
- if (tasks["Data1"] == "0")
+ break;
+ case "7":
{
- buzzView.seletecdTextBtn.TextID = MyInternationalizationString.close;
+ if (tasks["Data1"] == "0")
+ {
+ buzzView.seletecdTextBtn.TextID = MyInternationalizationString.close;
+ }
+ else
+ {
+ buzzView.seletecdTextBtn.TextID = MyInternationalizationString.open;
+ }
}
- else
+ break;
+ case "8":
{
- buzzView.seletecdTextBtn.TextID = MyInternationalizationString.open;
+ var intvalue = int.Parse(tasks["Data1"]);
+ var lightbrightnessvalue = 1000000 / (intvalue * 100);
+ colorTemperatureView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "00K";
}
- }
- break;
- case "8":
- {
- var intvalue = int.Parse(tasks["Data1"]);
- var lightbrightnessvalue = 1000000 / (intvalue * 100);
- colorTemperatureView.seletecdTextBtn.Text = lightbrightnessvalue.ToString() + "K";
- }
- break;
+ break;
+ }
}
+ break;
}
- break;
}
}
- }
}
+
+ if (actionsInfo == null)
+ {
+ actionsInfo = new Dictionary<string, object>();
+ actionsInfo.Add("LinkType", 0);
+ actionsInfo.Add("DeviceAddr", common.DeviceAddr);
+ actionsInfo.Add("Epoint", common.DeviceEpoint);
+ actionsInfo.Add("Time", 0);
+ actionsInfo.Add("TaskList", TaskList);
+ }
+
}
public void CurrentDeviceView(string if_str, CommonDevice common, bool edit, Button button)
{
+ #region 甯冨眬鐣岄潰
var flMain = new FrameLayout { BackgroundColor = ZigbeeColor.Current.LogicViewBackgroundColor };
this.AddChidren(flMain);
UserView.HomePage.Instance.ScrollEnabled = false;//涓嶈褰撳墠鐣岄潰婊戝姩
@@ -185,26 +211,16 @@
};
flMain.MouseUpEventHandler += clickcancel;
completeView.Btncancel.MouseUpEventHandler += clickcancel;
- if (actionsInfo == null)
- {
- actionsInfo = new Dictionary<string, object>();
- TaskList = new List<Dictionary<string, string>>();
- actionsInfo.Add("LinkType", 0);
- actionsInfo.Add("DeviceAddr", common.DeviceAddr);
- actionsInfo.Add("Epoint", common.DeviceEpoint);
- actionsInfo.Add("Time", 0);
- actionsInfo.Add("TaskList", TaskList);
- }
- string status = "";
+ #endregion
+ string status = "";
+ Dictionary<string, string> dictionaryLight = new Dictionary<string, string>();
+ dictionaryLight.Clear();
switch (if_str)
{
case "澶滅伅寮�鍏�":
{
-
- Dictionary<string, string> switchDictionary = new Dictionary<string, string>();
- Send.dictionary(switchDictionary, "TaskType", "1");
- Send.dictionary(switchDictionary, "Data2", "0");
+
mFunView openView = new mFunView();
openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
openView.titleBtn.TextID = MyInternationalizationString.open;
@@ -222,8 +238,7 @@
closeView.selectedIconBtn.Visible = false;
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- Send.dictionary(switchDictionary, "Data1", "1");//榛樿鍊�
- DicValue("1", switchDictionary);
+ Send.dictionary(dictionaryLight, "Data1", "1");//榛樿鍊�
status = Language.StringByID(MyInternationalizationString.open);
};
@@ -235,12 +250,11 @@
closeView.selectedIconBtn.Visible = true;
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- Send.dictionary(switchDictionary, "Data1", "0");//榛樿鍊�
- DicValue("1", switchDictionary);
+ Send.dictionary(dictionaryLight, "Data1", "0");//榛樿鍊�
status = Language.StringByID(MyInternationalizationString.close);
};
- if (TaskList != null && TaskList.Count != 0)
+ if ( TaskList.Count != 0)
{
foreach (var value in TaskList)
{
@@ -265,37 +279,34 @@
break;
case "浜害":
{
- Dictionary<string, string> brightnessDictionary = new Dictionary<string, string>();
- Send.dictionary(brightnessDictionary, "TaskType", "3");
- Send.dictionary(brightnessDictionary, "Data2", "0");
var horizontalSeekBarVol = new DiyImageSeekBar
{
Y = Application.GetRealHeight(140),//杩涘害鏉＄埗鎺т欢Y鍧愭爣
X = Application.GetRealWidth(78),//杩涘害鏉鍧愭爣
Width = Application.GetRealWidth(918),//杩涘害鏉＄殑闀垮害
- Height = Application.GetRealHeight(320),//杩涘害鏉＄埗鎺ф帶浠堕珮搴�
+ Height = Application.GetRealHeight(320),//杩涘害鏉＄埗鎺т欢楂樺害
IsProgressTextShow = true,//鏄剧ず鐧惧垎姣�
IsClickable = true,//杩涘害鏉℃槸鍚︽粦鍔�
ProgressBarColor = ZigbeeColor.Current.LogicProgressColorSelected,//閫変腑杩涘害鏉￠鑹�
ThumbImagePath = "ZigeeLogic/progressbtn2.png",//杩涘害鏉℃寜閽浘鏍�
ThumbImageHeight = Application.GetRealHeight(89),//杩涘害鏉℃寜閽浘鏍囩殑楂樺害锛堥粯璁ゆ鏂瑰舰锛氬鍜岄珮涓�鏍凤級
ProgressTextColor = ZigbeeColor.Current.LogicBtnCancelColor,
- ProgressTextSize = 9,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
+ ProgressTextSize = 12,//鏄剧ず鐧惧垎姣斿瓧浣撳ぇ灏�12
SeekBarViewHeight = Application.GetRealHeight(6),//杩涘害鏉＄殑楂樺害10
+ SeekBarPadding=30,
};
completeView.Show(2).AddChidren(horizontalSeekBarVol);
EventHandler<int> progressclick = (sender, e) =>
{
selectedDeviceStatus = "3";
int lightbrightnessvalue = (254 * horizontalSeekBarVol.Progress) / 100;
- Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString());
- DicValue("3", brightnessDictionary);
+ Send.dictionary(dictionaryLight, "Data1", lightbrightnessvalue.ToString());
status = horizontalSeekBarVol.Progress.ToString() + "%";
};
horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
- if (TaskList != null && TaskList.Count != 0)
+ if ( TaskList.Count != 0)
{
foreach (var value in TaskList)
{
@@ -313,9 +324,6 @@
break;
case "鑹叉俯":
{
- Dictionary<string, string> brightnessDictionary = new Dictionary<string, string>();
- Send.dictionary(brightnessDictionary, "TaskType", "8");
- Send.dictionary(brightnessDictionary, "Data2", "0");
Button seekIconBtn = new Button
{
Y = Application.GetRealHeight(140 + 160),
@@ -345,14 +353,13 @@
horizontalSeekBarVol.SetCustomText(e * 100 + "K");
selectedDeviceStatus = "8";
var lightbrightnessvalue = 1000000 / (100 * horizontalSeekBarVol.Progress);
- Send.dictionary(brightnessDictionary, "Data1", lightbrightnessvalue.ToString());
- DicValue("8", brightnessDictionary);
- status =horizontalSeekBarVol.Progress.ToString() + "K";
+ Send.dictionary(dictionaryLight, "Data1", lightbrightnessvalue.ToString());
+ status =horizontalSeekBarVol.Progress.ToString() + "00K";
};
horizontalSeekBarVol.OnProgressChangedEvent += progressclick;
horizontalSeekBarVol.OnStopTrackingTouchEvent += progressclick;
- if (TaskList != null && TaskList.Count != 0)
+ if ( TaskList.Count != 0)
{
foreach (var value in TaskList)
{
@@ -374,10 +381,6 @@
break;
case "铚傞福鍣�":
{
- Dictionary<string, string> switchDictionary = new Dictionary<string, string>();
- Send.dictionary(switchDictionary, "TaskType", "7");
- Send.dictionary(switchDictionary, "Data2", "0");
-
mFunView openView = new mFunView();
openView.frameLayout.Y = Application.GetRealHeight(140 + 20);
@@ -397,8 +400,7 @@
closeView.selectedIconBtn.Visible = false;
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
- Send.dictionary(switchDictionary, "Data1", "1");//榛樿鍊�
- DicValue("7", switchDictionary);
+ Send.dictionary(dictionaryLight, "Data1", "1");//榛樿鍊�
status = Language.StringByID(MyInternationalizationString.open);
};
@@ -410,13 +412,12 @@
closeView.selectedIconBtn.Visible = true;
openView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnNotSelectedColor;
closeView.titleBtn.TextColor = ZigbeeColor.Current.LogicBtnSelectedColor;
- Send.dictionary(switchDictionary, "Data1", "0");//榛樿鍊�
- DicValue("7", switchDictionary);
+ Send.dictionary(dictionaryLight, "Data1", "0");//榛樿鍊�
status = Language.StringByID(MyInternationalizationString.close);
};
- if (TaskList != null && TaskList.Count != 0)
+ if ( TaskList.Count != 0)
{
foreach (var value in TaskList)
{
@@ -442,10 +443,12 @@
}
completeView.Btncomplete.MouseUpEventHandler += (sender, e) =>
{
- if (selectedDeviceStatus != "")
+ if (dictionaryLight.Count!=0)
{
-
+ Send.dictionary(dictionaryLight, "TaskType", selectedDeviceStatus);
+ Send.dictionary(dictionaryLight, "Data2", "0");
flMain.RemoveFromParent();
+ DicValue(selectedDeviceStatus, dictionaryLight);
button.Text = status;
}
@@ -453,7 +456,7 @@
{
if (!edit)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectdevicestatuscondition),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -484,10 +487,7 @@
}
if (!d)
{
- if (TaskList != null)
- {
- TaskList.Add(dictionay);
- }
+ TaskList.Add(dictionay);
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
index ff9e8ec..7238313 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SecurityMode.cs
@@ -202,7 +202,7 @@
if (!athomeView.funnextBtn.Visible && !leaveView.funnextBtn.Visible && !withdrawalView.funnextBtn.Visible && !urgentwithdView.funnextBtn.Visible)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.securitytip),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index deb3564..f016cbc 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -530,7 +530,7 @@
logicRowlayout.AddRightView(del);
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index 0aee184..f354350 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -707,7 +707,7 @@
///鍒犻櫎鐐瑰嚮浜嬩欢
del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
index b3aa415..d897898 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TemplatePage.cs
@@ -285,7 +285,7 @@
selecteddevice.del.MouseUpEventHandler += (sender, e) =>
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -417,7 +417,7 @@
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Confirm,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Confirm,
Language.StringByID(MyInternationalizationString.doyouwanttodelete),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
index 63e792d..3e79b1e 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/TimePage.cs
@@ -175,7 +175,7 @@
if (endView.titleBtn.Tag.ToString() != "0" && startval.ToString() == endView.titleBtn.Tag.ToString())
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.nottime),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -184,7 +184,7 @@
if (endView.titleBtn.Tag.ToString() != "0" && startval > int.Parse(endView.titleBtn.Tag.ToString()))
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.timesetting),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -247,7 +247,7 @@
if (startView.titleBtn.Tag.ToString() != "0" && endval.ToString() == startView.titleBtn.Tag.ToString())
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.nottime),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -256,7 +256,7 @@
if (startView.titleBtn.Tag.ToString() != "0" && endval < int.Parse(startView.titleBtn.Tag.ToString()))
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.timesetting),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -295,7 +295,7 @@
if (string.IsNullOrEmpty(startView.titleBtn.Text) || string.IsNullOrEmpty(endView.titleBtn.Text))
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.completeNext),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
@@ -303,7 +303,7 @@
}
if (startView.titleBtn.Text == endView.titleBtn.Text)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.sametime),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
index 79b9b78..c33114c 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/WeekPage.cs
@@ -172,7 +172,7 @@
}
if (weekvalue == 0)
{
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal,
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal,
Language.StringByID(MyInternationalizationString.selectweek),
Language.StringByID(MyInternationalizationString.confrim));
alert.Show();
diff --git a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
index f10e1fc..25cb57f 100755
--- a/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
+++ b/ZigbeeApp/Shared/Phone/Login/AccountLoginForm.cs
@@ -59,7 +59,7 @@
btnLogoIcon.Gravity = Gravity.CenterHorizontal;
this.AddChidren(btnLogoIcon);
//Evoyo Home
- var btnLogoName = new NormalViewControl(300, 69, true);
+ var btnLogoName = new NormalViewControl(700, 69, true);
btnLogoName.Y = btnLogoIcon.Bottom;
btnLogoName.Gravity = Gravity.CenterHorizontal;
btnLogoName.TextID = R.MyInternationalizationString.AppName;
@@ -684,7 +684,8 @@
btnMsg2.ButtonClickEvent += (sender, e) =>
{
var form = new UserCenter.Abount.SLAForm();
- this.AddChidren(form);
+ CommonPage.Instance.AddChidren(form);
+
form.InitTopFrameLayout();
form.InitBodyFrameLayout();
form.ShowForm();
@@ -778,8 +779,6 @@
var pra = new SendDataToServer.LoginObj();
pra.Account = i_account;
pra.Password = i_psw;
- pra.Source = CommonPage.Source;
- pra.Company = CommonPage.Company;
//璁块棶鎺ュ彛
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(pra);
@@ -1191,6 +1190,11 @@
//璇峰厛鑾峰彇楠岃瘉鐮�
btnErrorMsg.TextID = R.MyInternationalizationString.NORECORD;
}
+ else if (stateCodeStr == "BERESTRICT")
+ {
+ //姝よ处鍙锋棤鏉冪櫥褰�
+ btnErrorMsg.TextID = R.MyInternationalizationString.ThisAccountHasNoAuthorityToLogin;
+ }
else if (stateCodeStr == "YOUDATANOISLOCALREGION")
{
//涓嶅湪鏈尯鍩燂紝闇�瑕侀噸瀹氬悜鍖哄煙鍚庡啀娆¤姹傜櫥褰�
diff --git a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionUnallocatedControl.cs b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionMenuControl.cs
similarity index 91%
rename from ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionUnallocatedControl.cs
rename to ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionMenuControl.cs
index ede1a4a..5a8af2c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionUnallocatedControl.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/Controls/DeviceFunctionMenuControl.cs
@@ -6,9 +6,9 @@
namespace Shared.Phone.MainPage.Controls
{
/// <summary>
- /// 鏈垎閰嶇晫闈㈢殑璁惧鍔熻兘鍥炬爣鎺т欢
+ /// 璁惧鍔熻兘鑿滃崟鐨勫浘鏍囨帶浠�
/// </summary>
- public class DeviceFunctionUnallocatedControl : FrameLayoutStatuControl
+ public class DeviceFunctionMenuControl : FrameLayoutStatuControl
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -32,7 +32,7 @@
/// <summary>
/// 鏈垎閰嶇晫闈㈢殑璁惧鍔熻兘鍥炬爣鎺т欢
/// </summary>
- public DeviceFunctionUnallocatedControl()
+ public DeviceFunctionMenuControl()
{
this.Width = Application.GetRealWidth(220);
this.Height = Application.GetRealHeight(279);
@@ -45,8 +45,7 @@
/// <param name="text">鏄剧ず鐨勬枃鏈�</param>
/// <param name="unSelectPath">鍥剧墖1</param>
/// <param name="selectPath">鍥剧墖2</param>
- /// <param name="listDevice">璁惧鍒楄〃</param>
- public void InitControl(string text, string unSelectPath, string selectPath, List<string> listDevice)
+ public void InitControl(string text, string unSelectPath, string selectPath)
{
//鑳屾櫙鎺т欢
this.btnBackGroud = new PicViewControl(150, 173);
diff --git a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
index 0b5571f..549615c 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/HomeMainPageForm.cs
@@ -321,7 +321,7 @@
this.listBodyContr.frameTable.AddChidren(bg);
var tip = new NormalViewControl(this.GetPictrueRealSize(717), this.GetPictrueRealSize(58), false);
- tip.Y = Application.GetRealHeight(815);
+ tip.Y = bg.Bottom + Application.GetRealHeight(35);
tip.Gravity = Gravity.CenterHorizontal;
tip.TextID = R.MyInternationalizationString.NewAccountNeedBingGW;
tip.TextColor = ZigbeeColor.Current.GXCTextGrayColor;
@@ -329,13 +329,13 @@
this.listBodyContr.frameTable.AddChidren(tip);
var addBG = new PicViewControl(971, 366);
- addBG.Y = Application.GetRealHeight(1048);
+ addBG.Y = tip.Bottom + Application.GetRealHeight(176);
addBG.UnSelectedImagePath = "Item/VirtualFrame.png";
addBG.Gravity = Gravity.CenterHorizontal;
this.listBodyContr.frameTable.AddChidren(addBG);
var addGatewayBtn = new IconViewControl(89);
- addGatewayBtn.Y = Application.GetRealHeight(1143);
+ addGatewayBtn.Y = tip.Bottom + Application.GetRealHeight(271);
addGatewayBtn.UnSelectedImagePath = "Item/Add_GW.png";
addGatewayBtn.Gravity = Gravity.CenterHorizontal;
this.listBodyContr.frameTable.AddChidren(addGatewayBtn);
@@ -346,7 +346,7 @@
};
var addTip = new PicViewControl(717, 58);
- addTip.Y = Application.GetRealHeight(1256);
+ addTip.Y = addGatewayBtn.Bottom + Application.GetRealHeight(23);
addTip.Gravity = Gravity.CenterHorizontal;
addTip.TextID = R.MyInternationalizationString.AddSmartGW;
addTip.TextColor = ZigbeeColor.Current.GXCTextBlackColor;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs b/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
index 7efcb76..9f5be03 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/LeftListRoomViewFrom.cs
@@ -298,7 +298,7 @@
frameBack.AddChidren(btnIcon, ChidrenBindMode.BindEvent);
//鏈垎閰�
- var btnName = new NormalViewControl(141, 84, true);
+ var btnName = new NormalViewControl(250, 84, true);
btnName.X = this.GetPictrueRealSize(244);
btnName.Y = this.GetPictrueRealSize(131);
btnName.IsBold = true;
diff --git a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
index 2d477e4..59d79db 100755
--- a/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/MainPage/UnallocatedRoomForm.cs
@@ -325,7 +325,7 @@
DeviceBodyTableControl.AddChidren(HorizontalView);
//涓婁竴娆￠�夋嫨鐨勮彍鍗�
- Controls.DeviceFunctionUnallocatedControl oldSelectContr = null;
+ Controls.DeviceFunctionMenuControl oldSelectContr = null;
foreach (string strText in this.dicGroupDevice.Keys)
{
var rowInfo = dicGroupDevice[strText];
@@ -336,9 +336,9 @@
HorizontalView.AddChidren(devieFrame);
//鑿滃崟鍥剧墖鎺т欢
- var deviceObjContr = new Controls.DeviceFunctionUnallocatedControl();
+ var deviceObjContr = new Controls.DeviceFunctionMenuControl();
devieFrame.AddChidren(deviceObjContr);
- deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected, rowInfo.listDeviceKeys);
+ deviceObjContr.InitControl(strText, rowInfo.IconPath, rowInfo.IconPathSelected);
deviceObjContr.ButtonClickEvent += (sender, e) =>
{
//閫夋嫨鐨勬槸鍚屼竴涓笢瑗跨殑璇�,涓嶅鐞�
@@ -644,7 +644,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
dic[typeInfo.BeloneText].IconPathSelected = path2;
dic[typeInfo.BeloneText].Text = typeInfo.BeloneText;
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
old mode 100755
new mode 100644
index 304eb74..ddf78a0
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDevice.cs
@@ -357,7 +357,7 @@
/// </summary>
private NormalViewControl btnName = null;
- private IconViewControl Right_icon = null;
+ private MostRightIconControl Right_icon = null;
/// <summary>
@@ -380,14 +380,11 @@
//鏄剧ず鏂囨湰
btnName = this.AddLeftCaption(string.Empty, 700);
btnName.Height = Application.GetRealHeight(60);
- btnName.TextSize = 17;
+ btnName.TextSize = 14;
btnName.Y = Application.GetRealHeight(57);
btnName.Text = scene.SceneName;
- Right_icon = this.AddRightArrow();
- Right_icon.Width = Application.GetRealWidth(115);
- Right_icon.Height = Application.GetRealHeight(115);
+ Right_icon = this.AddMostRightEmptyIcon(58, 58);
Right_icon.Gravity = Gravity.CenterVertical;
- Right_icon.X = Right_icon.X - Application.GetRealWidth(60);
this.ButtonClickEvent += (sender, e) =>
{
@@ -406,13 +403,13 @@
{
if (bol)
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxSel.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxSel.png";
+ Right_icon.SelectedImagePath = "Item/ItemSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemSelected.png";
}
else
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxDef.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxDef.png";
+ Right_icon.SelectedImagePath = "Item/ItemUnSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemUnSelected.png";
}
}
catch (Exception e)
@@ -439,7 +436,7 @@
/// </summary>
private NormalViewControl btnName = null;
- private IconViewControl Right_icon = null;
+ private MostRightIconControl Right_icon = null;
/// <summary>
@@ -462,14 +459,11 @@
//鏄剧ず鏂囨湰
btnName = this.AddLeftCaption(string.Empty, 700);
btnName.Height = Application.GetRealHeight(60);
- btnName.TextSize = 17;
+ btnName.TextSize = 14;
btnName.Y = Application.GetRealHeight(57);
btnName.Text = device.DeviceName;
- Right_icon = this.AddRightArrow();
- Right_icon.Width = Application.GetRealWidth(115);
- Right_icon.Height = Application.GetRealHeight(115);
+ Right_icon = this.AddMostRightEmptyIcon(58, 58);
Right_icon.Gravity = Gravity.CenterVertical;
- Right_icon.X = Right_icon.X - Application.GetRealWidth(60);
this.ButtonClickEvent += (sender, e) =>
{
@@ -488,14 +482,14 @@
{
if (bol)
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxSel.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxSel.png";
+ Right_icon.SelectedImagePath = "Item/ItemSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemSelected.png";
}
else
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxDef.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxDef.png";
- }
+ Right_icon.SelectedImagePath = "Item/ItemUnSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemUnSelected.png";
+ }
}
catch (Exception e)
{
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDeviceChange.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDeviceChange.cs
old mode 100755
new mode 100644
index f457039..c163ad7
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDeviceChange.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundContentForDeviceChange.cs
@@ -514,7 +514,7 @@
btnCaption = frameTable.AddLeftCaption(remark, 2000);
var nicknameIcon = frameTable.AddRightArrow();//58
- nicknameIcon.TextSize = 17;
+ nicknameIcon.TextSize = 14;
nicknameIcon.SelectedImagePath = "SmartSound/Nickname.png";
nicknameIcon.UnSelectedImagePath = "SmartSound/Nickname.png";
@@ -580,7 +580,7 @@
btnCaption = frameTable.AddLeftCaption(remark, 2000);
var nicknameIcon = frameTable.AddRightArrow();//58
- nicknameIcon.TextSize = 17;
+ nicknameIcon.TextSize = 14;
nicknameIcon.SelectedImagePath = "SmartSound/Nickname.png";
nicknameIcon.UnSelectedImagePath = "SmartSound/Nickname.png";
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs
old mode 100755
new mode 100644
index dd55a25..9ccdd57
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundControlContentForm.cs
@@ -624,7 +624,7 @@
/// </summary>
private NormalViewControl btnName = null;
- private IconViewControl Right_icon = null;
+ private MostRightIconControl Right_icon = null;
/// <summary>
/// 鎴块棿鍒楄〃琛�
@@ -646,15 +646,12 @@
//鏄剧ず鏂囨湰
btnName = this.AddLeftCaption(string.Empty, 2000);
btnName.Height = Application.GetRealHeight(60);
- btnName.TextSize = 17;
+ btnName.TextSize = 14;
btnName.Y = Application.GetRealHeight(57);
btnName.Text = mRoom.RoomName;
- Right_icon = this.AddRightArrow();
- Right_icon.Width = Application.GetRealWidth(115);
- Right_icon.Height = Application.GetRealHeight(115);
+ Right_icon = this.AddMostRightEmptyIcon(58, 58);
Right_icon.Gravity = Gravity.CenterVertical;
- Right_icon.X = Right_icon.X - Application.GetRealWidth(60);
btnName.ButtonClickEvent += (sender, e) =>
{
@@ -681,15 +678,15 @@
{
if (bol)
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxSel.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxSel.png";
+ Right_icon.SelectedImagePath = "Item/ItemSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemSelected.png";
smartSoundControlContentForm.AddData(mRoom);
}
else
{
- Right_icon.SelectedImagePath = "SmartSound/CheckBoxDef.png";
- Right_icon.UnSelectedImagePath = "SmartSound/CheckBoxDef.png";
+ Right_icon.SelectedImagePath = "Item/ItemUnSelected.png";
+ Right_icon.UnSelectedImagePath = "Item/ItemUnSelected.png";
smartSoundControlContentForm.RemoveData(mRoom);
}
diff --git a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
index ce3bca1..20d377d 100755
--- a/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
+++ b/ZigbeeApp/Shared/Phone/SmartSound/Forms/SmartSoundListForm.cs
@@ -187,6 +187,14 @@
row.ImagePath = "SmartSound/Xiaodu.png";
row.Remark = remark;
+ }else if (smartSound.PlatfromName == "AISpeech")
+ {
+ string remark = "鎬濆繀椹�";
+ if (smartSound.Remark != null && smartSound.Remark.Trim() != "")
+ remark += "(" + smartSound.Remark + ")";
+
+ row.ImagePath = "SmartSound/Xiaodu.png";
+ row.Remark = remark;
}
row.InitControl();
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
index f435350..2407f44 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateCommonLogic.cs
@@ -171,7 +171,7 @@
/// </summary>
/// <param name="strData">妯℃澘鏂囦欢涓殑琛屾暟鎹�</param>
/// <param name="hadRoom">鏄惁宸茬粡鏈変簡鎴块棿</param>
- private bool AdjustTemplateBinFileContentOnLoadMemory(string strData,bool hadRoom)
+ private bool AdjustTemplateBinFileContentOnLoadMemory(string strData, bool hadRoom)
{
//鍦烘櫙瀵硅薄
if (strData == "#SceneTemplate END#")
@@ -510,9 +510,17 @@
{
modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelDeviceBindData>(fileData);
}
- else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�)
+ else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘浜害璋冭妭)
{
- modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelBackLightInfo>(fileData);
+ modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelBrightnessAdjustInfo>(fileData);
+ }
+ else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鑺傝兘妯″紡)
+ {
+ modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelEnergyModeInfo>(fileData);
+ }
+ else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘鎸囩ず鐏�)
+ {
+ modelData = Newtonsoft.Json.JsonConvert.DeserializeObject<ModelPanelIndicatorLightInfo>(fileData);
}
else if (saveDiv == ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘)
{
@@ -581,7 +589,7 @@
{
fileName = model.FileName;
//澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
- this.ShowMassage(ShowMsgType.Confirm, "澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?", () =>
+ this.ShowMassage(ShowMsgType.Confirm, Language.StringByID(R.MyInternationalizationString.BackUpDataIsEsixtAndPickUp), () =>
{
//灏嗘ā鏉挎暟鎹繚瀛樺埌鍒版寚瀹氱殑鏂囦欢澶逛腑
this.SaveTemplateDataToLocation2(fileName, backupName);
@@ -617,7 +625,7 @@
else
{
//鏈湴澶囦唤淇濆瓨鎴愬姛
- this.ShowMassage(ShowMsgType.Tip, "鏈湴澶囦唤淇濆瓨鎴愬姛");
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.SaveLocalBackDataSuccess));
}
});
}
@@ -661,6 +669,9 @@
TemplateDeviceDataLogic.Current.ReDeviceEpointName(device, Common.LocalDevice.Current.GetDeviceEpointName(device));
}
}
+ #endregion
+
+ #region 鈻� 鑾峰彇妯℃澘瀵硅薄鐩稿叧___________________
/// <summary>
/// 鑾峰彇鏈湴鍏ㄩ儴鐨勬ā鏉垮垪琛ㄧ殑鍩烘湰淇℃伅
@@ -716,12 +727,265 @@
}
/// <summary>
+ /// 鑾峰彇浜戠鍏ㄩ儴鐨勬ā鏉垮垪琛ㄧ殑鍩烘湰淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ public List<CloundModelBaseInfo> GetCloundAllModelList()
+ {
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token
+ };
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ProjectTemplate/GetProTemplateList", false, pra);
+ if (result == null) { return new List<CloundModelBaseInfo>(); }
+
+ var dicData = new Dictionary<string, List<CloundModelBaseInfo>>();
+ var listTime = new List<string>();
+
+ var listCloundData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<CloundModelBaseInfo>>(result);
+ foreach (var data in listCloundData)
+ {
+ //鍙樻洿鏃堕棿鏍煎紡
+ data.CreatedOnUtc = UserCenterLogic.ConvertUtcTimeToLocalTime(data.CreatedOnUtc).ToString("yyyy.MM.dd HH:mm");
+ if (dicData.ContainsKey(data.CreatedOnUtc) == false)
+ {
+ dicData[data.CreatedOnUtc] = new List<CloundModelBaseInfo>();
+ listTime.Add(data.CreatedOnUtc);
+ }
+ dicData[data.CreatedOnUtc].Add(data);
+ }
+
+ //鎸夋椂闂存帓搴�
+ listTime.Sort();
+
+ var listData = new List<CloundModelBaseInfo>();
+ 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";
+ return "ModelData_Local_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
+ }
+
+ #endregion
+
+ #region 鈻� 涓婁紶妯℃澘澶囦唤_______________________
+
+ /// <summary>
+ /// 涓婁紶妯℃澘澶囦唤(鍐呴儴浣跨敤绾跨▼鏉ユ墽琛�,鏈夎浆鍦堢殑鐣岄潰)
+ /// </summary>
+ /// <param name="i_localTemplate">鏈湴妯℃澘淇℃伅</param>
+ /// <param name="i_saveName">澶囦唤鍚嶅瓧</param>
+ public void UpLoadTemplateData(LocalModelBaseInfo i_localTemplate, string i_saveName)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ ProgressBar.Show();
+
+ //鑾峰彇浜戠鐨勬ā鏉垮垪琛�
+ var listTemplate = this.GetCloundAllModelList();
+ foreach (var data in listTemplate)
+ {
+ if (data.TemplateName == i_saveName)
+ {
+ //妯℃澘鍚嶅瓧宸茬粡瀛樺湪
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.TheTemplateNameIsEsixt));
+ ProgressBar.Close();
+ return;
+ }
+ }
+ //杩欓噷淇敼鎺夋ā鏉挎枃浠堕噷闈㈣杞界殑妯℃澘鍚嶇О
+ string templateFile = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, i_localTemplate.FileName);
+ string binFileData = HdlFileLogic.Current.ReadFileTextContent(templateFile);
+ var arryBinFile = binFileData.Split(new string[] { "\r\n" }, StringSplitOptions.RemoveEmptyEntries);
+ //鏇挎崲鐩爣 杩欓噷鏄ā鏉垮熀鏈俊鎭殑json鏁版嵁
+ string strFileData = arryBinFile[1];
+ var templateBaseInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<LocalModelBaseInfo>(strFileData);
+ templateBaseInfo.ModelName = i_saveName;//鏇存敼鎺夊悕瀛�
+ templateBaseInfo.EditorTime = DateTime.Now.ToString("yyyy.MM.dd HH:mm");//鏇存敼鎺夋椂闂�
+ //鏇挎崲瀵硅薄
+ string replaceDta = Newtonsoft.Json.JsonConvert.SerializeObject(templateBaseInfo);
+ binFileData = binFileData.Replace(strFileData, replaceDta);
+
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token,
+ ProTemplateName = i_saveName,
+ ProTemplateDetails = new List<TemplateDetailsInfo>()
+ };
+ var detailsInfo = new TemplateDetailsInfo();
+ detailsInfo.DetailName = "ModelData_Cloud_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".bin";
+ detailsInfo.DetailContent = Encoding.UTF8.GetBytes(binFileData);
+ pra.ProTemplateDetails.Add(detailsInfo);
+
+ //娓呮帀杩欎釜瀛楃涓茬紦瀛�
+ binFileData = null;
+
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ProjectTemplate/AddProTemplate", false, pra);
+ if (result == true)
+ {
+ //涓婁紶妯℃澘鎴愬姛
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UploadTemplateSuccess));
+ }
+ else
+ {
+ //涓婁紶妯℃澘澶辫触
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.UploadTemplateFail));
+ }
+ ProgressBar.Close();
+ });
+ }
+
+ /// <summary>
+ /// 涓婁紶妯℃澘鏂囦欢鐨勪俊鎭�
+ /// </summary>
+ private class TemplateDetailsInfo
+ {
+ /// <summary>
+ /// 鏂囦欢鍚嶅瓧
+ /// </summary>
+ public string DetailName = string.Empty;
+ /// <summary>
+ /// 妯℃澘鍐呭
+ /// </summary>
+ public byte[] DetailContent = null;
+ }
+
+ #endregion
+
+ #region 鈻� 涓嬭浇妯℃澘澶囦唤_______________________
+
+ /// <summary>
+ /// 涓嬭浇妯℃澘澶囦唤(鍐呴儴鏄娇鐢ㄧ嚎绋嬫墽琛�,鏈夌晫闈㈠瀷杩涘害鏉�)
+ /// </summary>
+ /// <param name="i_templateId">鏁版嵁搴撲富閿�</param>
+ /// <param name="i_SuccessAction">涓嬭浇瀹屽叏鎴愬姛涔嬪悗鐨勫洖璋冧簨浠�,鍙傛暟涓轰繚瀛樻ā鏉跨殑鍏ㄨ矾寰�(鍙傛暟null浠ｈ〃澶辫触)</param>
+ public void DownLoadTemplate(string i_templateId, Action<string> i_SuccessAction = null)
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ ProgressFormBar.Current.Start();
+ ProgressFormBar.Current.SetMsg("姝ｅ湪涓嬭浇妯℃澘鏁版嵁");
+ System.Threading.Thread.Sleep(1500);
+
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token,
+ ProTemplateId = i_templateId
+ };
+ var result = UserCenterLogic.GetResponseDataByRequestHttps("ProjectTemplate/GetProTemplateDetailList", false, pra);
+ if (result == null)
+ {
+ //涓嬭浇妯℃澘澶辫触
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DownloadTemplateFail));
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(null);
+ return;
+ }
+ var fileListData = Newtonsoft.Json.JsonConvert.DeserializeObject<List<DownloadTemplateData>>(result);
+ if (fileListData.Count == 0)
+ {
+ //涓嬭浇妯℃澘澶辫触
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.DownloadTemplateFail));
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(null);
+ return;
+ }
+ //瑙ｆ瀽杩欎釜妯℃澘鐨勫悕瀛�
+ var strFileData = this.GetDataFromFileContent(Encoding.UTF8.GetString(fileListData[0].DetailContent), "#START#", "#TemplateData END#");
+ var templateBaseInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<LocalModelBaseInfo>(strFileData);
+
+ //妫�娴嬫湰鍦扮殑妯℃澘鏄惁鏈夊悓鍚嶇殑
+ var listLocal = this.GetLocalAllModelList();
+ string fileName = fileListData[0].DetailName;
+ foreach (var localData in listLocal)
+ {
+ if (localData.ModelName == templateBaseInfo.ModelName)
+ {
+ //鏇挎崲,鐩存帴浣跨敤鏈湴鐨勬ā鏉挎枃浠跺悕瀛�
+ fileName = localData.FileName;
+ break;
+ }
+ }
+
+ //瀛樻垚鏂囦欢
+ string fileFullName = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, fileName);
+ HdlFileLogic.Current.SaveByteToFile(fileFullName, fileListData[0].DetailContent);
+
+ //鑾峰彇鍗囩骇鍥轰欢鏂囦欢
+ var result2 = HdlFirmwareUpdateLogic.DownLoadTemplateDeviceFirmware(fileFullName, "姝ｅ湪鑾峰彇鍗囩骇鍥轰欢鏁版嵁");
+ if (result2 == -1)
+ {
+ this.ShowMassage(ShowMsgType.Tip, "鑾峰彇鍗囩骇鍥轰欢鏁版嵁澶辫触");
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(null);
+ return;
+ }
+ ProgressFormBar.Current.Close();
+ i_SuccessAction?.Invoke(fileFullName);
+ });
+ }
+
+ /// <summary>
+ /// 涓嬭浇妯℃澘
+ /// </summary>
+ private class DownloadTemplateData
+ {
+ /// <summary>
+ /// 妯℃澘鏂囦欢鍚嶅瓧
+ /// </summary>
+ public string DetailName = string.Empty;
+ /// <summary>
+ /// 妯℃澘鏁版嵁
+ /// </summary>
+ public byte[] DetailContent = null;
+ }
+
+ #endregion
+
+ #region 鈻� 鍒犻櫎妯℃澘澶囦唤_______________________
+
+ /// <summary>
+ /// 鍒犻櫎浜戠妯℃澘澶囦唤
+ /// </summary>
+ /// <param name="i_templateId">妯℃澘涓婚敭</param>
+ /// <returns></returns>
+ public bool DeleteTemplateFromDb(string i_templateId)
+ {
+ var pra = new
+ {
+ RequestVersion = Common.CommonPage.RequestVersion,
+ RequestSource = 5,
+ LoginAccessToken = Common.Config.Instance.Token,
+ ProTemplateId = i_templateId
+ };
+ var result = UserCenterLogic.GetResultStatuByRequestHttps("ProjectTemplate/DeleteProTemplate", false, pra);
+ return result;
+ }
+
+ /// <summary>
+ /// 鍒犻櫎鏈湴妯℃澘澶囦唤
+ /// </summary>
+ /// <param name="i_baseInfo">鏈湴妯℃澘鐨勫熀鏈俊鎭�</param>
+ /// <returns></returns>
+ public void DeleteLocalTemplate(LocalModelBaseInfo i_baseInfo)
+ {
+ var fullFile = System.IO.Path.Combine(DirNameResourse.AllResidenceTemplateDirectory, i_baseInfo.FileName);
+ HdlFileLogic.Current.DeleteFile(fullFile);
}
#endregion
@@ -1053,7 +1317,7 @@
}
}
//涓嶇濡備綍,閮介渶瑕佸垯閲嶆柊淇濆瓨鎴愭枃浠�
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
//杩樺師鍙婂彉鏇村満鏅殑鎵ц鐩爣
//this.RecoverAndChangedSceneAdjustTarget(device, targetMac);
}
@@ -1206,12 +1470,12 @@
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);
- }
+ //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>
@@ -1412,12 +1676,13 @@
#region 鈻� 淇濆瓨璁惧缂撳瓨_______________________
/// <summary>
- /// 淇濆瓨璁惧缂撳瓨
+ /// 淇濆瓨璁惧缂撳瓨(鑰冭檻鏈夌殑璁惧鐢ㄧ殑鏄�200绔偣,鎵�浠ヨ繖閲屾渶濂戒笉鐢ㄨ澶囧璞′綔涓哄弬鏁�)
/// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- public void SaveDeviceMemmoryData(CommonDevice device)
+ /// <param name="deviceMac">璁惧mac</param>
+ /// <param name="deviceEpoint">璁惧Epoint</param>
+ public void SaveDeviceMemmoryData(string deviceMac, int deviceEpoint)
{
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(deviceMac, deviceEpoint);
if (this.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == false)
{
return;
@@ -1425,7 +1690,7 @@
//淇濆瓨璺緞
string saveFile = DirNameResourse.LocalTemplateDirectory;
- saveFile = System.IO.Path.Combine(saveFile, device.FilePath);
+ saveFile = System.IO.Path.Combine(saveFile, mainkey);
var listData = this.modelData.dicDeviceTemplateData[mainkey];
if (listData.Count == 0)
@@ -1791,14 +2056,14 @@
}
/// <summary>
- /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�
+ /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�(鑰冭檻鏈夌殑璁惧鐢ㄧ殑鏄�200绔偣,鎵�浠ヨ繖閲屾渶濂戒笉鐢ㄨ澶囧璞′綔涓哄弬鏁�)
/// </summary>
/// <param name="device"></param>
/// <param name="saveEnum"></param>
/// <returns></returns>
- public TemplateDeviceDataCommon GetDeviceModelDataClass(CommonDevice device, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
+ public TemplateDeviceDataCommon GetDeviceModelDataClass(string deviceMac, int deviceEpoint, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
{
- string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(device);
+ string mainkey = Common.LocalDevice.Current.GetDeviceMainKeys(deviceMac, deviceEpoint);
//鍒涘缓瀛樺偍绌洪棿
if (this.modelData.dicDeviceTemplateData.ContainsKey(mainkey) == false)
@@ -1815,8 +2080,8 @@
}
//鏂板缓涓�涓柊鐨勫璞�
newClass.DataSaveDiv = saveEnum;
- newClass.DeviceEpoint = device.DeviceEpoint;
- newClass.DeviceMac = device.DeviceAddr;
+ newClass.DeviceEpoint = deviceEpoint;
+ newClass.DeviceMac = deviceMac;
//榛樿鍒涘缓涓�涓储寮曚綅
newClass.ListReceiveResult.Add(string.Empty);
@@ -1837,36 +2102,7 @@
/// <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();
- });
+ HdlMessageLogic.Current.ShowMassage(msgType, msg, action, buttonText);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
index 65a7576..645568d 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataCommon.cs
@@ -112,6 +112,15 @@
}
/// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public virtual List<string> GetFailMsg()
+ {
+ return new List<string>();
+ }
+
+ /// <summary>
/// 鍙樻洿Mac缂撳瓨(鍦ㄧ綉鍏虫墽琛屽畬鎴愬鍏ヤ箣鍚庢墽琛�)
/// </summary>
public virtual void ChangedMacMemmory()
@@ -223,6 +232,25 @@
}
/// <summary>
+ /// 浜戠妯℃澘鐨勫熀鏈俊鎭�
+ /// </summary>
+ public class CloundModelBaseInfo
+ {
+ /// <summary>
+ /// 妯℃澘鍚嶅瓧
+ /// </summary>
+ public string TemplateName = string.Empty;
+ /// <summary>
+ /// 缂栬緫鏃堕棿 2020.01.04 19:55鏍煎紡
+ /// </summary>
+ public string CreatedOnUtc = string.Empty;
+ /// <summary>
+ /// 涓婚敭
+ /// </summary>
+ public string Id = string.Empty;
+ }
+
+ /// <summary>
/// 妯℃澘浣忓畢鐨勪俊鎭�
/// </summary>
public class TemplateHomeInfo
@@ -269,6 +297,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //鍒囨崲鎵嬫媺鎺у埗澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uChangeHandPullControlFail) };
+ }
}
/// <summary>
@@ -314,6 +351,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆绐楀笜闄愪綅鐐瑰け璐�
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uCommitCurtainLimitFail) };
+ }
}
#endregion
@@ -348,6 +394,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆绌鸿皟妯″紡澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetAcModeFail) };
+ }
}
/// <summary>
@@ -377,6 +432,15 @@
{
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆绌鸿皟鎽嗛澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetAirConditionerSwingFunctionFail) };
}
}
@@ -449,8 +513,13 @@
}
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 (this.ListReceiveResult.Count > 0 && string.IsNullOrEmpty(this.ListReceiveResult[0]) == false)
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", this.DeviceMac }, { "Epoint", this.DeviceEpoint }, { "Cluster_ID", 0 }, { "Command", 5006 } };
+ listCommand[0] = jObject.ToString();
+ }
//鍔熻兘閰嶇疆
listCommand.Add(string.Empty);
@@ -481,6 +550,18 @@
}
/// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //娓呯┖缁戝畾鍒楄〃澶辫触 , 璁惧灞炴�у彉鏇村け璐� , 缁戝畾鐩爣璁剧疆澶辫触
+ return new List<string> {"娓呯┖缁戝畾鍒楄〃澶辫触"
+ ,Language.StringByID(R.MyInternationalizationString.uDeviceAttributeChangedFail)
+ ,Language.StringByID(R.MyInternationalizationString.uSetBindTargetsFail)};
+ }
+
+ /// <summary>
/// 鍙樻洿缁戝畾鐩爣鐨凪ac
/// </summary>
public override void ChangedMacMemmory()
@@ -506,12 +587,8 @@
data.BindMacAddr = dicChangedMac[data.BindMacAddr];
}
}
- var localDevice = Common.LocalDevice.Current.GetDevice(this.DeviceMac, this.DeviceEpoint);
- if (localDevice != null)
- {
- //鍙樻洿缂撳瓨
- TemplateCommonLogic.Current.SaveDeviceMemmoryData(localDevice);
- }
+ //鍙樻洿缂撳瓨
+ TemplateCommonLogic.Current.SaveDeviceMemmoryData(this.DeviceMac, this.DeviceEpoint);
}
}
@@ -547,6 +624,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆浼犳劅鍣ㄩ厤缃俊鎭け璐�
+ return new List<string> {Language.StringByID(R.MyInternationalizationString.uSetPirSensorSettionFail)};
+ }
}
#endregion
@@ -581,21 +667,108 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�5绉�
return 5;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆闇囧姩鍙嶉閰嶇疆淇℃伅澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetVibrationFeedbackSettionFail) };
+ }
}
/// <summary>
- /// 闈㈡澘鑳屽厜鐏ā鏉挎暟鎹畾涔�
+ /// 闈㈡澘浜害璋冭妭妯℃澘鏁版嵁瀹氫箟
/// </summary>
- public class ModelPanelBackLightInfo : TemplateDeviceDataCommon
+ public class ModelPanelBrightnessAdjustInfo : TemplateDeviceDataCommon
{
/// <summary>
- /// 浜害璋冭妭鐨勪俊鎭�
+ /// 鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��,鎴栬�� 1-6骞叉帴鐐圭殑鑳屽厜鐏�)
/// </summary>
- public ModelPanelSwitchLevelInfo linghtLevelInfo = new ModelPanelSwitchLevelInfo();
+ public int panelDirectionsLevel = -1;
+ /// <summary>
+ /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��,鎴栬�� 绗竷骞叉帴鐐圭殑鑳屽厜鐏�)
+ /// </summary>
+ public int panelBacklightLevel = -1;
+
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetSendGatewayValue()
+ {
+ //浜害璋冭妭
+ var command1 = HdlDevicePanelLogic.Current.GetPanelLevelCommadText(DeviceMac, panelDirectionsLevel, panelBacklightLevel);
+ return new List<string>() { command1 };
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
+ /// </summary>
+ /// <returns></returns>
+ public override int GetSendTime()
+ {
+ //鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
+ return 3;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆浜害璋冭妭澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetLightRegulationFail) };
+ }
+ }
+
+ /// <summary>
+ /// 闈㈡澘鑺傝兘妯″紡妯℃澘鏁版嵁瀹氫箟
+ /// </summary>
+ public class ModelPanelEnergyModeInfo : TemplateDeviceDataCommon
+ {
/// <summary>
/// 鑺傝兘妯″紡
/// </summary>
public ZigBee.Device.Panel.PanelSaveEnergyModeInfo energyModeInfo = new ZigBee.Device.Panel.PanelSaveEnergyModeInfo();
+ /// <summary>
+ /// 鑾峰彇鏇存敼璁惧閰嶇疆鐨勫懡浠ゅ瓧绗�
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetSendGatewayValue()
+ {
+ //鑺傝兘妯″紡
+ var command1 = HdlDevicePanelLogic.Current.GetDeviceEnergyConservationModeCommandText(DeviceMac, energyModeInfo.enable, energyModeInfo.time, energyModeInfo.level);
+
+ return new List<string>() { command1 };
+ }
+
+ /// <summary>
+ /// 鑾峰彇鍙戦�佸懡浠ゅぇ姒傞渶瑕佺殑鏃堕棿(绉�)
+ /// </summary>
+ /// <returns></returns>
+ public override int GetSendTime()
+ {
+ //鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
+ return 3;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //鑺傝兘妯″紡閰嶇疆澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetEnergyConservationFail) };
+ }
+ }
+
+ /// <summary>
+ /// 闈㈡澘鎸囩ず鐏ā鏉挎暟鎹畾涔�(涔熷彨鑳屽厜鐏�)
+ /// </summary>
+ public class ModelPanelIndicatorLightInfo : TemplateDeviceDataCommon
+ {
/// <summary>
/// 鎸夐敭鐨勯鑹叉暟鎹�
/// </summary>
@@ -610,15 +783,10 @@
/// <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);
+ var command1 = HdlDevicePanelLogic.Current.GetPanelColorCommandText(DeviceMac, keyColorData, KeyNum);
- return new List<string>() { command1, command2, command3 };
+ return new List<string>() { command1 };
}
/// <summary>
@@ -628,24 +796,17 @@
public override int GetSendTime()
{
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�8绉�
- return 8;
+ return 3;
}
- }
-
- /// <summary>
- /// 鎸夐敭鎸囩ず鐏潰鏉垮紑鍏充寒搴﹂厤缃洖澶�
- /// </summary>
- public class ModelPanelSwitchLevelInfo
- {
/// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
/// </summary>
- public int panelDirectionsLevel = -1;
-
- /// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
- /// </summary>
- public int panelBacklightLevel = -1;
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁剧疆鎸夐敭闈㈡澘鎸囩ず鐏鑹插け璐�
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uSetPanelPilolightSettionFail) };
+ }
}
#endregion
@@ -680,6 +841,15 @@
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�3绉�
return 3;
}
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁惧绔偣鍚嶇О淇敼澶辫触
+ return new List<string> { "璁惧绔偣鍚嶇О淇敼澶辫触" };
+ }
}
/// <summary>
@@ -709,6 +879,15 @@
{
//鎵ц杩欎釜鍛戒护澶х害闇�瑕�3绉�
return 3;
+ }
+ /// <summary>
+ /// 鑾峰彇澶辫触鏃剁殑Msg(log鏄剧ず浣跨敤)
+ /// </summary>
+ /// <returns></returns>
+ public override List<string> GetFailMsg()
+ {
+ //璁惧鍚嶇О淇敼澶辫触
+ return new List<string> { Language.StringByID(R.MyInternationalizationString.uDeviceReNameFail) };
}
}
@@ -759,24 +938,17 @@
/// </summary>
A璁惧缁戝畾鍒楄〃 = 14,
/// <summary>
- /// 瀵硅薄绫�:ModelPanelBackLightInfo
+ /// 瀵硅薄绫�:ModelPanelBrightnessAdjustInfo
/// </summary>
- A闈㈡澘鑳屽厜鐏� = 15,
+ A闈㈡澘浜害璋冭妭 = 15,
/// <summary>
- /// ModelAutomaticTimingOffInfo
+ /// 瀵硅薄绫�:ModelPanelEnergyModeInfo
/// </summary>
- A瀹氭椂鑷姩鍏抽棴 = 16,
- }
-
- /// <summary>
- /// 鍙戦�佹ā鏉挎暟鎹殑鍖哄垎
- /// </summary>
- public enum ModelDataSendEnum
- {
- A鏈畾涔� = -1,
- A绉佹湁灞炴�� = 1,
- A绉佹湁鍗忚 = 2,
- A閫忎紶鏁版嵁 = 3
+ A闈㈡澘鑺傝兘妯″紡 = 16,
+ /// <summary>
+ /// 涔熷彨鑳屽厜鐏� 瀵硅薄绫�:ModelPanelIndicatorLightInfo
+ /// </summary>
+ A闈㈡澘鎸囩ず鐏� = 17
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs
new file mode 100755
index 0000000..3f8d140
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDataFormLogic.cs
@@ -0,0 +1,127 @@
+锘縰sing Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.TemplateData
+{
+ /// <summary>
+ /// 妯℃澘鏁版嵁鐨勭晫闈㈤�昏緫
+ /// </summary>
+ public class TemplateDataFormLogic
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 妯℃澘鏁版嵁鐨勭晫闈㈤�昏緫
+ /// </summary>
+ private static TemplateDataFormLogic m_Current = null;
+ /// <summary>
+ /// 妯℃澘鏁版嵁鐨勭晫闈㈤�昏緫
+ /// </summary>
+ public static TemplateDataFormLogic Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ m_Current = new TemplateDataFormLogic();
+ }
+ return m_Current;
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 鏄剧ず妯℃澘閫夋嫨鑿滃崟___________________
+
+ /// <summary>
+ /// 鏄剧ず搴曢儴妯℃澘閫夋嫨鑿滃崟
+ /// </summary>
+ /// <param name="nowSelectFile">褰撳墠閫夋嫨鐨勬ā鏉跨殑鏂囦欢鍚嶅瓧</param>
+ /// <param name="finishEvent">缁撴潫閫夋嫨鐨勪簨浠�,绗竴涓弬鏁版槸閫夋嫨鐨勬ā鏉跨殑鍚嶅瓧,绗簩涓弬鏁版槸閫夋嫨鐨勬ā鏉跨殑鏂囦欢鍚嶅瓧</param>
+ public void ShowBottomSelectTemplateForm(string nowSelectFile, Action<string, string> finishEvent)
+ {
+ //鑾峰彇鏈湴鐨勬ā鏉�
+ var listLocal = TemplateCommonLogic.Current.GetLocalAllModelList();
+ //鑾峰彇浜戠鐨勬ā鏉�
+ var listClound = TemplateCommonLogic.Current.GetCloundAllModelList();
+ if (listLocal.Count == 0 && listClound.Count == 0)
+ {
+ //妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬ā鏉挎暟鎹�
+ HdlMessageLogic.Current.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.NotHadTemplateDataToSelect));
+ return;
+ }
+ var listEsixtName = new HashSet<string>();
+
+ var listText1 = new List<string>();
+ var listText2 = new List<string>();
+ int defultIndex = -1;
+ for (int i = 0; i < listLocal.Count; i++)
+ {
+ //ModelData_Local_yyyyMMdd_HHmmss.bin
+ string[] strArry = listLocal[i].FileName.Split(new string[] { "_" }, StringSplitOptions.RemoveEmptyEntries);
+ if (strArry.Length != 4) { continue; }
+
+ listText1.Add(listLocal[i].ModelName);
+
+ string strTime = strArry[2].Substring(0, 4) + ".";
+ strTime += strArry[2].Substring(4, 2) + ".";
+ strTime += strArry[2].Substring(6, 2) + " ";
+ strTime += strArry[3].Substring(0, 2) + ":";
+ strTime += strArry[3].Substring(2, 2);
+
+ listText2.Add(strTime);
+ if (nowSelectFile == listLocal[i].FileName)
+ {
+ defultIndex = i;
+ }
+ //宸茬粡瀛樺湪浜嗙殑妯℃澘鍚嶅瓧
+ listEsixtName.Add(listLocal[i].ModelName);
+ }
+ for (int i = 0; i < listClound.Count; i++)
+ {
+ //濡傛灉鏈湴宸茬粡瀛樺湪浜嗚繖涓ā鏉�,鍒欏凡鏈湴鐨勪负鍑�
+ if (listEsixtName.Contains(listClound[i].TemplateName) == true)
+ {
+ continue;
+ }
+ listText1.Add(listClound[i].TemplateName);
+ listText2.Add(listClound[i].CreatedOnUtc);
+ }
+
+ var selectForm = new BottomItemSelectForm();
+ selectForm.SelectRowCanCancel = false;
+ selectForm.AddForm(Language.StringByID(R.MyInternationalizationString.SelectTemplate), listText1, listText2, defultIndex);
+ selectForm.FinishSelectEvent += (select) =>
+ {
+ //宸查�夋ā鐗堬細鍗楁矙閲戣寕搴淿鎴峰瀷A
+ if (select >= listLocal.Count)
+ {
+ //濡傛灉閫夋嫨鐨勬槸浜戠妯℃澘鐨勮瘽
+ int index = select - listLocal.Count;
+ //闇�瑕佸幓涓嬭浇杩欎釜妯℃澘
+ TemplateCommonLogic.Current.DownLoadTemplate(listClound[index].Id, (fullName) =>
+ {
+ if (fullName != null)
+ {
+ string fileName = fullName.Substring(DirNameResourse.AllResidenceTemplateDirectory.Length + 1);
+ //璋冪敤鍥炶皟鍑芥暟
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ finishEvent?.Invoke(listText1[select], fileName);
+ });
+ }
+ });
+ }
+ else
+ {
+ //璋冪敤鍥炶皟鍑芥暟
+ finishEvent?.Invoke(listText1[select], listLocal[select].FileName);
+ }
+ };
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
index 94fb484..c88369a 100755
--- a/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
+++ b/ZigbeeApp/Shared/Phone/TemplateData/TemplateDeviceDataLogic.cs
@@ -45,14 +45,14 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelCurtainHandPullControl();
- var memoryData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
+ var memoryData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
memoryData.Statu = bolStatu;
memoryData.ListSendTopic[0] = "SetWritableValue";
memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
memoryData.ListReceiveResult[0] = receiveResult;
//淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
}
/// <summary>
@@ -64,7 +64,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelCurtainHandPullControl();
- var memoryData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
+ var memoryData = (ModelCurtainHandPullControl)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绐楀笜鎵嬫媺鎺у埗, classData);
return memoryData.Statu;
}
@@ -84,14 +84,14 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelCurtainDirectionAndLimite();
- var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
+ var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
memoryData.Direction = isDirectionReversed;
memoryData.ListSendTopic[0] = "SetWritableValue";
memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
memoryData.ListReceiveResult[0] = receiveResult;
//淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return new CommonDevice.SetWritableValueResponAllData { setWritableValueResponData = new CommonDevice.SetWritableValueResponData { Status = 0 } };
}
@@ -109,11 +109,11 @@
/// <param name="curtainLength"></param>
/// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
/// <returns></returns>
- public bool SetCurtainLimitPoint(CommonDevice rollershade,int upLimit, int downLimit, int curtainLength, string receiveResult)
+ 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);
+ var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade.DeviceAddr, rollershade.DeviceEpoint, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
memoryData.curtainLength = curtainLength;
memoryData.downLimit = downLimit;
memoryData.upLimit = upLimit;
@@ -121,6 +121,9 @@
memoryData.ListSendTopic[0] = "SetWritableValue";
memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
memoryData.ListReceiveResult[0] = receiveResult;
+
+ //淇濆瓨鏁版嵁
+ this.SaveDeviceMemmoryData(rollershade.DeviceAddr, rollershade.DeviceEpoint);
return true;
}
@@ -134,7 +137,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelCurtainDirectionAndLimite();
- var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
+ var memoryData = (ModelCurtainDirectionAndLimite)this.GetDeviceModelDataClass(rollershade.DeviceAddr, rollershade.DeviceEpoint, ModelDeviceSaveEnum.A绐楀笜鏂瑰悜鍙婇檺浣�, classData);
return memoryData;
}
@@ -153,14 +156,14 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelAcModeSupport();
- var memoryData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
+ var memoryData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
memoryData.data = data;
memoryData.ListSendTopic[0] = "SetWritableValue";
memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
memoryData.ListReceiveResult[0] = receiveResult;
//淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
}
/// <summary>
@@ -172,7 +175,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelAcModeSupport();
- var memoryData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
+ var memoryData = (ModelAcModeSupport)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绌鸿皟鑷畾涔夋ā寮�, classData);
return memoryData.data;
}
@@ -191,14 +194,14 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelAcSwingModeSupport();
- var memoryData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
+ var memoryData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
memoryData.data = data;
memoryData.ListSendTopic[0] = "SetWritableValue";
memoryData.ListReceiveTopic[0] = "SetWritableValue_Respon";
memoryData.ListReceiveResult[0] = receiveResult;
//淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
}
/// <summary>
@@ -210,7 +213,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelAcSwingModeSupport();
- var memoryData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
+ var memoryData = (ModelAcSwingModeSupport)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绌鸿皟鎽嗛鍔熻兘, classData);
return memoryData.data;
}
@@ -228,7 +231,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
+ var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
return memoryData.BindList;
}
@@ -244,7 +247,7 @@
var device = Common.LocalDevice.Current.GetDevice(addBindData.DeviceAddr, addBindData.Epoint);
//鑾峰彇瀵硅薄
var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
+ var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
//娓呯┖缁戝畾琛ㄧ殑杩斿洖鍊�
string clearResult = "{"
@@ -326,7 +329,7 @@
}
}
//淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return reData;
}
@@ -341,7 +344,7 @@
var device = Common.LocalDevice.Current.GetDevice(delDeviceBindData.DeviceAddr, delDeviceBindData.Epoint);
//鑾峰彇瀵硅薄
var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
+ var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
//杩斿洖鍊�
var reData = new BindObj.DelDeviceBindResponseAllData();
@@ -385,7 +388,7 @@
removeData.Result = 0;
}
//淇濆瓨鏁版嵁
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return reData;
}
@@ -409,7 +412,7 @@
}
}
}
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return new BindObj.ClearBindInfoResponseAllData
{
@@ -429,7 +432,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
+ var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
memoryData.keyMode = value;
memoryData.keyModeClusterID = clusterID;
@@ -451,7 +454,7 @@
memoryData.ListReceiveTopic[1] = "SetWritableValue_Respon";
memoryData.ListReceiveResult[1] = receiveResult;
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return new CommonDevice.SetWritableValueResponAllData
{
@@ -467,7 +470,7 @@
public Panel.PanelConfigureInfoResponAllData ReadPanelConfigureKeyModel(CommonDevice device)
{
var classData = new ModelDeviceBindData();
- var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
+ var memoryData = (ModelDeviceBindData)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧缁戝畾鍒楄〃, classData);
var data = new Panel.PanelConfigureInfoResponAllData();
data.deviceStatusReportData = new CommonDevice.DeviceStatusReportData { CluterID = memoryData.keyModeClusterID };
@@ -489,11 +492,11 @@
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
- public IASZone.ParamatesInfo GetPirSensorLightSettion(CommonDevice device)
+ public IASZone.ParamatesInfo GetPirSensorLightSettion(string deviceMac, int deviceEpoint)
{
//鑾峰彇瀵硅薄
- var classData = new ModelPirSensorSettion();
- var memoryData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.APir閰嶇疆, classData);
+ var classData = new ModelPirSensorSettion();
+ var memoryData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.APir閰嶇疆, classData);
var localData = new IASZone.ParamatesInfo();
localData.configureParamates = new IASZone.ConfigureParamates();
@@ -518,11 +521,11 @@
/// <param name="configureParamates"></param>
/// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
/// <returns></returns>
- public IASZone.ResponseAllData SetPirSensorLightSettion(CommonDevice device, IASZone.ConfigureParamates configureParamates, string receiveResult)
+ public IASZone.ResponseAllData SetPirSensorLightSettion(string deviceMac, int deviceEpoint, IASZone.ConfigureParamates configureParamates, string receiveResult)
{
//鑾峰彇瀵硅薄
var classData = new ModelPirSensorSettion();
- var memoryData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.APir閰嶇疆, classData);
+ var memoryData = (ModelPirSensorSettion)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.APir閰嶇疆, classData);
memoryData.pirConfigure = configureParamates;
@@ -530,7 +533,7 @@
memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
memoryData.ListReceiveResult[0] = receiveResult;
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(deviceMac, deviceEpoint);
return new CommonDevice.ResponseAllData { responseData = new CommonDevice.ResponseData { status = 0 } };
}
@@ -544,11 +547,11 @@
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
- public UserCenter.HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(CommonDevice device)
+ public UserCenter.HdlDevicePanelLogic.PanelVibrationInfo GetPanelVibrationInfo(string deviceMac, int deviceEpoint)
{
//鑾峰彇瀵硅薄
var classData = new ModelPanelVibrationInfo();
- var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
+ var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
var data = new UserCenter.HdlDevicePanelLogic.PanelVibrationInfo();
data.A闇囧姩浣胯兘 = memoryData.vibrationInfo.A闇囧姩浣胯兘;
@@ -565,18 +568,18 @@
/// <param name="datainfo"></param>
/// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
/// <returns></returns>
- public bool SetPanelVibrationInfo(CommonDevice device, UserCenter.HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)
+ public bool SetPanelVibrationInfo(string deviceMac, int deviceEpoint, UserCenter.HdlDevicePanelLogic.PanelVibrationInfo datainfo, string receiveResult)
{
//鑾峰彇瀵硅薄
var classData = new ModelPanelVibrationInfo();
- var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
+ var memoryData = (ModelPanelVibrationInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘闇囧姩鍔熻兘, classData);
memoryData.vibrationInfo = datainfo;
memoryData.ListSendTopic[0] = "ClientDataPassthrough";
memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
memoryData.ListReceiveResult[0] = receiveResult;
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(deviceMac, deviceEpoint);
return true;
}
@@ -594,7 +597,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelDeviceMacNameInfo();
- var memoryData = (ModelDeviceMacNameInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A璁惧鍚嶇О, classData);
+ var memoryData = (ModelDeviceMacNameInfo)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A璁惧鍚嶇О, classData);
memoryData.deviceMacName = macName;
//璁惧杩斿洖鐨勭粨鏋�
@@ -610,7 +613,7 @@
memoryData.ListReceiveTopic[0] = "MacRename_Respon";
memoryData.ListReceiveResult[0] = receiveResult;
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return new CommonDevice.RenameDeviceMacNameAllData
{
@@ -632,7 +635,7 @@
{
//鑾峰彇瀵硅薄
var classData = new ModelDeviceEpointNameInfo();
- var memoryData = (ModelDeviceEpointNameInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A绔偣鍚嶇О, classData);
+ var memoryData = (ModelDeviceEpointNameInfo)this.GetDeviceModelDataClass(device.DeviceAddr, device.DeviceEpoint, ModelDeviceSaveEnum.A绔偣鍚嶇О, classData);
memoryData.deviceEpointName = deviceName;
//璁惧杩斿洖鐨勭粨鏋�
@@ -650,7 +653,7 @@
memoryData.ListReceiveTopic[0] = "DeviceRenameRespon";
memoryData.ListReceiveResult[0] = receiveResult;
- this.SaveDeviceMemmoryData(device);
+ this.SaveDeviceMemmoryData(device.DeviceAddr, device.DeviceEpoint);
return new CommonDevice.DeviceRenameAllData
{
@@ -671,15 +674,15 @@
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
- public Panel.PanelSwitchLevelInfo GetDeviceLightSettion(CommonDevice device)
+ public Panel.PanelSwitchLevelInfo GetDeviceLightSettion(string deviceMac, int deviceEpoint)
{
//鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
+ var classData = new ModelPanelBrightnessAdjustInfo();
+ var memoryData = (ModelPanelBrightnessAdjustInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, 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;
+ data.panelBacklightLevel = memoryData.panelBacklightLevel == -1 ? 0 : memoryData.panelBacklightLevel;
+ data.panelDirectionsLevel = memoryData.panelDirectionsLevel == -1 ? 0 : memoryData.panelDirectionsLevel;
return data;
}
@@ -691,30 +694,19 @@
/// <param name="backlightLevel">0-100(杩欎釜鏄偣鍑诲墠鐨勫��)</param>
/// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
/// <returns></returns>
- public bool SetDeviceLightSettion(CommonDevice device, int directionsLevel, int backlightLevel, string receiveResult)
+ public bool SetDeviceLightSettion(string deviceMac, int deviceEpoint, 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);
+ var classData = new ModelPanelBrightnessAdjustInfo();
+ var memoryData = (ModelPanelBrightnessAdjustInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘浜害璋冭妭, classData);
+ memoryData.panelBacklightLevel = backlightLevel;
+ memoryData.panelDirectionsLevel = directionsLevel;
- 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);
+ this.SaveDeviceMemmoryData(deviceMac, deviceEpoint);
return true;
}
@@ -724,11 +716,11 @@
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
- public Panel.PanelSaveEnergyModeInfo GetDeviceEnergyConservationMode(CommonDevice device)
+ public Panel.PanelSaveEnergyModeInfo GetDeviceEnergyConservationMode(string deviceMac, int deviceEpoint)
{
//鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
+ var classData = new ModelPanelEnergyModeInfo();
+ var memoryData = (ModelPanelEnergyModeInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘鑺傝兘妯″紡, classData);
var data = new Panel.PanelSaveEnergyModeInfo();
data.enable = memoryData.energyModeInfo.enable;
@@ -746,32 +738,20 @@
/// <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)
+ public bool SetDeviceEnergyConservationMode(string deviceMac, int deviceEpoint, bool modeEnable, int modeTime, int level, string receiveResult)
{
//鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
+ var classData = new ModelPanelEnergyModeInfo();
+ var memoryData = (ModelPanelEnergyModeInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, 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.ListSendTopic[0] = "ClientDataPassthrough";
+ memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
+ memoryData.ListReceiveResult[0] = receiveResult;
- 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);
+ this.SaveDeviceMemmoryData(deviceMac, deviceEpoint);
return true;
}
@@ -782,11 +762,11 @@
/// <param name="device"></param>
/// <param name="keyNum"></param>
/// <returns></returns>
- public Panel.KeyColorDataResponseAllData GetPanelColorInfo(CommonDevice device, Panel.KeyNum keyNum)
+ public Panel.KeyColorDataResponseAllData GetPanelColorInfo(string deviceMac, int deviceEpoint, Panel.KeyNum keyNum)
{
//鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
+ var classData = new ModelPanelIndicatorLightInfo();
+ var memoryData = (ModelPanelIndicatorLightInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘鎸囩ず鐏�, classData);
var data = new Panel.KeyColorDataResponseAllData();
data.keyColorData = new Panel.KeyColorData();
@@ -809,11 +789,11 @@
/// <param name="keyNumStatus"></param>
/// <param name="receiveResult">璁惧杩斿洖鐨勭粨鏋�</param>
/// <returns></returns>
- public CommonDevice.ResponseAllData SetPanelColorInfo(CommonDevice device, Panel.KeyColorData keyColorData, Panel.KeyNumStatus keyNumStatus, string receiveResult)
+ public CommonDevice.ResponseAllData SetPanelColorInfo(string deviceMac, int deviceEpoint, Panel.KeyColorData keyColorData, Panel.KeyNumStatus keyNumStatus, string receiveResult)
{
//鑾峰彇瀵硅薄
- var classData = new ModelPanelBackLightInfo();
- var memoryData = (ModelPanelBackLightInfo)this.GetDeviceModelDataClass(device, ModelDeviceSaveEnum.A闈㈡澘鑳屽厜鐏�, classData);
+ var classData = new ModelPanelIndicatorLightInfo();
+ var memoryData = (ModelPanelIndicatorLightInfo)this.GetDeviceModelDataClass(deviceMac, deviceEpoint, ModelDeviceSaveEnum.A闈㈡澘鎸囩ず鐏�, classData);
memoryData.keyColorData.keyNum = keyColorData.keyNum;
memoryData.keyColorData.OpenColorB = keyColorData.OpenColorB;
@@ -840,23 +820,11 @@
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.ListSendTopic[0] = "ClientDataPassthrough";
+ memoryData.ListReceiveTopic[0] = "ZbDataPassthrough";
+ memoryData.ListReceiveResult[0] = receiveResult;
- 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);
+ this.SaveDeviceMemmoryData(deviceMac, deviceEpoint);
return new CommonDevice.ResponseAllData
{
@@ -870,13 +838,14 @@
#region 鈻� 淇濆瓨璁惧缂撳瓨_______________________
/// <summary>
- /// 淇濆瓨璁惧缂撳瓨
+ /// 淇濆瓨璁惧缂撳瓨(鑰冭檻鏈夌殑璁惧鐢ㄧ殑鏄�200绔偣,鎵�浠ヨ繖閲屾渶濂戒笉鐢ㄨ澶囧璞′綔涓哄弬鏁�)
/// </summary>
- /// <param name="device">璁惧瀵硅薄</param>
- public void SaveDeviceMemmoryData(CommonDevice device)
+ /// <param name="deviceMac"></param>
+ /// <param name="deviceEpoint"></param>
+ public void SaveDeviceMemmoryData(string deviceMac, int deviceEpoint)
{
//浠ｇ爜绉诲姩鍒板埆鐨勬枃浠朵腑浜�
- TemplateCommonLogic.Current.SaveDeviceMemmoryData(device);
+ TemplateCommonLogic.Current.SaveDeviceMemmoryData(deviceMac, deviceEpoint);
}
#endregion
@@ -884,15 +853,16 @@
#region 鈻� 涓�鑸柟娉昣__________________________
/// <summary>
- /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�
+ /// 鑾峰彇璁惧淇濆瓨鐨勬ā鏉垮璞�(鑰冭檻鏈夌殑璁惧鐢ㄧ殑鏄�200绔偣,鎵�浠ヨ繖閲屾渶濂戒笉鐢ㄨ澶囧璞′綔涓哄弬鏁�)
/// </summary>
- /// <param name="device"></param>
+ /// <param name="deviceMac"></param>
+ /// <param name="deviceEpoint"></param>
/// <param name="saveEnum"></param>
/// <returns></returns>
- private TemplateDeviceDataCommon GetDeviceModelDataClass(CommonDevice device, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
+ private TemplateDeviceDataCommon GetDeviceModelDataClass(string deviceMac, int deviceEpoint, ModelDeviceSaveEnum saveEnum, TemplateDeviceDataCommon newClass)
{
//浠ｇ爜绉诲姩鍒板埆鐨勬枃浠朵腑浜�
- return TemplateCommonLogic.Current.GetDeviceModelDataClass(device, saveEnum, newClass);
+ return TemplateCommonLogic.Current.GetDeviceModelDataClass(deviceMac, deviceEpoint, saveEnum, newClass);
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs
index d1005fa..6801dc8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Abount/SLAForm.cs
@@ -27,7 +27,7 @@
bodyFrameLayout.AddChidren(btnControl);
//鍔犺浇缃戝潃
- btnControl.LoadRequest("https://www.baidu.com");
+ btnControl.LoadRequest("https://developer.hdlcontrol.com/HDLEvoyoPrivacyPolicy.html");
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
index 61ff854..c52b551 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Common/UserCenterEnumCommon.cs
@@ -309,31 +309,4 @@
/// </summary>
Admin = 2
}
-
- /// <summary>
- /// 淇℃伅鏄剧ず鐨勭被鍨�
- /// </summary>
- public enum ShowMsgType
- {
- /// <summary>
- /// 鏅�氭彁绀虹被鍨�
- /// </summary>
- Normal = 1,
- /// <summary>
- /// 纭绫诲瀷
- /// </summary>
- Confirm = 2,
- /// <summary>
- /// 閿欒绫诲瀷
- /// </summary>
- Error = 3,
- /// <summary>
- /// Tip绫诲瀷
- /// </summary>
- Tip = 4,
- /// <summary>
- /// 鎻愰啋绫诲瀷
- /// </summary>
- Remind = 5
- }
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
old mode 100644
new mode 100755
index 72ed6e8..58b1f8c
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/BaseCommonControl/Base/TextInputBase.cs
@@ -45,6 +45,10 @@
/// </summary>
public Action FinishInputEvent = null;
/// <summary>
+ /// 鍊兼敼鍙樹簨浠�(鍙桵axByte灞炴�ч檺鍒�)
+ /// </summary>
+ public Action<string> TextChangedEvent = null;
+ /// <summary>
/// 鎸囧畾璇ヨ緭鍏ユ鏄惁涓轰笉鍙渷鐣�(榛樿涓篺alse)
/// </summary>
public bool MustInput = false;
@@ -258,12 +262,13 @@
private void TxtCode_TextChangedEvent(object sender, string value)
{
var byteData = Encoding.UTF8.GetBytes(value);
+ var newValue = value;
//濡傛灉杈撳叆鐨勫��,宸茬粡澶т簬鎸囧畾鐨刡yte鏁�,鍒欐埅鍙�
if (byteData.Length > this.m_MaxByte)
{
//鎴彇鎸囧畾鐨刡yte瀛楄妭
- var newValue = Encoding.UTF8.GetString(byteData, 0, this.m_MaxByte);
+ newValue = Encoding.UTF8.GetString(byteData, 0, this.m_MaxByte);
//鏈�鍚庝竴浣嶄笉瑕�,鍥犱负鎴彇鐨勬渶鍚庝竴浣嶅彲鑳芥槸涔辩爜
newValue = newValue.Substring(0, newValue.Length - 1);
//鎷兼帴涓婂畠鐨勪笅涓�浣�,鐒跺悗妫�娴�
@@ -274,11 +279,12 @@
newValue = checkValue;
}
this.Text = newValue;
-#if Android
//灏嗗厜鏍囪嚦浜庢渶鍚�
+#if Android
this.SetSelectionEnd();
#endif
}
+ this.TextChangedEvent?.Invoke(newValue);
}
#endregion
@@ -355,6 +361,7 @@
public override void RemoveFromParent()
{
this.FinishInputEvent = null;
+ this.TextChangedEvent = null;
if (this.Parent != null)
{
base.RemoveFromParent();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
index 62f0a2b..76d3099 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/InformationEditorControl.cs
@@ -34,12 +34,14 @@
/// <param name="bodyFrameLayout">鐖舵帶浠�</param>
/// <param name="title">鏍囬鏂囨湰</param>
/// <param name="Height">钃濇箹UI閲岄潰瀹冪殑楂樺害</param>
+ /// <param name="real">鏄惁璁＄畻Height鐨勭湡瀹炲��</param>
/// <returns>淇℃伅瀹瑰櫒鎺т欢</returns>
- public FrameListControl InitControl(FrameLayout bodyFrameLayout, string title, int Height)
+ public FrameListControl InitControl(FrameLayout bodyFrameLayout, string title, int Height, bool real = true)
{
+ if (real == true) { Height = Application.GetRealHeight(Height); }
//鏄庣粏鍒楄〃鐨勬甯冿紝鐧借壊鑳屾櫙
this.detailBackFrame = new FrameLayout();
- detailBackFrame.Height = Application.GetRealHeight(Height);
+ detailBackFrame.Height = Height;
detailBackFrame.BackgroundColor = UserCenterColor.Current.White;
detailBackFrame.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
detailBackFrame.Gravity = Gravity.BottomCenter;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
index e887519..1ee238d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/CompoundControls/VerificationCodeControl.cs
@@ -131,6 +131,9 @@
// }
//}
txtCode.Parent.BorderColor = UserCenterColor.Current.TextFrameSelectColor;
+#if Android
+ txtCode.SetSelectionEnd();
+#endif
}
else
{
@@ -155,6 +158,10 @@
if (textValue.Length == this.CodeLenth)
{
dicCodeControls[this.CodeLenth - 1].Foucs = true;
+#if Android
+ //鍏夋爣鑷充簬鏈�鍚�
+ dicCodeControls[this.CodeLenth - 1].SetSelectionEnd();
+#endif
for (int i = 0; i < this.CodeLenth; i++)
{
//鍏堢Щ闄や簨浠�
@@ -183,9 +190,17 @@
if (dicCodeControls.ContainsKey(index + 1) == true)
{
dicCodeControls[index + 1].Foucs = true;
+#if Android
+ //鍏夋爣鑷充簬鏈�鍚�
+ dicCodeControls[index + 1].SetSelectionEnd();
+#endif
}
else
{
+#if Android
+ //鍏夋爣鑷充簬鏈�鍚�
+ txtCode.SetSelectionEnd();
+#endif
//鏈�鍚庝竴浣嶈緭鍏ュ畬鎴�,鏍￠獙楠岃瘉鐮�
string code = string.Empty;
for (int i = 0; i < this.CodeLenth; i++)
@@ -212,6 +227,10 @@
if (dicCodeControls.ContainsKey(index - 1) == true)
{
dicCodeControls[index - 1].Foucs = true;
+#if Android
+ //鍏夋爣鑷充簬鏈�鍚�
+ dicCodeControls[index - 1].SetSelectionEnd();
+#endif
}
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
index af99766..a0dcd82 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/MessageControls/ShowMsgControl.cs
@@ -42,6 +42,10 @@
/// 鎻愮ず鎺т欢
/// </summary>
private Tip myTip = null;
+ /// <summary>
+ /// 绛夊緟鏃堕棿
+ /// </summary>
+ private int WaitTime = -1;
#endregion
@@ -54,13 +58,15 @@
/// <param name="i_msg">淇℃伅</param>
/// <param name="i_buttonOkText">纭鎸夐挳鐨勬枃鏈�</param>
/// <param name="i_buttonCancelText">鍙栨秷鎸夐挳鐨勬枃鏈�</param>
- public ShowMsgControl(ShowMsgType i_msgType, string i_msg, string i_buttonOkText = null, string i_buttonCancelText = null)
+ /// <param name="i_waitTime">绛夊緟鏃堕棿,鍗曚綅涓虹,璁剧疆纭鎸夐挳鍦ㄥ闀挎椂闂村悗鎵嶈兘澶熺偣鍑�</param>
+ public ShowMsgControl(ShowMsgType i_msgType, string i_msg, string i_buttonOkText = null, string i_buttonCancelText = null, int i_waitTime = -1)
{
//纭鎸夐挳鏂囨湰
this.buttonOkText = i_buttonOkText == null ? Language.StringByID(R.MyInternationalizationString.OkMsg) : i_buttonOkText;
this.buttonCancelText = i_buttonCancelText == null ? Language.StringByID(R.MyInternationalizationString.uCancel) : i_buttonCancelText;
this.msgType = i_msgType;
this.msgText = i_msg;
+ this.WaitTime = i_waitTime;
if (i_msgType == ShowMsgType.Tip)
{
@@ -207,6 +213,8 @@
this.ConfirmClickEvent = null;
this.CancelClickEvent = null;
};
+ //寮�鍚瓑寰呮椂闂�
+ this.StartWaitTime(btnConfirm);
}
/// <summary>
@@ -280,6 +288,87 @@
this.ConfirmClickEvent = null;
};
#endif
+ //寮�鍚瓑寰呮椂闂�
+ this.StartWaitTime(btnConfirm);
+ }
+
+ #endregion
+
+ #region 鈻� 寮�鍚瓑寰呮椂闂確______________________
+
+ /// <summary>
+ /// 寮�鍚瓑寰呮椂闂�(姝ゅ嚱鏁板彧鐢ㄤ簬瀹夊崜)
+ /// </summary>
+ /// <param name="btnConfirm">纭鎸夐挳</param>
+ private void StartWaitTime(BottomRightClickButton btnConfirm)
+ {
+ if (this.WaitTime <= 0)
+ {
+ return;
+ }
+
+ btnConfirm.CanClick = false;
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鏄剧ず鍓╀綑绛夊緟鏃堕棿
+ while (btnConfirm.Parent != null && this.WaitTime >= 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnConfirm.SetButtonText(this.buttonOkText + "(" + this.WaitTime + ")");
+ }, ShowErrorMode.NO);
+ System.Threading.Thread.Sleep(1000);
+ this.WaitTime--;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍙互鐐瑰嚮
+ btnConfirm.SetButtonText(this.buttonOkText);
+ btnConfirm.CanClick = true;
+ }, ShowErrorMode.NO);
+ });
+ }
+
+ /// <summary>
+ /// 寮�鍚瓑寰呮椂闂�
+ /// </summary>
+ /// <param name="btnConfirm">纭鎸夐挳</param>
+ private void StartWaitTime(ButtonBase btnConfirm)
+ {
+ if (this.WaitTime <= 0)
+ {
+ return;
+ }
+#if Android
+ ((FrameLayoutStatuControl)btnConfirm.Parent).CanClick = false;
+#endif
+#if iOS
+ btnConfirm.CanClick = false;
+#endif
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鏄剧ず鍓╀綑绛夊緟鏃堕棿
+ while (btnConfirm.Parent != null && this.WaitTime >= 0)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnConfirm.Text = this.buttonOkText + "(" + this.WaitTime + ")";
+ }, ShowErrorMode.NO);
+ System.Threading.Thread.Sleep(1000);
+ this.WaitTime--;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍙互鐐瑰嚮
+ btnConfirm.Text = this.buttonOkText;
+#if Android
+ ((FrameLayoutStatuControl)btnConfirm.Parent).CanClick = true;
+#endif
+#if iOS
+ btnConfirm.CanClick = true;
+#endif
+ }, ShowErrorMode.NO);
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs
index 6d9f680..8f534b8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Controls/TextInputControls/DialogInputControl.cs
@@ -50,7 +50,8 @@
/// <para>鍋氭垚涓�涓脊绐楀瀷锛屽乏涓嬭鏄�愬彇娑堟寜閽�戯紝鍙充笅瑙掓槸銆愮‘璁ゆ寜閽�戠殑寮圭獥鎺т欢</para>
/// <para>New鐨勬椂鍊�,灏卞凡缁忓姞鍏ュ埌浜嗙晫闈�</para>
/// </summary>
- public DialogInputControl()
+ /// <param name="i_MaxByte">鏂囨湰妗嗘渶澶ц緭鍏ョ殑byte鏁�(榛樿36涓猙yte)</param>
+ public DialogInputControl(int i_MaxByte = 36)
{
//娣诲姞鐣岄潰
var nowForm = UserView.HomePage.Instance.GetChildren(UserView.HomePage.Instance.ChildrenCount - 1);
@@ -93,6 +94,10 @@
txtInput.TextAlignment = TextAlignment.Center;
txtInput.Gravity = Gravity.CenterHorizontal;
frameText.AddChidren(txtInput);
+ if (i_MaxByte > 0)
+ {
+ this.txtInput.MaxByte = i_MaxByte;
+ }
//鍙栨秷
this.btnCancel = new BottomLeftClickButton(Application.GetRealWidth(396), Application.GetRealHeight(127));
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
index e149453..1b9a476 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Form/BottomItemSelectForm.cs
@@ -109,9 +109,8 @@
topBackFame.AddChidren(btnTitle);
//鍙栨秷
- var btnCancel = new NormalViewControl(200, 58, true);
+ var btnCancel = new NormalViewControl(Application.GetRealWidth(200), topBackFame.Height, true);
btnCancel.X = Application.GetRealWidth(81);
- btnCancel.Y = Application.GetRealHeight(40);
btnCancel.TextColor = UserCenterColor.Current.TextGrayColor1;
btnCancel.TextID = R.MyInternationalizationString.uCancel;
topBackFame.AddChidren(btnCancel);
@@ -121,9 +120,8 @@
};
//瀹屾垚
- var btnFinish = new NormalViewControl(200, 58, true);
- btnFinish.X = Application.GetRealWidth(800);
- btnFinish.Y = Application.GetRealHeight(40);
+ var btnFinish = new NormalViewControl(Application.GetRealWidth(200), topBackFame.Height, true);
+ btnFinish.X = topBackFame.Width - btnCancel.X - Application.GetRealWidth(200);
btnFinish.TextAlignment = TextAlignment.CenterRight;
btnFinish.TextColor = 0xfffb744a;
btnFinish.TextID = R.MyInternationalizationString.uFinish;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
index cf828c0..04a86a6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlBackupLogic.cs
@@ -147,7 +147,7 @@
return null;
}
//灏嗚緭鍏ュ啓鍏ユ湰鍦扮殑涓存椂鏂囦欢澶�
- HdlFileLogic.Current.SaveTextToFile(System.IO.Path.Combine(newDir, fileName), System.Text.Encoding.UTF8.GetString(result));
+ HdlFileLogic.Current.SaveByteToFile(System.IO.Path.Combine(newDir, fileName), result);
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(i + 1, listFileCount);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
index 5a30994..0066bbd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlControlLogic.cs
@@ -32,7 +32,7 @@
#endregion
- #region 鈻� 璁＄畻鍥剧墖鐪熷疄澶у皬___________________
+ #region 鈻� 璁＄畻鎺т欢鐪熷疄澶у皬___________________
/// <summary>
/// 璁＄畻鍥剧墖鐨勭湡瀹為珮瀹藉害
@@ -44,6 +44,36 @@
return Application.GetRealWidth(i_size);
}
+ /// <summary>
+ /// 璁＄畻鐪熷疄瀹藉害(鍙兘浠ュ悗浼氬彉鍔�,鎵�浠ュ０鏄庡嚭鏉ユ湁鐢ㄥ)
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetRealWidth(int i_size)
+ {
+ return Application.GetRealWidth(i_size);
+ }
+
+ /// <summary>
+ /// 璁＄畻鐪熷疄楂樺害搴�(鍙兘浠ュ悗浼氬彉鍔�,鎵�浠ュ０鏄庡嚭鏉ユ湁鐢ㄥ)
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetRealHeight(int i_size)
+ {
+ return Application.GetRealHeight(i_size);
+ }
+
+ /// <summary>
+ /// 璁＄畻鐪熷疄澶у皬(杩欎釜涓滆タ鏈夌壒娈婄敤澶�,鑰冭檻鍒板姞闀垮瀷灞忓箷鐨勬帶浠�,璋冪敤姝ゆ柟娉�)
+ /// </summary>
+ /// <param name="i_size"></param>
+ /// <returns></returns>
+ public int GetRealSizeEx(int i_size)
+ {
+ return Application.GetRealWidth(i_size);
+ }
+
#endregion
#region 鈻� 鏄剧ず搴曢儴寮圭獥鐨勬埧闂村垪琛╛____________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
index 3fade11..e255b33 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceBindLogic.cs
@@ -729,7 +729,7 @@
public Panel.PanelConfigureInfoResponAllData ReadPanelConfigureInfoAsync(CommonDevice device)
{
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
- if (Common.Config.Instance.Home.IsVirtually == true)
+ if (Common.Config.Instance.Home.IsVirtually == true || Common.Config.Instance.Home.IsShowTemplate == true)
{
return TemplateData.TemplateDeviceDataLogic.Current.ReadPanelConfigureKeyModel(device);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
index 095850c..468e4bc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePanelLogic.cs
@@ -118,7 +118,8 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetPanelColorInfo(device, keyNum);
+ //杩欓噷鐗规畩,杩欓噷鏄寜鍥炶矾鍒嗙殑
+ return TemplateData.TemplateDeviceDataLogic.Current.GetPanelColorInfo(device.DeviceAddr, device.DeviceEpoint, keyNum);
}
//鍙戦�佹暟鎹� keyNum杞负16杩涘埗 鑼冨洿锛�01~10
var passData = "0504040101" + Convert.ToString((int)keyNum, 16).ToUpper().PadLeft(2, '0');
@@ -215,7 +216,8 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, null);
+ //杩欎釜涔熸槸鐗规畩,鎸夊洖璺潵鍒�
+ return TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device.DeviceAddr, device.DeviceEpoint, keyColorData, keyNumStatus, null);
}
//鑾峰彇閰嶇疆鎸夐敭鎸囩ず鐏鑹茬殑鍛戒护瀛楃
var sendData = this.GetPanelColorCommandText(device.DeviceAddr, keyColorData, keyNumStatus);
@@ -230,7 +232,7 @@
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
//娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device, keyColorData, keyNumStatus, result.JsonData[0]);
+ TemplateData.TemplateDeviceDataLogic.Current.SetPanelColorInfo(device.DeviceAddr, device.DeviceEpoint, keyColorData, keyNumStatus, result.JsonData[0]);
return new CommonDevice.ResponseAllData { responseData = tempD };
}
@@ -390,7 +392,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceLightSettion(device);
+ return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceLightSettion(device.DeviceAddr, 200);
}
//鑾峰彇鍙戦�佺殑鍛戒护瀛楃
var passData = "050604010101";
@@ -426,7 +428,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, null);
+ return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device.DeviceAddr, 200, directionsLevel, backlightLevel, null);
}
//鑾峰彇淇敼闈㈡澘鐨勪寒搴﹁皟鑺傜殑鍛戒护瀛楃
var sendData = this.GetPanelLevelCommadText(device.DeviceAddr, directionsLevel, backlightLevel);
@@ -460,7 +462,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device, directionsLevel, backlightLevel, result.JsonData[0]);
+ TemplateData.TemplateDeviceDataLogic.Current.SetDeviceLightSettion(device.DeviceAddr, 200, directionsLevel, backlightLevel, result.JsonData[0]);
return true;
}
@@ -657,7 +659,7 @@
//濡傛灉褰撳墠浣忓畢鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceEnergyConservationMode(device);
+ return TemplateData.TemplateDeviceDataLogic.Current.GetDeviceEnergyConservationMode(device.DeviceAddr, 200);
}
//鍙戦�佸懡浠�
string passData = "050804010101";
@@ -723,7 +725,7 @@
//濡傛灉褰撳墠鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, null);
+ return TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device.DeviceAddr, 200, modeEnable, modeTime, level, null);
}
//鑾峰彇璁剧疆璁惧鐨勮妭鑳芥ā寮忕殑鍛戒护瀛楃
var sendData = this.GetDeviceEnergyConservationModeCommandText(device.DeviceAddr, modeEnable, modeTime, level);
@@ -753,7 +755,7 @@
}
//淇敼缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device, modeEnable, modeTime, level, result.JsonData[0]);
+ TemplateData.TemplateDeviceDataLogic.Current.SetDeviceEnergyConservationMode(device.DeviceAddr, 200, modeEnable, modeTime, level, result.JsonData[0]);
return true;
}
@@ -1094,7 +1096,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.GetPanelVibrationInfo(device);
+ return TemplateData.TemplateDeviceDataLogic.Current.GetPanelVibrationInfo(device.DeviceAddr, 200);
}
//鍙戦�佹暟鎹�
var jObject = new Newtonsoft.Json.Linq.JObject { { "DeviceAddr", device.DeviceAddr }, { "Epoint", 200 }, { "Cluster_ID", 64513 }, { "Command", 0 } };
@@ -1129,7 +1131,7 @@
//濡傛灉鏄櫄鎷熶綇瀹�
if (Common.Config.Instance.Home.IsVirtually == true)
{
- return TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device, datainfo, null);
+ return TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device.DeviceAddr, 200, datainfo, null);
}
//鑾峰彇缂栬緫闈㈡澘闇囧姩鍔熻兘鐨勫懡浠ゅ瓧绗�
var sendData = this.GetPanelVibrationCommandText(device.DeviceAddr, datainfo);
@@ -1143,7 +1145,7 @@
return false;
}
//娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device, datainfo, result.JsonData[0]);
+ TemplateData.TemplateDeviceDataLogic.Current.SetPanelVibrationInfo(device.DeviceAddr, 200, datainfo, result.JsonData[0]);
return true;
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDevicePirSensorLogic.cs
index 81552d6..399ef95 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 TemplateData.TemplateDeviceDataLogic.Current.GetPirSensorLightSettion(device.DeviceAddr, 200);
}
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 TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, null);
}
//鍙戦�佹暟鎹�
var sendData = this.GetPirSensorSettionCommandText(device.DeviceAddr, configureParamates);
@@ -240,7 +240,7 @@
tempD.status = Convert.ToInt32(data[14].ToString() + data[15].ToString(), 16);
//娣诲姞缂撳瓨
- TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device, configureParamates, result.JsonData[0]);
+ TemplateData.TemplateDeviceDataLogic.Current.SetPirSensorLightSettion(device.DeviceAddr, 200, configureParamates, result.JsonData[0]);
return new CommonDevice.ResponseAllData { responseData = tempD };
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
index 9c4f1dc..0cd272f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlExperienceAccountLogic.cs
@@ -729,6 +729,11 @@
public void Zigbee绌鸿皟缃戝叧(int i_DeviceCount, string i_RoomId)
{
+ var device2 = new OTADevice() { DeviceAddr = "DeviceAddr" + this.DeviceNumber, DeviceEpoint = 200 };
+ //璁剧疆璁惧鐨勫熀鏈俊鎭�
+ this.SetBaseDataToDevice(device2, 3600, 3600, "MAC/GW-ZB.10", i_RoomId);
+ this.DeviceNumber++;
+ return;
for (int i = 0; i < i_DeviceCount; i++)
{
//10涓┖璋冨簲璇ュ彲浠ヤ簡
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlMessageLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlMessageLogic.cs
new file mode 100755
index 0000000..378cf3a
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlMessageLogic.cs
@@ -0,0 +1,109 @@
+锘縰sing Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone
+{
+ /// <summary>
+ /// 娑堟伅鐨勯�昏緫
+ /// </summary>
+ public class HdlMessageLogic
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 娑堟伅鐨勯�昏緫
+ /// </summary>
+ private static HdlMessageLogic m_Current = null;
+ /// <summary>
+ /// 娑堟伅鐨勯�昏緫
+ /// </summary>
+ public static HdlMessageLogic Current
+ {
+ get
+ {
+ if (m_Current == null)
+ {
+ m_Current = new HdlMessageLogic();
+ }
+ return m_Current;
+ }
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸殑鏂规硶_________________________
+
+ /// <summary>
+ /// 鏄剧ず淇℃伅妗�
+ /// </summary>
+ /// <param name="msgType">淇℃伅绫诲瀷</param>
+ /// <param name="msg">淇℃伅</param>
+ /// <param name="action">鍗曞嚮纭鍚庢墽琛岀殑鍥炶皟鍑芥暟</param>
+ /// <param name="buttonText">鎸夐挳鐨勬枃鏈�</param>
+ /// <param name="i_waitTime">绛夊緟鏃堕棿,鍗曚綅涓虹,璁剧疆纭鎸夐挳鍦ㄥ闀挎椂闂村悗鎵嶈兘澶熺偣鍑�</param>
+ public void ShowMassage(ShowMsgType msgType, string msg, Action action = null, string buttonText = null, int i_waitTime = -1)
+ {
+ //绌哄璞℃椂锛屼笉鏄剧ず
+ if (string.IsNullOrEmpty(msg))
+ {
+ return;
+ }
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var alert = new ShowMsgControl(msgType, msg, buttonText, null, i_waitTime);
+ 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
+ }
+
+ /// <summary>
+ /// 淇℃伅鏄剧ず鐨勭被鍨�
+ /// </summary>
+ public enum ShowMsgType
+ {
+ /// <summary>
+ /// 鏅�氭彁绀虹被鍨�
+ /// </summary>
+ Normal = 1,
+ /// <summary>
+ /// 纭绫诲瀷
+ /// </summary>
+ Confirm = 2,
+ /// <summary>
+ /// 閿欒绫诲瀷
+ /// </summary>
+ Error = 3,
+ /// <summary>
+ /// Tip绫诲瀷
+ /// </summary>
+ Tip = 4,
+ /// <summary>
+ /// 鎻愰啋绫诲瀷
+ /// </summary>
+ Remind = 5
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
index 69f5c4a..da123a1 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlResidenceLogic.cs
@@ -273,20 +273,26 @@
house.Save(false);
listHouse.Add(house);
}
+ //妫�娴嬫湰鍦扮殑浣忓畢鏂囦欢鏄惁鍚堟硶
+ var listLocal = this.GetAllLocalResidenceListByDirectory();
+ foreach (var myHouse in listLocal)
+ {
+ //濡傛灉鏈湴瀛樺湪涓嶅睘浜庝粬鐨勪綇瀹呮枃浠�,鍒欏垹闄�
+ if (myHouse.HouseDataDiv == 1 && Config.Instance.HomeFilePathList.Contains(myHouse.FileName) == false)
+ {
+ string housePath = System.IO.Path.Combine(Shared.IO.FileUtils.RootPath, Config.Instance.Guid, myHouse.Id);
+ HdlFileLogic.Current.DeleteDirectory(housePath);
+ }
+ }
//濡傛灉鍒囨崲浜嗚处鍙�,鎴栬�呭師鏉ョ殑id涓嶅瓨鍦�,鍒欓噸缃綇瀹匢D
if (Config.Instance.TheSameLoginAccount == false ||
- Config.Instance.HomeFilePathList.Find((obj) => obj == $"House_{Config.Instance.HomeId}.json") == null)
+ Config.Instance.HomeFilePathList.Contains($"House_{Config.Instance.HomeId}.json") == false)
{
Config.Instance.HomeId = listHouse[0].Id;
- foreach (var house in listHouse)
+ if (listHouse.Count > 0)
{
- //鍒濆閫夋嫨瀹冭嚜宸辩殑浣忓畢
- if (house.IsOthreShare == false)
- {
- Config.Instance.HomeId = house.Id;
- Config.Instance.Home = GetHouseByHouseId(house.Id);
- break;
- }
+ Config.Instance.HomeId = listHouse[0].Id;
+ Config.Instance.Home = GetHouseByHouseId(listHouse[0].Id);
}
}
Config.Instance.Save();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index 05702e2..1758563 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -184,9 +184,11 @@
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < 3000)
{
- if (topicCount <= 0 || error == true)
+ //if (error == true) { break; }
+ if (topicCount <= 0)
{
//9娆′富棰樺叏閮ㄦ帴鏀跺畬鎴�
+ await Task.Delay(1000);
break;
}
await Task.Delay(50);
@@ -455,7 +457,7 @@
foreach (var device in listdevice)
{
int MomentStatus = 1;
- int TriggerZoneStatus = 1;
+ int TriggerZoneStatus = 3;
//鑾峰彇瀹夐槻浼犳劅鍣ㄧ殑鐬棿鐘舵�佽瀹氬��
this.GetSafeguardSensorMomentStatus(device, ref MomentStatus, ref TriggerZoneStatus);
@@ -594,43 +596,43 @@
if (device.IasDeviceType == 13)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//鐑熼浘浼犳劅鍣�
else if (device.IasDeviceType == 40)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//姘翠镜浼犳劅鍣�
else if (device.IasDeviceType == 42)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//鐕冩皵浼犳劅鍣�
else if (device.IasDeviceType == 43)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//绱ф�ユ寜閽�
else if (device.IasDeviceType == 44)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//閽ュ寵鎵�
else if (device.IasDeviceType == 277)
{
MomentStatus = 1;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//闂ㄧ獥浼犳劅鍣�
else if (device.IasDeviceType == 21 || device.IasDeviceType == 22)
{
MomentStatus = 0;
- TriggerZoneStatus = 1;
+ TriggerZoneStatus = 3;
}
//濡傛灉鏄櫄鎷熻澶囷紝鍒欒繖涓笢瑗挎案鎭掍负0
if (device.DriveCode > 0)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
index 3b90c1d..c9d80ec 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSceneLogic.cs
@@ -957,6 +957,15 @@
listAdjustTarget.AddRange(i_scene.AdjustTargetList);
return listAdjustTarget;
}
+ //濡傛灉鏄湁妯℃澘,鏈夎澶囩殑鏃跺��,鍦ㄦ病鏈夊彂閫佹垚鍔熶箣鍓�,涓嶅厑璁稿埛鏂版墽琛岀洰鏍囧璞�
+ if (Common.Config.Instance.Home.TemplateMode == 2
+ && Common.Config.Instance.Home.SendTemplateSuccess == false)
+ {
+ var listAdjustTarget = new List<Scene.DeviceListData>();
+ listAdjustTarget.AddRange(i_scene.AdjustTargetList);
+ return listAdjustTarget;
+ }
+
var jObject = new Newtonsoft.Json.Linq.JObject { { "Cluster_ID", 0 }, { "Command", 806 } };
var data = new Newtonsoft.Json.Linq.JObject { { "ScenesId", i_scene.Id } };
jObject.Add("Data", data);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
index 9091b23..938c65c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlShardLogic.cs
@@ -84,7 +84,7 @@
//鏂囦欢鍚嶅瓧
listFile.Add(dataResult.ShareName);
//淇濆瓨鍒版寚瀹氭枃浠跺す涓�
- HdlFileLogic.Current.SaveTextToFile(System.IO.Path.Combine(strDir, dataResult.ShareName), System.Text.Encoding.UTF8.GetString(dataResult.ShareDataBytes));
+ HdlFileLogic.Current.SaveByteToFile(System.IO.Path.Combine(strDir, dataResult.ShareName), dataResult.ShareDataBytes);
//璁剧疆杩涘害鍊�
ProgressFormBar.Current.SetValue(i + 1, listMarkCount);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
index 38dde63..d8943b3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/UserCenterLogic.cs
@@ -533,12 +533,21 @@
/// </summary>
public static void RefreshHomeObject()
{
- //杩樺師浣忓畢瀵硅薄
var home = HdlResidenceLogic.Current.GetHouseByHouseId(Config.Instance.Home.Id);
- //鍙樻洿妤煎眰
+ //鍒锋柊妤煎眰
Config.Instance.Home.FloorDics = home.FloorDics;
Config.Instance.Home.CurrentFloorId = string.Empty;
+ if (Config.Instance.Home.TemplateMode == -1)
+ {
+ Config.Instance.Home.TemplateMode = home.TemplateMode;
+ if (Config.Instance.Home.TemplateMode == -1)
+ {
+ //榛樿鍒濆鍊�
+ Config.Instance.Home.TemplateMode = 1;
+ }
+ }
+
Config.Instance.Home.Save(false);
//涓婚〉闇�瑕侀噸鏂板埛鏂�
@@ -817,6 +826,7 @@
var form = new HideOption.HideOptionMainForm();
form.AddForm();
});
+ ProgressBar.Close(true);
return false;
}
}
@@ -880,28 +890,9 @@
System.Threading.Thread.Sleep(30);
if (hadNet == 1)
{
- try
- {
- bool canReceiveGw = false;
- foreach (var gateway in UserCenterResourse.DicReceiveGatewayTest.Values)
- {
- if (gateway.HomeId == Config.Instance.Home.Id)
- {
- //鑳藉鎼滅储寰楀埌缃戝叧
- canReceiveGw = true;
- break;
- }
- }
- UserCenterResourse.DicReceiveGatewayTest = null;
- //璁剧疆杩滅▼杩炴帴鐨勫垵濮嬪��
- ZigBee.Device.ZbGateway.IsRemote = canReceiveGw == false;
- if (canReceiveGw == false)
- {
- //濡傛灉鏄繙绋嬬殑璇�,杩藉姞绛夊緟鏃堕棿
- System.Threading.Thread.Sleep(1500);
- }
- }
- catch { }
+ //浣忓畢鍒囨崲鏃�,妫�娴嬬綉鍏宠繛鎺ユ儏鍐�
+ CheckGatewayConnection();
+
}
UserCenterResourse.DicReceiveGatewayTest = null;
}
@@ -963,6 +954,35 @@
Common.Logic.SoneLogicList.Clear();
}
+ /// <summary>
+ /// 浣忓畢鍒囨崲鏃�,妫�娴嬬綉鍏宠繛鎺ユ儏鍐�
+ /// </summary>
+ private static void CheckGatewayConnection()
+ {
+ try
+ {
+ bool canReceiveGw = false;
+ foreach (var gateway in UserCenterResourse.DicReceiveGatewayTest.Values)
+ {
+ if (gateway.HomeId == Config.Instance.Home.Id)
+ {
+ //鑳藉鎼滅储寰楀埌缃戝叧
+ canReceiveGw = true;
+ break;
+ }
+ }
+ UserCenterResourse.DicReceiveGatewayTest = null;
+ //璁剧疆杩滅▼杩炴帴鐨勫垵濮嬪��
+ ZigBee.Device.ZbGateway.IsRemote = canReceiveGw == false;
+ if (canReceiveGw == false)
+ {
+ //濡傛灉鏄繙绋嬬殑璇�,杩藉姞绛夊緟鏃堕棿
+ System.Threading.Thread.Sleep(1500);
+ }
+ }
+ catch { }
+ }
+
#endregion
#region 鈻� 鍒濆鍖栫櫥闄嗚处鍙风殑淇℃伅_______________
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
index f0739e7..80f0596 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindInfo.cs
@@ -215,6 +215,10 @@
if (device.Type == DeviceType.TemperatureSensor)
{
var dev = device as TemperatureSensor;
+ if (BindInfo.checkRealTemperatureDevice(device) == false)
+ {
+ continue;
+ }
if (dev.SensorDiv == 1)
{
roomIncludeMatchTempDevice.Add(device);
@@ -256,6 +260,10 @@
if (device.Type == DeviceType.TemperatureSensor)
{
var dev = device as TemperatureSensor;
+ if (BindInfo.checkRealTemperatureDevice(device) == false)
+ {
+ continue;
+ }
if (dev.SensorDiv == 2)
{
roomIncludeMatchHumpDevice.Add(device);
@@ -704,7 +712,7 @@
}
/// <summary>
- /// 鏄惁鏄湡瀹炵殑绌鸿皟璁惧 銆愰儴鍒嗘槸鑳界粦瀹氱┖璋冪殑璁惧銆�
+ /// 鏄惁鏄湡瀹炵殑绌鸿皟璁惧 銆愯繃婊erver绔��
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
@@ -721,7 +729,7 @@
}
/// <summary>
- /// 鏄惁鏄湡瀹炵殑鏂伴璁惧 銆愰儴鍒嗘槸鑳界粦瀹氭柊椋庣殑璁惧銆�
+ /// 鏄惁鏄湡瀹炵殑鏂伴璁惧 銆愯繃婊erver绔��
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
@@ -738,7 +746,28 @@
}
/// <summary>
- /// 妫�娴嬭璁惧鑳藉惁鏄剧ず
+ /// 鏄惁鏄湡瀹炵殑娓╁害璁惧 銆愯繃婊erver绔��
+ /// </summary>
+ /// <param name="device"></param>
+ /// <returns></returns>
+ public static bool checkRealTemperatureDevice(CommonDevice device)
+ {
+ bool result = true;
+ //鑾峰彇璁惧灞炰簬銆愮畝绾﹀鍔熻兘闈㈡澘銆�
+ var deviceEnumInfo = Common.LocalDevice.Current.GetMyDeviceEnumInfo(new List<CommonDevice> { device });
+ if (deviceEnumInfo.ConcreteType == Common.DeviceConcreteType.ButtonPanel_SimpleMultifunction)
+ {
+ if (device.Type == DeviceType.TemperatureSensor && device.DeviceEpoint == 1)
+ {
+ //绠�绾﹀鍔熻兘闈㈡澘绗�1鍥炶矾鏄竴涓粦瀹氭俯婀垮害浼犳劅鍣ㄧ绫诲瀷锛屼笉鏄湡鐨勬俯婀垮害鐨勪紶鎰熷櫒锛岄渶瑕佸睆钄芥帀
+ result = false;
+ }
+ }
+ return result;
+ }
+
+ /// <summary>
+ /// 妫�娴嬭璁惧鑳藉惁鏄剧ず銆愯繃婊erver绔��
/// </summary>
/// <param name="device"></param>
/// <returns></returns>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 1887e50..726615a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -461,14 +461,7 @@
devicePic.UnSelectedImagePath = "Scene/SceneIcon.png";
if (curSceneUI == null)
{
- if (string.IsNullOrEmpty(bindDevice.ESName))
- {
- btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
- }
- else
- {
- btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + bindDevice.ESName;
- }
+ btnBindNameText = Language.StringByID(R.MyInternationalizationString.OffLineScene) + "_" + "ID" + "_" + bindDevice.BindScenesId.ToString();
}
else
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
index bc0a6b3..6e555b0 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceListMainForm.cs
@@ -261,7 +261,7 @@
btnPosition.ButtonClickEvent += (sender, e) =>
{
//瀹氫綅
- Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0]);
+ Common.LocalDevice.Current.SetFixedPositionCommand(listdevice[0], true);
};
}
@@ -1397,7 +1397,7 @@
btnName.Height = Application.GetRealHeight(60);
btnName.TextSize = 15;
btnName.Y = Application.GetRealHeight(57);
- btnName.Text = "灏忓害灏忓害";
+ btnName.Text = "鏅鸿兘闊崇";
this.AddRightArrow();
this.AddMostRightView("", 300, false).Name = "smartSoundLayout";
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
index 402b3a6..1d8bbf3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/DeviceMacInfoEditorForm.cs
@@ -831,14 +831,19 @@
var form = new DevicePanel.PanelFangyueFunctionSettionForm();
form.AddForm(listNewDevice[0], deviceEnumInfo);
}
- //绠�绾︾幆澧冮潰鏉跨殑鎸夐敭閰嶇疆
+ //绠�绾﹀鍔熻兘闈㈡澘鐨勬寜閿厤缃�
else if (deviceEnumInfo.ConcreteType == DeviceConcreteType.ButtonPanel_SimpleMultifunction)
{
- var form = new DeviceFunctionSettionForm();
- if (listNewDevice.Count > 62)
+ foreach (var dev in listNewDevice)
{
- form.AddForm(listNewDevice[62], true);
+ if (dev.Type == DeviceType.OnOffOutput && dev.DeviceEpoint == 62)
+ {
+ var form = new DeviceFunctionSettionForm();
+ form.AddForm(dev, true);
+ break;
+ }
}
+
}
//娌充笢鐨勯潰鏉胯澶�
else if (deviceEnumInfo.BeloneType == DeviceBeloneType.A鎸夐敭闈㈡澘 && deviceEnumInfo.IsHdlDevice == true)
@@ -1313,41 +1318,18 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1 && bDev.BindCluster == 1026)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2 && bDev.BindCluster == 1029)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
@@ -1683,7 +1665,7 @@
frame.AddRowMenu(deviceMenu, "Item/FixedPosition.png", "Item/FixedPositionSelected.png", () =>
{
//鍙戦�佸畾浣嶅姛鑳�
- Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0]);
+ Common.LocalDevice.Current.SetFixedPositionCommand(listNewDevice[0], true);
});
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
index efbd993..db3ee0e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSettionWithSourceForm.cs
@@ -260,15 +260,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.FreshAir)
@@ -280,15 +272,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindFreshAirName = bDev.ESName;
- }
-
+ bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindFreshAirDev = device;
}
else if (device.Type == DeviceType.TemperatureSensor)
@@ -296,41 +280,18 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
else if (device.Type == DeviceType.PMSensor)
@@ -347,15 +308,7 @@
}
if (bDev.BindCluster == 1066)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindPmName = bDev.ESName;
- }
-
+ bindPmName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindPMDev = device;
}
}
@@ -406,15 +359,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.FreshAir)
@@ -426,15 +371,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindFreshAirName = bDev.ESName;
- }
-
+ bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindFreshAirDev = device;
}
else if (device.Type == DeviceType.TemperatureSensor)
@@ -442,54 +379,23 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
else if (device.Type == DeviceType.Thermostat)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.PMSensor)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
index 9382623..d175f2e 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleEnvironmentButtonSettionForm.cs
@@ -221,15 +221,7 @@
{
continue;
}
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindFreshAirName = bDev.ESName;
- }
-
+ bindFreshAirName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindFreshAirDev = device;
}
else if (device.Type == DeviceType.TemperatureSensor)
@@ -237,54 +229,23 @@
var bD = device as TemperatureSensor;
if (bD.SensorDiv == 1)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindTemperatureName = bDev.ESName;
- }
+ bindTemperatureName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindTemperatureDev = device;
}
if (bD.SensorDiv == 2)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
}
else if (device.Type == DeviceType.FreshAirHumiditySensor)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindHumidityName = bDev.ESName;
- }
-
+ bindHumidityName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindHumidityDev = device;
}
else if (device.Type == DeviceType.Thermostat)
{
- if (string.IsNullOrEmpty(bDev.ESName))
- {
- bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
- }
- else
- {
- bindAcName = bDev.ESName;
- }
-
+ bindAcName = Common.LocalDevice.Current.GetDeviceEpointName(device);
bindAcDev = device;
}
else if (device.Type == DeviceType.PMSensor)
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
index a308a49..9e85870 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionAddTargetsForm.cs
@@ -1339,7 +1339,6 @@
curD.BindScenesId = dev.BindScenesId;
curD.BindMacAddr = dev.BindMacAddr;
curD.BindEpoint = dev.BindEpoint;
- curD.ESName = dev.ESName;
curD.BindType = dev.BindType;
bList.Add(curD);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
index 043f611..cd8a5ec 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelSimpleMutilfunctionTargetsForm.cs
@@ -623,7 +623,6 @@
curD.BindScenesId = dev.BindScenesId;
curD.BindMacAddr = dev.BindMacAddr;
curD.BindEpoint = dev.BindEpoint;
- curD.ESName = dev.ESName;
curD.BindType = dev.BindType;
bList.Add(curD);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
index 61e4bf4..49a9a16 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/PirSensor/PirSensorBindTargetSettionForm.cs
@@ -542,7 +542,13 @@
PickerView.ShowSecondary(listfirst, listSecond, (value1, value2) =>
{
- btnTime.Text = listfirst[value1].TrimStart('0') + listSecond[value1][value2];
+ string textValue = listSecond[value1][value2];
+ if (value1 != 0)
+ {
+ textValue = listfirst[value1].TrimStart('0') + textValue;
+ }
+ btnTime.Text = textValue;
+
int minute = Convert.ToInt32(listfirst[value1].Substring(0, 2));
int second = Convert.ToInt32(listSecond[value1][value2].Substring(0, 2));
int delaySecond = minute * 60 + second;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
index 4688951..dbac75a 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayNationalBackLightSettionForm.cs
@@ -338,7 +338,7 @@
btnProgress1.Y = Application.GetRealHeight(29);
btnProgress1.TextSize = 12;
btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+ btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -350,10 +350,10 @@
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
- linghtLevelInfo.panelBacklightLevel = value;
+ linghtLevelInfo.panelDirectionsLevel = value;
valueChanged = true;
};
- seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
+ seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -408,7 +408,7 @@
btnProgress1.Y = Application.GetRealHeight(369);
btnProgress1.TextSize = 12;
btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+ btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -420,10 +420,10 @@
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
- linghtLevelInfo.panelDirectionsLevel = value;
+ linghtLevelInfo.panelBacklightLevel = value;
valueChanged = true;
};
- seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
+ seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
index 1207a80..3c650d2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Relay/RelayThreeLoadBackLightSettionForm.cs
@@ -260,7 +260,7 @@
btnProgress1.Y = Application.GetRealHeight(29);
btnProgress1.TextSize = 12;
btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
+ btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -272,10 +272,10 @@
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
- linghtLevelInfo.panelBacklightLevel = value;
+ linghtLevelInfo.panelDirectionsLevel = value;
valueChanged = true;
};
- seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
+ seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
@@ -330,7 +330,7 @@
btnProgress1.Y = Application.GetRealHeight(369);
btnProgress1.TextSize = 12;
btnProgress1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnProgress1.Text = linghtLevelInfo.panelDirectionsLevel + "%";
+ btnProgress1.Text = linghtLevelInfo.panelBacklightLevel + "%";
frameLinght.AddChidren(btnProgress1);
//杩涘害鏉�
@@ -342,10 +342,10 @@
{
btnProgress1.Text = value + "%";
//鏁版嵁鍙樻洿
- linghtLevelInfo.panelDirectionsLevel = value;
+ linghtLevelInfo.panelBacklightLevel = value;
valueChanged = true;
};
- seekBar1.Progress = linghtLevelInfo.panelDirectionsLevel;
+ seekBar1.Progress = linghtLevelInfo.panelBacklightLevel;
var btnTemp1 = new NormalViewControl(200, 49, true);
btnTemp1.X = ControlCommonResourse.XXLeft;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
index 3ac8d1e..25bb51f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/ShowDoorLockMsgControl.cs
@@ -290,7 +290,7 @@
if (int.Parse((sender as EditText).Text) > 72)
{
string msg0 = Language.StringByID(R.MyInternationalizationString.InvalidTimeMoreThan72);
- var alert = new UserCenter.ShowMsgControl(UserCenter.ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
+ var alert = new UserCenter.ShowMsgControl(ShowMsgType.Normal, msg0, Language.StringByID(R.MyInternationalizationString.confrim));
alert.Show();
editInvalidTime.Text = "72";
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
index c4005af..68c6c1c 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/TemporaryPassword.cs
@@ -926,26 +926,44 @@
void TimeDisplay(Button validTime, Button validTimeDate, Button inValidTime, Button inValidTimeDate, bool isDefaultTime)
{
string hour = "";
- string minute = "";
+ string minute = "";
if (isDefaultTime)
- {
- var cur = DateTime.Now;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour = cur.Hour;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateHour = cur.Hour;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMinute = cur.Minute;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMinute = cur.Minute;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateSecond = cur.Second;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateSecond = cur.Second;
-
- var InValidTime = cur.AddDays(1);
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateYear = cur.Year;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateYear = InValidTime.Year;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateMonth = cur.Month;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateMonth = InValidTime.Month;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateDay = cur.Day;
- Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.InValidDateDay = InValidTime.Day;
-
- //doorLock.ReSave();
+ {
+ var cur = DateTime.Now;
+ DoorLockCommonInfo.ValidDateHour = cur.Hour;
+ DoorLockCommonInfo.ValidDateMinute = cur.Minute;
+ DoorLockCommonInfo.ValidDateSecond = cur.Second;
+ DoorLockCommonInfo.InValidDateHour = cur.Hour;
+ DoorLockCommonInfo.InValidDateMinute = cur.Minute;
+ DoorLockCommonInfo.InValidDateSecond = cur.Second;
+ DoorLockCommonInfo.ValidDateYear = cur.Year;
+ DoorLockCommonInfo.ValidDateMonth = cur.Month;
+ DoorLockCommonInfo.ValidDateDay = cur.Day;
+
+ var curD = DoorLockCommonInfo.LastDayOfMonth(cur);
+ if (DoorLockCommonInfo.ValidDateDay == curD.Day)
+ {
+ if (DoorLockCommonInfo.ValidDateMonth == 12)
+ {
+ DoorLockCommonInfo.InValidDateYear = cur.Year + 1;
+ DoorLockCommonInfo.InValidDateMonth = 1;
+ DoorLockCommonInfo.InValidDateDay = 1;
+ }
+ else
+ {
+ DoorLockCommonInfo.InValidDateYear = cur.Year;
+ DoorLockCommonInfo.InValidDateMonth = cur.Month + 1;
+ DoorLockCommonInfo.InValidDateDay = 1;
+ }
+ }
+ else
+ {
+ DoorLockCommonInfo.InValidDateYear = cur.Year;
+ DoorLockCommonInfo.InValidDateMonth = cur.Month;
+ DoorLockCommonInfo.InValidDateDay = cur.Day + 1;
+ }
+
+ //doorLock.ReSave();
}
if (Shared.Phone.UserCenter.DoorLock.DoorLockCommonInfo.ValidDateHour < 10)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs
index 529ff96..61669cd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionGatewayListFileForm.cs
@@ -106,31 +106,31 @@
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, "鍒犻櫎鏂囦欢鎴愬姛");
- });
+ {
+ 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, "鍒犻櫎鏂囦欢鎴愬姛");
+ });
};
}
@@ -142,7 +142,7 @@
btnDelete.Visible = false;
btnDelete.ButtonClickEvent += (sender, e) =>
{
- this.ShowMassage(ShowMsgType.Confirm, "纭畾鏄惁鍒犻櫎杩欎簺鏂囦欢?",async () =>
+ this.ShowMassage(ShowMsgType.Confirm, "纭畾鏄惁鍒犻櫎杩欎簺鏂囦欢?", async () =>
{
foreach (var listfile in this.listDeleteFile)
{
@@ -194,10 +194,10 @@
public override void CloseFormBefore()
{
HdlFileLogic.Current.DeleteDirectory(System.IO.Path.Combine(DirNameResourse.LocalMemoryDirectory, "MyTempDir"));
-
+
base.CloseFormBefore();
}
#endregion
}
-}
+}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
index 4db53f4..564ee91 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionMainForm.cs
@@ -71,9 +71,9 @@
this.AddNormalRowControl("褰撳墠韬唤", 400, UserCenterResourse.UserInfo.AuthorityText, 400);
- this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
+ //this.AddTopButtomRowControl("浣忓畢ID", 400, Common.Config.Instance.Home.Id, 900);
- this.AddTopButtomRowControl("璐﹀彿GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);
+ //this.AddTopButtomRowControl("璐﹀彿GUID", 400, string.IsNullOrEmpty(Common.Config.Instance.Guid) == true ? Common.Config.Instance.Home.MainUserDistributedMark : Common.Config.Instance.Guid, 900);
this.AddNormalRowControl("浣忓畢鍒嗕韩", 400, Common.Config.Instance.Home.IsOthreShare == true ? "鏄�" : "鍚�", 400);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
index 34348bd..74bfc7b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/HideOption/HideOptionSearchAllFile.cs
@@ -209,6 +209,35 @@
}
row1.frameTable.AddRightArrow();
+ var btnReName = row1.AddDeleteControl();
+ btnReName.Text = "閲嶅懡鍚�";
+ btnReName.ButtonClickEvent += (sender, e) =>
+ {
+ //鐢熸垚涓�涓脊绐楃敾闈�
+ var dialogForm = new DialogInputControl();
+ //淇濆瓨妯℃澘鍒癆pp
+ dialogForm.SetTitleText("閲嶅懡鍚�");
+ //璇疯緭鍏ユ柊鍚嶅瓧
+ dialogForm.SetTipText("璇疯緭鍏ユ柊鍚嶅瓧");
+ dialogForm.Text = fileName;
+
+ //鎸変笅纭鎸夐挳
+ dialogForm.ComfirmClickEvent += ((textValue) =>
+ {
+ //鐢婚潰鍏抽棴
+ dialogForm.CloseDialog();
+ if (textValue == string.Empty)
+ {
+ return;
+ }
+ HdlFileLogic.Current.MoveFileToDirectory(System.IO.Path.Combine(directory, fileName), System.IO.Path.Combine(directory, textValue));
+
+ fileNewName = textValue;
+ fileName = textValue;
+ btnName.Text = textValue;
+ });
+ };
+
var btnUpLoad = row1.AddEditorControl();
btnUpLoad.Text = "涓婁紶";
btnUpLoad.ButtonClickEvent += (sender, e) =>
@@ -218,7 +247,7 @@
HdlThreadLogic.Current.RunThread(() =>
{
string tagrtFile = System.IO.Path.Combine(directory, fileName);
- HdlBackupLogic.Current.UpLoadByteDataToOptionBackup(fileName, HdlFileLogic.Current.ReadFileByteContent(tagrtFile));
+ HdlBackupLogic.Current.UpLoadByteDataToOptionBackup(fileNewName, HdlFileLogic.Current.ReadFileByteContent(tagrtFile));
});
});
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
index 97311db..5107160 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewEmailForm.cs
@@ -95,7 +95,11 @@
btnCodeControl.FinishInputEvent += (value) =>
{
//鏍￠獙楠岃瘉鐮�
- this.CheckVerificationCode(value);
+ if (this.CheckVerificationCode(value) == false)
+ {
+ //娓呯┖楠岃瘉鐮�
+ btnCodeControl.ClearInputValue();
+ }
};
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -213,14 +217,14 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private void CheckVerificationCode(string code)
+ private bool CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
this.btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
- return;
+ return false;
}
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
@@ -232,11 +236,12 @@
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
this.btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
- return;
+ return false;
}
//鍙樻洿閭
this.SaveNewEmail();
+ return true;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
index 96ab103..ad42b58 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckNewPhoneForm.cs
@@ -114,7 +114,11 @@
btnCodeControl.FinishInputEvent += (value) =>
{
//鏍￠獙楠岃瘉鐮�
- this.CheckVerificationCode(value);
+ if (this.CheckVerificationCode(value) == false)
+ {
+ //娓呯┖楠岃瘉鐮�
+ btnCodeControl.ClearInputValue();
+ }
};
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -234,14 +238,14 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private void CheckVerificationCode(string code)
+ private bool CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
this.btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
- return;
+ return false;
}
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
@@ -253,11 +257,12 @@
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
this.btnErrorMsg.TextID = R.MyInternationalizationString.uVerificationCodeErrorInputAgain;
- return;
+ return false;
}
//鍙樻洿鎵嬫満鍙�
this.SaveNewPhoneNumber();
+ return true;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
index 67f4ab0..d4beb21 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldEmailForm.cs
@@ -86,7 +86,11 @@
btnCodeControl.FinishInputEvent += (value) =>
{
//鏍￠獙楠岃瘉鐮�
- this.CheckVerificationCode(value);
+ if (this.CheckVerificationCode(value) == false)
+ {
+ //娓呯┖楠岃瘉鐮�
+ btnCodeControl.ClearInputValue();
+ }
};
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -179,13 +183,13 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private void CheckVerificationCode(string code)
+ private bool CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
- return;
+ return false;
}
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
@@ -195,11 +199,13 @@
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
- return;
+ return false;
}
var from = new CheckNewEmailForm();
base.AddFromAndRemoveNowForm(from);
+
+ return true;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
index f316058..c17e6e2 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Password/CheckOldPhoneForm.cs
@@ -99,7 +99,11 @@
btnCodeControl.FinishInputEvent += (value) =>
{
//鏍￠獙楠岃瘉鐮�
- this.CheckVerificationCode(value);
+ if (this.CheckVerificationCode(value) == false)
+ {
+ //娓呯┖楠岃瘉鐮�
+ btnCodeControl.ClearInputValue();
+ }
};
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
@@ -192,13 +196,13 @@
/// 楠岃瘉楠岃瘉鐮�
/// </summary>
/// <returns></returns>
- private void CheckVerificationCode(string code)
+ private bool CheckVerificationCode(string code)
{
if (this.canCheckCode == false)
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
- return;
+ return false;
}
var checkCodePra = new CheckCodePra();
checkCodePra.Code = code;
@@ -208,11 +212,13 @@
{
//楠岃瘉鐮侀敊璇紝璇烽噸鏂拌緭鍏�
this.btnErrorMsg.Visible = true;
- return;
+ return false;
}
var from = new CheckNewPhoneForm();
base.AddFromAndRemoveNowForm(from);
+
+ return true;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
index 17f8556..d7b0a71 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/AddNewRoomForm.cs
@@ -60,15 +60,11 @@
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
- frameBack1.Height = Application.GetRealHeight(450);
+ frameBack1.Height = Application.GetRealHeight(750);
frameBack1.Y = Application.GetRealHeight(196);
frameBack1.BackgroundColor = UserCenterColor.Current.White;
frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
listBackControl.frameTable.AddChidren(frameBack1);
-
- //鍒濆鍖栦俊鎭甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
var btnShadow = new PicViewControl(853, 593);
@@ -100,13 +96,14 @@
this.RoomPictrueSelect(btnPic);
};
- //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
- frameBack1.Y = btnPic.Y + btnPic.Height / 2;
-
this.newRoom = new Common.Room();
newRoom.FloorId = this.floorKeys;
newRoom.BackgroundImage = btnPic.ImagePath;
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
+
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
index 87177a9..6ab3291 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/EditorRoomInforForm.cs
@@ -67,15 +67,11 @@
//鍔犱竴涓櫧鑹茶儗鏅�
var frameBack1 = new FrameLayout();
- frameBack1.Height = Application.GetRealHeight(450);
+ frameBack1.Height = Application.GetRealHeight(750);
frameBack1.Y = Application.GetRealHeight(196);
frameBack1.BackgroundColor = UserCenterColor.Current.White;
frameBack1.SetCornerWithSameRadius(Application.GetRealHeight(58), HDLUtils.RectCornerTopLeft | HDLUtils.RectCornerTopRight);
listBackControl.frameTable.AddChidren(frameBack1);
-
- //鍒濆鍖栦俊鎭甯�
- var tableContr = new InformationEditorControl();
- this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), 1175);
//鎴块棿鍥剧墖搴曢儴闃村奖
var btnShadow = new PicViewControl(853, 593);
@@ -118,8 +114,9 @@
};
}
- //鍙樻洿涓�涓嬮偅涓櫧鑹茶儗鏅殑Y杞�,瀹冨埌鍥剧墖鐨勪腑闂翠綅缃�
- frameBack1.Y = btnPic.Y + btnPic.Height / 2;
+ //鍒濆鍖栦俊鎭甯�
+ var tableContr = new InformationEditorControl();
+ this.listview = tableContr.InitControl(listBackControl.frameTable, Language.StringByID(R.MyInternationalizationString.uInfoEditor), bodyFrameLayout.Height - btnShadow.Bottom, false);
//娣诲姞鍏ㄩ儴鑿滃崟
this.AddAllMenuRow(tableContr, btnPic);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
index 973a50d..c34be8b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/LookRoomSettionForm.cs
@@ -246,7 +246,7 @@
string path1 = string.Empty;
string path2 = string.Empty;
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref path1, ref path2);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref path1, ref path2);
dic[typeInfo.BeloneText].IconPath = path1;
}
dic[typeInfo.BeloneText].listDeviceKeys.Add(Common.LocalDevice.Current.GetDeviceMainKeys(device));
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
similarity index 95%
rename from ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
index 50c2d74..93d88bc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Residence/ResidenceListMainForm.cs
@@ -7,7 +7,7 @@
/// <summary>
/// 浣忓畢绠＄悊鐨勭敾闈⑩槄
/// </summary>
- public class ResidenceListForm : EditorCommonForm
+ public class ResidenceListMainForm : EditorCommonForm
{
#region 鈻� 鍙橀噺澹版槑___________________________
@@ -250,14 +250,32 @@
//鍒嗕韩鐨�,涓嶈兘鏇存敼
return;
}
- //杩囨埛
- var btnTransfer = rowLayout.AddDeleteControl();
- btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
- btnTransfer.ButtonClickEvent += (sender, e) =>
+ //鍙湁鍒囨崲鍒板綋鍓嶄綇瀹�,骞朵笖鏈湴鎷ユ湁缃戝叧鐨勬椂鍊�,鎵嶈兘杩囨埛
+ if (info.Id == Config.Instance.Home.Id && HdlGatewayLogic.Current.GetAllLocalGateway().Count > 0)
{
- var form = new TransferResidenceMainForm();
- form.AddForm();
- };
+ //杩囨埛
+ var btnTransfer = rowLayout.AddDeleteControl();
+ btnTransfer.TextID = R.MyInternationalizationString.uTransfer;
+ btnTransfer.ButtonClickEvent += (sender, e) =>
+ {
+ HdlCheckLogic.Current.CheckSecondarySecurity(() =>
+ {
+ //楠岃瘉鎴愬姛
+ var form = new Transfer.TransferResidenceMainForm();
+ form.AddForm(1);
+ },
+ () =>
+ {
+ //璇峰墠寰�涓汉涓績{0}璁剧疆浜屾瀹夊叏楠岃瘉鏂瑰紡
+ string msg = Language.StringByID(R.MyInternationalizationString.uGotoCenterAndSetSecondAuthentication).Replace("{0}", "\r\n");
+ this.ShowMassage(ShowMsgType.Confirm, msg, () =>
+ {
+ var form = new UserMain.SecondAuthenticationForm();
+ form.AddForm();
+ });
+ });
+ };
+ }
//鏇存敼
var btnChanged = rowLayout.AddEditorControl();
btnChanged.TextID = R.MyInternationalizationString.uChanged1;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
index dc9d494..89bde90 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/AlarmTargetAddMenuForm.cs
@@ -292,7 +292,7 @@
var typeInfo = Common.LocalDevice.Current.GetDeviceBelongEnumInfo(device);
//鑾峰彇鍥剧墖
- Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo.ConcreteType, ref unSelectPath, ref selectPath);
+ Common.LocalDevice.Current.GetDeviceFunctionTypeMenuIcon(typeInfo, ref unSelectPath, ref selectPath);
if (dicRoomData.ContainsKey(typeInfo.BeloneText) == false)
{
dicRoomData[typeInfo.BeloneText] = new uRowInformation();
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
index dbc1465..40a444d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/GarrisonAreaSettionMenuForm.cs
@@ -149,71 +149,61 @@
btnIcon.UnSelectedImagePath = "Item/Tips.png";
bodyFrameLayout.AddChidren(btnIcon);
- int XX = 0;
- int contrWidth = 0;
-
string msg = string.Empty;
//24灏忔椂闃插尯
if (zoonID == 1)
{
//24灏忔椂闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝峽0}闃插尯琚Е鍙戠珛鍗虫姤璀0}涓�鑸缃儫闆俱�佺噧姘斻�佹按娴哥瓑浼犳劅鍣�
msg = Language.StringByID(R.MyInternationalizationString.u24HourSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(233);
- XX = Application.GetRealWidth(282);
- contrWidth = Application.GetRealWidth(580);
}
//闈欓煶闃插尯
else if (zoonID == 2)
{
//闈欓煶闃插尯涓嶅彈甯冮槻銆佹挙闃插奖鍝嶏紝闃插尯琚珄0}瑙﹀彂绔嬪嵆鎶ヨ锛岄�氬父涓嶄骇鐢熷０闊虫垨{0}鍏朵粬鎻愮ず锛屽彧鍙戦�佷俊鎭埌鐗瑰畾鐨勬帴鏀惰��
msg = Language.StringByID(R.MyInternationalizationString.uMuteSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(202);
- XX = Application.GetRealWidth(279);
- contrWidth = Application.GetRealWidth(614);
}
//鍐呴儴闃插尯
else if (zoonID == 4)
{
//鍦ㄧ瀹跺竷闃叉ā寮忎笅锛屽唴閮ㄩ槻鍖轰紶鎰熷櫒瑙﹀彂{0}绔嬪嵆鎶ヨ銆傚湪鍦ㄥ甯冮槻妯″紡涓媨0}鍐呴儴闃插尯鎵�鏈変紶鎰熷櫒涓嶅弬涓庢姤璀�
msg = Language.StringByID(R.MyInternationalizationString.uInteriorSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(179);
- XX = Application.GetRealWidth(256);
- contrWidth = Application.GetRealWidth(651);
}
//鍛ㄧ晫闃插尯
else if (zoonID == 5)
{
//绂诲甯冮槻妯″紡鎴栧湪瀹跺竷闃叉ā寮忎笅{0}鍛ㄧ晫闃插尯浼犳劅鍣ㄨЕ鍙戠珛鍗虫姤璀�
msg = Language.StringByID(R.MyInternationalizationString.uPerimeterSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(239);
- XX = Application.GetRealWidth(317);
- contrWidth = Application.GetRealWidth(510);
}
//鍑哄叆闃插尯
else
{
//鍦ㄥ竷闃插悗绯荤粺鎻愪緵涓�瀹氱殑寤惰繜鏃堕棿銆傚嚭闂ㄦ椂{0}澶栧嚭寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ{0}鍥炲鏃讹紝杩涘叆寤舵椂缁撴潫鍚庯紝绯荤粺瑙﹀彂鐩爣鎶ヨ
msg = Language.StringByID(R.MyInternationalizationString.uInAndOutSectorsTipMsg);
- btnIcon.X = Application.GetRealWidth(156);
- XX = Application.GetRealWidth(216);
- contrWidth = Application.GetRealWidth(721);
}
var ArryMsg = msg.Split(new string[] { "{0}" }, StringSplitOptions.RemoveEmptyEntries);
int yy = Application.GetRealHeight(1428);
+ int firstXX = 0;
for (int i = 0; i < ArryMsg.Length; i++)
{
- var btnTip = new NormalViewControl(contrWidth, Application.GetRealHeight(50), false);
+ var btnTip = new NormalViewControl(100, 50, true);
+ btnTip.Y = yy;
btnTip.TextAlignment = TextAlignment.Center;
btnTip.TextColor = UserCenterColor.Current.TextGrayColor1;
btnTip.TextSize = 12;
- btnTip.X = XX;
- btnTip.Y = yy;
btnTip.Text = ArryMsg[i];
+ btnTip.Width = btnTip.GetRealWidthByText();
+ btnTip.Gravity = Gravity.CenterHorizontal;
bodyFrameLayout.AddChidren(btnTip);
yy = btnTip.Bottom;
+ if (i == 0)
+ {
+ //璁板綍绗竴鏉sg鐨刋杞�
+ firstXX = btnTip.X;
+ }
}
+ btnIcon.X = firstXX - Application.GetRealWidth(23) - btnIcon.Width;
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
index 7f5192c..ea700d3 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Safety/SafetyManagementMainForm.cs
@@ -78,12 +78,23 @@
frameLayoutDraw.Height = frameBack.Height - Application.GetRealHeight(181);
frameBack.AddChidren(frameLayoutDraw);
+ //璁＄畻瀹藉害浣跨敤
+ var btnTemp = new ButtonBase();
+ btnTemp.TextSize = 16;
+ btnTemp.IsBold = true;
+
+ btnTemp.TextID = R.MyInternationalizationString.uSecurityLog;
+ int frameLogWidth = btnTemp.GetRealWidthByText() + Application.GetRealWidth(30);
+
+ btnTemp.TextID = R.MyInternationalizationString.uSensorStatu;
+ int frameSensorWidth = btnTemp.GetRealWidthByText() + Application.GetRealWidth(30);
+
//瀹夐槻璁板綍(鐐瑰嚮鑼冨洿鏈夌偣灏忥紝闇�瑕佹墿澶у畠鐨勭偣鍑昏寖鍥�)
var frameLog = new FrameLayoutStatuControl();
frameLog.UseClickStatu = false;
frameLog.Height = Application.GetRealHeight(123);
- frameLog.Width = Application.GetRealWidth(273);
- frameLog.X = Application.GetRealWidth(259);
+ frameLog.Width = frameLogWidth;
+ frameLog.X = (frameBack.Width - frameLogWidth - frameSensorWidth) / 2;
frameLog.Y = Application.GetRealHeight(58);
frameBack.AddChidren(frameLog);
//鏍囬
@@ -96,7 +107,8 @@
//搴曠嚎
var btnLogLine = new NormalViewControl(40, 10, true);
btnLogLine.Y = Application.GetRealHeight(86);
- btnLogLine.X = btnLog.X + btnLog.Width / 2 - Application.GetRealWidth(40) / 2;
+ //btnLogLine.X = btnLog.X + btnLog.Width / 2 - Application.GetRealWidth(40) / 2;
+ btnLogLine.Gravity = Gravity.CenterHorizontal;
btnLogLine.Radius = (uint)Application.GetRealHeight(10) / 2;
btnLogLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
frameLog.AddChidren(btnLogLine, ChidrenBindMode.BindEvent);
@@ -106,7 +118,7 @@
var frameSensor = new FrameLayoutStatuControl();
frameSensor.UseClickStatu = false;
frameSensor.Height = frameLog.Height;
- frameSensor.Width = frameLog.Width;
+ frameSensor.Width = frameSensorWidth;
frameSensor.X = frameLog.Right;
frameSensor.Y = frameLog.Y;
frameBack.AddChidren(frameSensor);
@@ -123,7 +135,8 @@
var btnSensorLine = new NormalViewControl(40, 10, true);
btnSensorLine.BackgroundColor = UserCenterColor.Current.TextOrangeColor;
btnSensorLine.Y = btnLogLine.Y;
- btnSensorLine.X = btnSensor.X + btnSensor.Width / 2 - Application.GetRealWidth(40) / 2;
+ //btnSensorLine.X = btnSensor.X + btnSensor.Width / 2 - Application.GetRealWidth(40) / 2;
+ btnSensorLine.Gravity = Gravity.CenterHorizontal;
btnSensorLine.Radius = (uint)Application.GetRealHeight(10) / 2;
frameSensor.AddChidren(btnSensorLine, ChidrenBindMode.BindEvent);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
old mode 100644
new mode 100755
index e388a4f..ea66313
--- a/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Suggestion/FeedbackForm.cs
@@ -89,8 +89,8 @@
//鎴彇鎸囧畾鐨刡yte瀛楄妭
newValue = newValue.Substring(0, 500);
txtInput.Text = newValue;
-#if Android
//灏嗗厜鏍囪嚦浜庢渶鍚�
+#if Android
txtInput.SetSelectionEnd();
#endif
}
@@ -265,9 +265,9 @@
}
}
-#endregion
+ #endregion
-#region 鈻� 涓婁紶鎰忚___________________________
+ #region 鈻� 涓婁紶鎰忚___________________________
/// <summary>
/// 涓婁紶鎰忚
@@ -348,6 +348,6 @@
});
}
-#endregion
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs
new file mode 100755
index 0000000..22b4535
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferMemberInfoForm.cs
@@ -0,0 +1,138 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+namespace Shared.Phone.UserCenter.Transfer
+{
+ /// <summary>
+ /// 闇�瑕佽繃鎴疯处鍙风殑淇℃伅(纭)鐢婚潰
+ /// </summary>
+ public class AddMemberInfoForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�
+ /// </summary>
+ private int TransferDiv = 0;
+ /// <summary>
+ /// 鎴愬憳淇℃伅
+ /// </summary>
+ private AccountInfoResult memberResult = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_infoResult">鎴愬憳淇℃伅</param>
+ /// <param name="i_TransferDiv">1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�</param>
+ public void ShowForm(AccountInfoResult i_infoResult, int i_TransferDiv)
+ {
+ this.TransferDiv = i_TransferDiv;
+ this.memberResult = i_infoResult;
+
+ //璁剧疆鏍囬淇℃伅
+ base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uAccountInfo));
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame();
+ }
+
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //澶村儚
+ var btnUserIcon = new ImageView();
+ btnUserIcon.Height = this.GetPictrueRealSize(207);
+ btnUserIcon.Width = this.GetPictrueRealSize(207);
+ btnUserIcon.Radius = (uint)this.GetPictrueRealSize(207) / 2;
+ if (memberResult.HeadImage != null)
+ {
+ btnUserIcon.ImageBytes = memberResult.HeadImage;
+ }
+ else
+ {
+ btnUserIcon.ImagePath = "Center/Admin.png";
+ }
+ btnUserIcon.Y = Application.GetRealHeight(219);
+ btnUserIcon.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(btnUserIcon);
+
+ //鎴愬憳ID
+ var btnUserId = new NormalViewControl(800, 50, true);
+ btnUserId.IsBold = true;
+ btnUserId.Y = Application.GetRealHeight(472);
+ btnUserId.Gravity = Gravity.CenterHorizontal;
+ btnUserId.Text = memberResult.Account;
+ btnUserId.TextAlignment = TextAlignment.Center;
+ btnUserId.TextColor = UserCenterColor.Current.TextGrayColor1;
+ bodyFrameLayout.AddChidren(btnUserId);
+
+ //鏄电О
+ var btnName = new NormalViewControl(800, 55, true);
+ btnName.IsBold = true;
+ btnName.Y = Application.GetRealHeight(541);
+ btnName.Gravity = Gravity.CenterHorizontal;
+ btnName.TextAlignment = TextAlignment.Center;
+ btnName.TextSize = 16;
+ //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
+ btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
+ bodyFrameLayout.AddChidren(btnName);
+
+ //璇风‘璁よ处鍙锋槸鍚︽纭畕0}濡傛纭鐐瑰嚮纭
+ string strMsg = Language.StringByID(R.MyInternationalizationString.uPleaseConfirmAccoutIsRightAndClick);
+ if (strMsg.Contains("{0}") == true)
+ {
+ strMsg = string.Format(strMsg, "\r\n");
+ }
+ var btnmsg = new NormalViewControl(800, 100, true);
+ btnmsg.IsBold = true;
+ btnmsg.Y = Application.GetRealHeight(913);
+ btnmsg.TextSize = 12;
+ btnmsg.Text = strMsg;
+ btnmsg.IsMoreLines = true;
+ btnmsg.TextAlignment = TextAlignment.Center;
+ btnmsg.TextColor = UserCenterColor.Current.TextGrayColor2;
+ btnmsg.Gravity = Gravity.CenterHorizontal;
+ bodyFrameLayout.AddChidren(btnmsg);
+
+ //纭
+ var btnOk = new BottomClickButton(688);
+ btnOk.Y = Application.GetRealHeight(1045);
+ btnOk.TextID = R.MyInternationalizationString.uConfirm1;
+ bodyFrameLayout.AddChidren(btnOk);
+ btnOk.ButtonClickEvent += (sender, e) =>
+ {
+ if (this.memberResult.Account == UserCenterResourse.UserInfo.Phone
+ || this.memberResult.Account == UserCenterResourse.UserInfo.Email)
+ {
+ if (this.TransferDiv == 1)
+ {
+ //涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uYouCannotTransferOwnershipToYourself));
+ }
+ else
+ {
+ //涓嶈兘鑷繁鎺堟潈缁欒嚜宸�
+ this.ShowMassage(ShowMsgType.Tip, Language.StringByID(R.MyInternationalizationString.uYouCanotDelegateToYourself));
+ }
+ return;
+ }
+ this.CloseForm();
+
+ var form = new TransferingResidenceForm();
+ form.AddForm(this.memberResult, this.TransferDiv);
+ };
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs
similarity index 82%
rename from ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs
index 5a1117c..b45089f 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceByIdForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceByIdForm.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter.Residence
+namespace Shared.Phone.UserCenter.Transfer
{
/// <summary>
/// 鏍规嵁璐﹀彿鍚嶈繃鎴风殑鐢婚潰
@@ -11,6 +11,11 @@
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�
+ /// </summary>
+ private int TransferDiv = 0;
+
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -18,10 +23,15 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- public void ShowForm()
+ /// <param name="i_TransferDiv">1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�</param>
+ public void ShowForm(int i_TransferDiv)
{
+ this.TransferDiv = i_TransferDiv;
+
//璁剧疆鏍囬淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uTransferResidenceAccount));
+ base.SetTitleText(i_TransferDiv == 1
+ ? Language.StringByID(R.MyInternationalizationString.uTransferResidenceAccount)
+ : Language.StringByID(R.MyInternationalizationString.uAuthorizedAccount));
//鍒濆鍖栦腑閮ㄦ帶浠�
this.InitMiddleFrame();
@@ -64,11 +74,6 @@
bodyFrameLayout.AddChidren(btnBottom);
btnBottom.ButtonClickEvent += ((sender, e) =>
{
- //鎴愬憳ID妫�娴�
- if (this.CheckAccountId(txtCode.Text.Trim()) == false)
- {
- return;
- }
//妫�绱㈡垚鍛樹俊鎭�
string strCode = txtCode.Text.Trim();
HdlThreadLogic.Current.RunThread(() =>
@@ -94,7 +99,7 @@
var pra = new AccountInfoPra();
pra.Account = accountId;
- var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new System.Collections.Generic.List<string>() { "AccountNoExists" });
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
//鍏抽棴杩涘害鏉�
this.CloseProgressBar();
@@ -118,16 +123,12 @@
var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
infoResult.Account = accountId;
- }
- /// <summary>
- /// 妫�鏌ヨ緭鍏ョ殑鎴愬憳ID
- /// </summary>
- /// <param name="accountId"></param>
- /// <returns></returns>
- private bool CheckAccountId(string accountId)
- {
- return true;
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form2 = new AddMemberInfoForm();
+ form2.AddForm(infoResult, this.TransferDiv);
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
similarity index 80%
rename from ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs
rename to ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
index 54270de..e170e76 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Residence/TransferResidenceMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceMainForm.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Text;
-namespace Shared.Phone.UserCenter.Residence
+namespace Shared.Phone.UserCenter.Transfer
{
/// <summary>
/// 浣忓畢杩囨埛鐨勪富鐣岄潰
@@ -11,6 +11,11 @@
{
#region 鈻� 鍙橀噺澹版槑___________________________
+ /// <summary>
+ /// 1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�
+ /// </summary>
+ private int TransferDiv = 0;
+
#endregion
#region 鈻� 鍒濆鍖朹____________________________
@@ -18,10 +23,14 @@
/// <summary>
/// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
/// </summary>
- public void ShowForm()
+ /// <param name="i_TransferDiv">1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�</param>
+ public void ShowForm(int i_TransferDiv)
{
+ this.TransferDiv = i_TransferDiv;
//璁剧疆澶撮儴淇℃伅
- base.SetTitleText(Language.StringByID(R.MyInternationalizationString.uTransferOfResidence));
+ base.SetTitleText(i_TransferDiv == 1
+ ? Language.StringByID(R.MyInternationalizationString.HandoverToUser).Replace("{0}", string.Empty)
+ : Language.StringByID(R.MyInternationalizationString.AuthorizedToCommissioningPersonnel).Replace("{0}", string.Empty));
//鍒濆鍖栦腑閮ㄤ俊鎭�
this.InitMiddleFrame();
@@ -45,45 +54,38 @@
btnMsg1.TextSize = 20;
btnMsg1.IsBold = true;
btnMsg1.TextAlignment = TextAlignment.Center;
- btnMsg1.TextID = R.MyInternationalizationString.uTransferOfResidenceToOtherEvoyoAccount1;
+ btnMsg1.Text = this.TransferDiv == 1 ? "杞Щ浣忓畢鍒板叾浠栫敤鎴疯处鍙�" : "杞Щ浣忓畢鍒板叾浠栬皟璇曚汉鍛樿处鍙�";
bodyFrameLayout.AddChidren(btnMsg1);
- var btnMsg2 = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(90), false);
- btnMsg2.Y = btnMsg1.Bottom;
- btnMsg2.TextSize = 20;
- btnMsg2.IsBold = true;
- btnMsg2.TextAlignment = TextAlignment.Center;
- btnMsg2.TextID = R.MyInternationalizationString.uTransferOfResidenceToOtherEvoyoAccount2;
- bodyFrameLayout.AddChidren(btnMsg2);
//璇ユ搷浣滀笉鍙�嗭紝璇锋敞鎰忥細
var btnTip = new NormalViewControl(900, 60, true);
btnTip.X = Application.GetRealWidth(135);
- btnTip.Y = btnMsg2.Bottom + Application.GetRealHeight(167);
+ btnTip.Y = btnMsg1.Bottom + Application.GetRealHeight(257);
btnTip.TextID = R.MyInternationalizationString.uThisOperationIsIrreversiblePleaseNote;
bodyFrameLayout.AddChidren(btnTip);
- //1.鎺ユ敹鏂逛负Evoyo Home鏈夋晥娉ㄥ唽璐﹀彿
+ //1.鎺ユ敹鏂逛负鏈夋晥娉ㄥ唽璐﹀彿
var btnTipMsg1 = new NormalViewControl(900, 55, true);
btnTipMsg1.X = btnTip.X;
btnTipMsg1.Y = btnTip.Bottom + Application.GetRealHeight(30);
btnTipMsg1.TextSize = 12;
btnTipMsg1.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTipMsg1.TextID = R.MyInternationalizationString.uTheReceiverIsValidAccountForEvoyoHome;
+ btnTipMsg1.Text = "1.鎺ユ敹鏂逛负鏈夋晥娉ㄥ唽璐﹀彿";
bodyFrameLayout.AddChidren(btnTipMsg1);
- //2.鎺ユ敹鏂逛笌杩囨埛鏂逛笉鍙互涓哄悓涓�涓处鍙�
+ //2.鎺ユ敹鏂逛笌杞Щ鏂逛笉鍙互涓哄悓涓�涓处鍙�
var btnTipMsg2 = new NormalViewControl(900, 55, true);
btnTipMsg2.X = btnTip.X;
btnTipMsg2.Y = btnTipMsg1.Bottom + Application.GetRealHeight(30);
btnTipMsg2.TextSize = 12;
btnTipMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTipMsg2.TextID = R.MyInternationalizationString.uTheReceiverAndTheTransferPartyCannotBeTheSameAccount;
+ btnTipMsg2.Text = "2.鎺ユ敹鏂逛笌杞Щ鏂逛笉鍙互涓哄悓涓�涓处鍙�";
bodyFrameLayout.AddChidren(btnTipMsg2);
- //3.杩囨埛鎴愬姛鍚庯紝灏嗗彇娑堣繃鎴锋柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
+ //3.杞Щ鎴愬姛鍚庯紝灏嗗彇娑堣浆绉绘柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈
var btnTipMsg3 = new NormalViewControl(900, 55, true);
btnTipMsg3.X = btnTip.X;
btnTipMsg3.Y = btnTipMsg2.Bottom + Application.GetRealHeight(30);
btnTipMsg3.TextSize = 12;
btnTipMsg3.TextColor = UserCenterColor.Current.TextGrayColor1;
- btnTipMsg3.TextID = R.MyInternationalizationString.uIfTheTransferIsSuccessfulTheRightToUseTheHouseWillBeCancelled;
+ btnTipMsg3.Text = "3.杞Щ鎴愬姛鍚庯紝灏嗗彇娑堣浆绉绘柟鎴愬憳瀵硅浣忓畢鐨勪娇鐢ㄦ潈";
bodyFrameLayout.AddChidren(btnTipMsg3);
//杈撳叆璐﹀彿
@@ -95,7 +97,7 @@
btnInputAccount.ButtonClickEvent += (sender, e) =>
{
var form = new TransferResidenceByIdForm();
- form.AddForm();
+ form.AddForm(this.TransferDiv);
};
//鎵弿浜岀淮鐮佺殑鑳屾櫙
@@ -145,7 +147,7 @@
{
var pra = new AccountInfoPra();
pra.Account = accountId;
- var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string>() { "AccountNoExists" });
+ var byteData = UserCenterLogic.GetByteResponseDataByRequestHttps("ZigbeeUsers/GetSubAccountInfo", false, pra, new List<string> { "NotCheck" });
if (byteData == null)
{
//寮傚父
@@ -165,6 +167,12 @@
var infoResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AccountInfoResult>(revertObj.ResponseData.ToString());
infoResult.Account = accountId;
+
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form2 = new AddMemberInfoForm();
+ form2.AddForm(infoResult, this.TransferDiv);
+ });
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs
new file mode 100755
index 0000000..c0efc0b
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferResidenceResultForm.cs
@@ -0,0 +1,143 @@
+锘縰sing Shared.Phone.UserCenter;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.Transfer
+{
+ /// <summary>
+ /// 杩囨埛鐨勭粨鏋滅晫闈�
+ /// </summary>
+ public class TransferResidenceResultForm : DialogCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴浜嬩欢
+ /// </summary>
+ public Action FinishEvent = null;
+ /// <summary>
+ /// 娓呯┖浜嬩欢
+ /// </summary>
+ private bool clearEvent = true;
+ /// <summary>
+ /// 杩囨埛淇℃伅
+ /// </summary>
+ private AccountInfoResult memberResult = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_memberResult">杩囨埛淇℃伅</param>
+ /// <param name="i_result">true:鎴愬姛 false:澶辫触</param>
+ public void ShowForm(AccountInfoResult i_memberResult, bool i_result)
+ {
+ this.memberResult = i_memberResult;
+ this.CloseFormByClickBack = false;
+
+ //鍒濆鍖栦腑閮ㄦ帶浠�
+ this.InitMiddleFrame(i_result);
+ }
+
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄦ帶浠�
+ /// </summary>
+ private void InitMiddleFrame(bool success)
+ {
+ //鑳屾櫙妗�
+ var frameBack = new FrameLayout();
+ frameBack.Width = Application.GetRealWidth(838);
+ frameBack.Height = Application.GetRealHeight(1097);
+ frameBack.Y = Application.GetRealHeight(392);
+ frameBack.BackgroundColor = UserCenterColor.Current.White;
+ frameBack.Gravity = Gravity.CenterHorizontal;
+ frameBack.Radius = (uint)Application.GetRealHeight(17);
+ bodyFrameLayout.AddChidren(frameBack);
+
+ //鍏抽棴鎸夐挳(澶辫触涓撶敤)
+ if (success == false)
+ {
+ var btnCloseIcon = new IconViewControl(86);
+ btnCloseIcon.Y = Application.GetRealHeight(23);
+ btnCloseIcon.X = frameBack.Width - btnCloseIcon.IconSize - Application.GetRealWidth(58);
+ btnCloseIcon.UnSelectedImagePath = "Item/CancelIcon.png";
+ frameBack.AddChidren(btnCloseIcon);
+ btnCloseIcon.ButtonClickEvent += (sender, e) =>
+ {
+ this.CloseForm();
+ };
+ }
+
+ //鍥炬爣
+ var btnIcon = new IconViewControl(420);
+ btnIcon.Y = Application.GetRealHeight(92);
+ btnIcon.Gravity = Gravity.CenterHorizontal;
+ btnIcon.UnSelectedImagePath = success == true ? "Item/AdjustSuccessIcon.png" : "Item/AdjustFailIcon.png";
+ frameBack.AddChidren(btnIcon);
+
+ //杩囨埛鎴愬姛 / 杩囨埛澶辫触
+ var btnMsg = new NormalViewControl(frameBack.Width, Application.GetRealHeight(85), false);
+ btnMsg.Y = btnIcon.Bottom + Application.GetRealHeight(29);
+ btnMsg.TextAlignment = TextAlignment.Center;
+ btnMsg.IsBold = true;
+ btnMsg.TextSize = 20;
+ btnMsg.TextID = success == true ? R.MyInternationalizationString.uTransferSuccess : R.MyInternationalizationString.uTransferFail;
+ frameBack.AddChidren(btnMsg);
+
+ if (success == true)
+ {
+ string strMsg = Language.StringByID(R.MyInternationalizationString.uCongratulationsXXBecomingNNAdministrator);
+ string userName = string.IsNullOrEmpty(memberResult.UserName) == false ? memberResult.UserName : memberResult.Account;
+ strMsg = strMsg.Replace("{0}", userName).Replace("{1}", Common.Config.Instance.Home.Name);
+
+ //鎭枩XXXXX鎴愪负銆孨NNNN銆嶇鐞嗗憳
+ var btnMsg2 = new NormalViewControl(frameBack.Width - Application.GetRealWidth(100), Application.GetRealHeight(105), false);
+ btnMsg2.Y = btnMsg.Bottom + Application.GetRealHeight(12);
+ btnMsg2.Gravity = Gravity.CenterHorizontal;
+ btnMsg2.TextSize = 12;
+ btnMsg2.TextColor = UserCenterColor.Current.TextGrayColor1;
+ btnMsg2.TextAlignment = TextAlignment.Center;
+ btnMsg2.IsMoreLines = true;
+ btnMsg2.Text = strMsg;
+ frameBack.AddChidren(btnMsg2);
+ }
+
+ //瀹屾垚
+ var btnFinish = new BottomClickButton(688);
+ btnFinish.Y = Application.GetRealHeight(867);
+ btnFinish.TextID = success == true ? R.MyInternationalizationString.uFinish : R.MyInternationalizationString.uReDoAgain;
+ frameBack.AddChidren(btnFinish);
+ btnFinish.ButtonClickEvent += (sender, e) =>
+ {
+ this.clearEvent = false;
+
+ this.CloseForm();
+ FinishEvent?.Invoke();
+ FinishEvent = null;
+ };
+ }
+
+ #endregion
+
+ #region 鈻� 鐣岄潰鍏抽棴___________________________
+
+ /// <summary>
+ /// 鐣岄潰鍏抽棴
+ /// </summary>
+ public override void CloseFormBefore()
+ {
+ if (clearEvent == true)
+ {
+ FinishEvent = null;
+ }
+ base.CloseFormBefore();
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs
new file mode 100755
index 0000000..98816ce
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Transfer/TransferingResidenceForm.cs
@@ -0,0 +1,319 @@
+锘縰sing Shared.Common;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Shared.Phone.UserCenter.Transfer
+{
+ /// <summary>
+ /// 鎵ц杩囨埛鎿嶄綔鐨勭晫闈�
+ /// </summary>
+ public class TransferingResidenceForm : EditorCommonForm
+ {
+ #region 鈻� 鍙橀噺澹版槑___________________________
+
+ /// <summary>
+ /// 1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�
+ /// </summary>
+ private int TransferDiv = 0;
+ /// <summary>
+ /// 鎴愬憳淇℃伅
+ /// </summary>
+ private AccountInfoResult memberResult = null;
+
+ #endregion
+
+ #region 鈻� 鍒濆鍖朹____________________________
+
+ /// <summary>
+ /// 鐢婚潰鏄剧ず(搴曞眰浼氬浐瀹氳皟鐢ㄦ鏂规硶锛屽�熶互瀹屾垚鐢婚潰鍒涘缓)
+ /// </summary>
+ /// <param name="i_memberResult">璐﹀彿淇℃伅</param>
+ /// <param name="i_TransferDiv">1:绉讳氦缁欑敤鎴� 2:鎺堟潈缁欒皟璇曚汉鍛�</param>
+ public void ShowForm(AccountInfoResult i_memberResult, int i_TransferDiv)
+ {
+ this.ScrollEnabled = false;
+
+ this.TransferDiv = i_TransferDiv;
+ this.memberResult = i_memberResult;
+
+ //璁剧疆澶撮儴淇℃伅
+ base.SetTitleText(i_TransferDiv == 1
+ ? Language.StringByID(R.MyInternationalizationString.HandoverToUser).Replace("{0}", string.Empty)
+ : Language.StringByID(R.MyInternationalizationString.AuthorizedToCommissioningPersonnel).Replace("{0}", string.Empty));
+
+
+ //鍒濆鍖栦腑閮ㄤ俊鎭�
+ this.InitMiddleFrame();
+ }
+
+ /// <summary>
+ /// 鍒濆鍖栦腑閮ㄤ俊鎭�
+ /// </summary>
+ private void InitMiddleFrame()
+ {
+ //娓呯┖bodyFrame
+ this.ClearBodyFrame();
+
+ //浣忓畢鐨勫浘鏍�
+ var btnIcon1 = new PicViewControl(268, 268);
+ btnIcon1.Y = Application.GetRealHeight(366);
+ btnIcon1.X = Application.GetRealWidth(139);
+ btnIcon1.UnSelectedImagePath = "Item/TransferOfResidenceIcon.png";
+ bodyFrameLayout.AddChidren(btnIcon1);
+ //浣忓畢鍚嶅瓧 (浠ヤ腑闂翠负鍩哄噯,宸﹀彸闂磋窛50)
+ var btnHouseName = new NormalViewControl(bodyFrameLayout.Width / 2 - Application.GetRealWidth(100), Application.GetRealHeight(110), false);
+ btnHouseName.X = Application.GetRealWidth(50);
+ btnHouseName.Y = btnIcon1.Bottom + Application.GetRealHeight(23);
+ btnHouseName.IsBold = true;
+ btnHouseName.IsMoreLines = true;
+ btnHouseName.TextAlignment = TextAlignment.Center;
+ btnHouseName.TextSize = 16;
+ btnHouseName.Text = Config.Instance.Home.Name;
+ bodyFrameLayout.AddChidren(btnHouseName);
+
+ //澶村儚
+ var btnUserIcon = new ImageView();
+ btnUserIcon.Height = this.GetPictrueRealSize(268);
+ btnUserIcon.Width = this.GetPictrueRealSize(268);
+ btnUserIcon.Radius = (uint)this.GetPictrueRealSize(268) / 2;
+ if (memberResult.HeadImage != null)
+ {
+ btnUserIcon.ImageBytes = memberResult.HeadImage;
+ }
+ else
+ {
+ btnUserIcon.ImagePath = "Center/Admin.png";
+ }
+ btnUserIcon.Y = btnIcon1.Y;
+ btnUserIcon.X = bodyFrameLayout.Width - Application.GetRealWidth(139) - this.GetPictrueRealSize(268);
+ bodyFrameLayout.AddChidren(btnUserIcon);
+
+ //鏄电О (浠ヤ腑闂翠负鍩哄噯,宸﹀彸闂磋窛50)
+ var btnName = new NormalViewControl(btnHouseName.Width, btnHouseName.Height, false);
+ btnName.X = btnHouseName.Right + Application.GetRealWidth(100);
+ btnName.Y = btnHouseName.Y;
+ btnName.IsBold = true;
+ btnName.IsMoreLines = true;
+ btnName.TextAlignment = TextAlignment.Center;
+ btnName.TextSize = 16;
+ //濡傛灉瀹冩湰韬氨娌″悕瀛楃殑璇濓紝鎶婁粬鐨処D浣滀负鏄电О
+ btnName.Text = string.IsNullOrEmpty(memberResult.UserName) == true ? memberResult.Account : memberResult.UserName;
+ bodyFrameLayout.AddChidren(btnName);
+
+ //寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
+ this.StartConcetionAnimeteThread(btnIcon1.Right + Application.GetRealWidth(49));
+
+ //缁堟
+ var btnCancel = new BottomClickButton();
+ btnCancel.TextID = R.MyInternationalizationString.uTermination;
+ bodyFrameLayout.AddChidren(btnCancel);
+ btnCancel.ButtonClickEvent += (sender, e) =>
+ {
+ this.CloseForm();
+ };
+
+ //鍒濆鍖栨秷鎭帶浠�
+ this.InitMsgControl(btnCancel);
+
+ }
+
+ #endregion
+
+ #region 鈻� 鍋囨兂鍔ㄧ敾___________________________
+
+ /// <summary>
+ /// 寮�鍚繛鎺ョ殑鍋囨兂鍔ㄧ敾鏁堟灉绾跨▼
+ /// </summary>
+ private void StartConcetionAnimeteThread(int XX)
+ {
+ //鐢熸垚鐐瑰彿鍥炬牱
+ int pointXX = XX;
+ for (int i = 0; i < 7; i++)
+ {
+ var btnPoint = new NormalViewControl(14, 8, true);
+ btnPoint.Radius = (uint)Application.GetRealHeight(8) / 2;
+ btnPoint.BackgroundColor = 0xffd5d5d5;
+ btnPoint.Y = Application.GetRealHeight(498);
+ btnPoint.X = pointXX;
+ bodyFrameLayout.AddChidren(btnPoint);
+ pointXX = btnPoint.Right + Application.GetRealWidth(14);
+ }
+
+ int iconSize = this.GetPictrueRealSize(24);
+
+ var listPoint = new List<int>();
+ //璺冲姩鐨勯棿璺�
+ int intSpace = Application.GetRealWidth(14 + 14);
+ for (int i = 0; i < 7; i++)
+ {
+ //X杞�+Index*(鍥炬爣澶у皬+闂磋窛)
+ listPoint.Add(XX + i * intSpace);
+ }
+
+ var btnRound = new PicViewControl(iconSize, iconSize, false);
+ btnRound.Radius = (uint)iconSize / 2;
+ btnRound.BackgroundColor = UserCenterColor.Current.ConcetionRoundColor;
+ btnRound.X = listPoint[0];
+ btnRound.Y = Application.GetRealHeight(490);
+ bodyFrameLayout.AddChidren(btnRound);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ int index = 1;
+ while (this.Parent != null)
+ {
+ System.Threading.Thread.Sleep(500);
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ if (btnRound != null)
+ {
+ btnRound.X = listPoint[index];
+ index++;
+ if (index == listPoint.Count)
+ {
+ index = 0;
+ }
+ }
+ });
+ }
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 鎵ц杩囨埛___________________________
+
+ /// <summary>
+ /// 鎵ц杩囨埛
+ /// </summary>
+ private void DoTransferResidence()
+ {
+ this.ShowProgressBar();
+ System.Threading.Thread.Sleep(1500);
+
+ var pra2 = new
+ {
+ RequestVersion = CommonPage.RequestVersion,
+ RequestSource = 0,
+ LoginAccessToken = Config.Instance.Token,
+ HomeId = Config.Instance.Home.Id,
+ TargetAccount = this.memberResult.Account
+ };
+ var result = UserCenterLogic.GetResultCodeByRequestHttps("App/SellHome", false, pra2, new List<string> { "NotCheck" });
+ bool success = result.ToLower() == "success";
+
+ this.CloseProgressBar();
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ var form = new TransferResidenceResultForm();
+ form.AddForm(this.memberResult, success);
+ form.FinishEvent += () =>
+ {
+ if (success == false)
+ {
+ //閲嶈瘯
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ //鎵ц杩囨埛
+ this.DoTransferResidence();
+ });
+ }
+ else
+ {
+ //鎴愬姛杩囨埛 鍒欏垏鎹綇瀹�
+ var listLocalHouse = HdlResidenceLogic.Current.GetAllLocalResidenceListByDirectory();
+ if (listLocalHouse.Count == 1)
+ {
+ //濡傛灉鍙湁涓�涓綇瀹�,鍒欒繃鎴蜂箣鍚�,鐩存帴閫�鍒扮櫥闄嗙晫闈�
+ UserCenterLogic.ReLoginAgain(Config.Instance.Account);
+ return;
+ }
+ else
+ {
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ this.ShowProgressBar();
+ //鍙栦竴涓綇瀹卛d
+ string houseId = string.Empty;
+ foreach (var myHouse in listLocalHouse)
+ {
+ houseId = myHouse.Id;
+ if (houseId != Config.Instance.Home.Id)
+ {
+ //闅忎究鍙栦竴涓拰褰撳墠浣忓畢涓嶇浉绛夌殑ID
+ break;
+ }
+ }
+ //褰撳墠浣忓畢ID
+ string nowHouseId = Config.Instance.Home.Id;
+ //鍒囨崲浣忓畢
+ bool result2 = HdlResidenceLogic.Current.SwitchResidence(houseId);
+ //鍒犳帀杩欎釜鏂囦欢澶�
+ HdlResidenceLogic.Current.DeleteHouseMemmory(nowHouseId);
+
+ if (result2 == true)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ //鍏抽棴鍏ㄩ儴鐨勭晫闈�.鐩村埌浣忓畢鍒楄〃鐣岄潰
+ UserCenterLogic.CloseAllOpenForm("ResidenceListMainForm");
+ });
+ }
+ this.CloseProgressBar();
+ });
+
+ }
+ }
+ };
+ });
+ }
+
+ #endregion
+
+ #region 鈻� 涓�鑸柟娉昣__________________________
+
+ /// <summary>
+ /// 鍒濆鍖栨秷鎭帶浠�
+ /// </summary>
+ private void InitMsgControl(BottomClickButton btnCancel)
+ {
+ string msg = this.TransferDiv == 1
+ ? Language.StringByID(R.MyInternationalizationString.uHandoverToUserPleaseWaitting)
+ : Language.StringByID(R.MyInternationalizationString.uAuthorizingToDebuggingPersonnelPleaseWaitting);
+
+ //姝ｅ湪绉讳氦缁欑敤鎴�,璇风◢鍚�... 姝ｅ湪鎺堟潈缁欒皟璇曚汉鍛�,璇风◢鍚�...
+ var btnMsg = new NormalViewControl(bodyFrameLayout.Width, Application.GetRealHeight(60), false);
+ btnMsg.Y = Application.GetRealHeight(916);
+ btnMsg.TextAlignment = TextAlignment.Center;
+ btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
+ btnMsg.Text = msg;
+ bodyFrameLayout.AddChidren(btnMsg);
+
+ HdlThreadLogic.Current.RunThread(() =>
+ {
+ int timeOut = 15;
+ while (timeOut >= 0 && this.Parent != null)
+ {
+ HdlThreadLogic.Current.RunMain(() =>
+ {
+ btnMsg.Text = msg + timeOut + "s";
+ if (timeOut == 0)
+ {
+ btnMsg.Text = msg;
+ }
+ }, ShowErrorMode.NO);
+ System.Threading.Thread.Sleep(1000);
+ timeOut--;
+ }
+ if (timeOut <= 0)
+ {
+ //鎵ц杩囨埛鎿嶄綔
+ this.DoTransferResidence();
+ }
+ });
+ }
+
+ #endregion
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
index ce92e3e..5cfabb9 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/QRCodeForm.cs
@@ -25,73 +25,73 @@
/// </summary>
private void InitMiddleFrame()
{
- uint roundHeigth = (uint)Application.GetRealHeight(17);
+ uint roundHeigth = (uint)this.GetRealSizeEx(17);
//鑳屾櫙妗�
var frameBack = new FrameLayout();
- frameBack.Width = Application.GetRealWidth(688);
- frameBack.Height = Application.GetRealHeight(968);
- frameBack.Y = Application.GetRealHeight(498);
+ frameBack.Width = this.GetRealSizeEx(688);
+ frameBack.Height = this.GetRealSizeEx(968);
+ frameBack.Y = this.GetRealHeight(498);
frameBack.Gravity = Gravity.CenterHorizontal;
frameBack.Radius = roundHeigth;
bodyFrameLayout.AddChidren(frameBack);
//椤堕儴鍦嗚
var frameTop = new FrameLayout();
- frameTop.Height = Application.GetRealHeight(100);
+ frameTop.Height = this.GetRealSizeEx(100);
frameTop.BackgroundColor = 0xff232323;
frameTop.Radius = roundHeigth;
frameBack.AddChidren(frameTop);
//搴曢儴鍦嗚
var frameBottom = new FrameLayout();
- frameBottom.Y = frameBack.Height - Application.GetRealHeight(100);
- frameBottom.Height = Application.GetRealHeight(100);
+ frameBottom.Y = frameBack.Height - this.GetRealSizeEx(100);
+ frameBottom.Height = this.GetRealSizeEx(100);
frameBottom.BackgroundColor = UserCenterColor.Current.White;
frameBottom.Radius = roundHeigth;
frameBack.AddChidren(frameBottom);
//澶撮儴鏂瑰舰
var frameTitle = new FrameLayout();
- frameTitle.Height = Application.GetRealHeight(274) - frameTop.Height / 2;
+ frameTitle.Height = this.GetRealSizeEx(274) - frameTop.Height / 2;
frameTitle.Y = frameTop.Height / 2;
frameTitle.BackgroundColor = 0xff232323;
frameBack.AddChidren(frameTitle);
//鏄庣粏鏂瑰舰
var frameDetail = new FrameLayout();
- frameDetail.Height = Application.GetRealHeight(694) - frameBottom.Height / 2;
+ frameDetail.Height = this.GetRealSizeEx(694) - frameBottom.Height / 2;
frameDetail.Y = frameTitle.Bottom;
frameDetail.BackgroundColor = UserCenterColor.Current.White;
frameBack.AddChidren(frameDetail);
//鐢ㄦ埛澶村儚
var btnIcon = new ImageView();
- btnIcon.Height = this.GetPictrueRealSize(294);
- btnIcon.Width = this.GetPictrueRealSize(294);
- btnIcon.Radius = (uint)this.GetPictrueRealSize(294) / 2;
- btnIcon.Y = Application.GetRealHeight(121);
+ btnIcon.Height = this.GetRealSizeEx(294);
+ btnIcon.Width = this.GetRealSizeEx(294);
+ btnIcon.Radius = (uint)this.GetRealSizeEx(294) / 2;
+ btnIcon.Y = frameDetail.Y - this.GetRealSizeEx(294) / 2;
btnIcon.Gravity = Gravity.CenterHorizontal;
btnIcon.ImageBytes = Shared.IO.FileUtils.ReadFile(UserCenterResourse.UserInfo.UserIconFile);
frameBack.AddChidren(btnIcon);
//鐢ㄦ埛鍚�
- var btnUser = new NormalViewControl(frameBack.Width, Application.GetRealHeight(46), false);
+ var btnUser = new NormalViewControl(frameBack.Width, this.GetRealHeight(50), false);
btnUser.IsBold = true;
- btnUser.Y = Application.GetRealHeight(147);
+ btnUser.Y = btnIcon.Bottom + this.GetRealSizeEx(23);
btnUser.Text = UserCenterResourse.UserInfo.UserName;
btnUser.TextAlignment = TextAlignment.Center;
btnUser.TextColor = UserCenterColor.Current.TextGrayColor2;
- frameDetail.AddChidren(btnUser);
+ frameBack.AddChidren(btnUser);
//浜岀淮鐮�
- var btnQrCode = new PicViewControl(236, 236);
+ var btnQrCode = new PicViewControl(this.GetRealSizeEx(236), this.GetRealSizeEx(236), false);
btnQrCode.ImageBytes = QRCode.BytesFromText(UserCenterResourse.UserInfo.Account, this.GetPictrueRealSize(236), this.GetPictrueRealSize(236));
btnQrCode.Gravity = Gravity.CenterHorizontal;
- btnQrCode.Y = Application.GetRealHeight(262);
- frameDetail.AddChidren(btnQrCode);
+ btnQrCode.Y = btnUser.Bottom + this.GetRealSizeEx(69);
+ frameBack.AddChidren(btnQrCode);
//鎵竴鎵坊鍔犳垚鍛�
- var btnMsg = new NormalViewControl(frameBack.Width, Application.GetRealHeight(58), false);
- btnMsg.Y = Application.GetRealHeight(533);
+ var btnMsg = new NormalViewControl(frameBack.Width, this.GetRealHeight(60), false);
+ btnMsg.Y = btnQrCode.Bottom + this.GetRealSizeEx(35);
btnMsg.TextAlignment = TextAlignment.Center;
btnMsg.TextColor = UserCenterColor.Current.TextGrayColor3;
btnMsg.TextID = R.MyInternationalizationString.uScanAndAddMember;
- frameDetail.AddChidren(btnMsg);
+ frameBack.AddChidren(btnMsg);
}
#endregion
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
index d914a28..faa609b 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserInformationForm.cs
@@ -106,6 +106,7 @@
rowName.AddLeftCaption(Language.StringByID(R.MyInternationalizationString.uName), 350);
//鍚嶇О杈撳叆
var txtName = new TextInputControl(700, true);
+ txtName.MaxByte = 36;//闄愬埗36涓瓧鑺�
txtName.UseFocusColor = true;
txtName.X = bodyFrameLayout.Width - Application.GetRealWidth(700) - ControlCommonResourse.XXLeft;
txtName.Gravity = Gravity.CenterVertical;
@@ -121,7 +122,7 @@
});
//杈撳叆鍊兼敼鍙樹簨浠�(2020.04.05:浠ュ墠閮藉畾姝昏鎸夊洖杞﹂敭鎵嶆洿鏂�,鐜板湪鍙堣鍚嶅瓧娌℃湁鍚屾
//鎵�浠ユ墠鍑烘涓嬬瓥,娣诲姞杩欎釜浜嬩欢)
- txtName.TextChangeEventHandler += (sender, value) =>
+ txtName.TextChangedEvent += (value) =>
{
UserCenterResourse.UserInfo.UserName = value;
};
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
index db897ce..c4691c6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/UserMain/UserMainForm.cs
@@ -79,7 +79,7 @@
this.ClearBodyFrame();
//涓汉涓績
- var btnTitle = new NormalViewControl(350, 100, true);
+ var btnTitle = new NormalViewControl(450, 100, true);
btnTitle.X = ControlCommonResourse.XXLeft;
btnTitle.Y = Application.GetRealHeight(112);
btnTitle.TextColor = UserCenterColor.Current.White;
@@ -314,7 +314,7 @@
frame.ButtonClickEvent += (sender, e) =>
{
//浣忓畢鎺ュ彛涓嶉渶瑕佺壒娈婄殑鐧婚檰Token
- var form = new Residence.ResidenceListForm();
+ var form = new Residence.ResidenceListMainForm();
form.AddForm();
};
}
diff --git a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
index 04441be..7072a40 100755
--- a/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserView/HomePage.cs
@@ -59,7 +59,6 @@
{
//鐧诲綍
var loginSuccess = LoginByPWDAsync(Config.Instance.Account, Config.Instance.Password);
-
//鐧诲綍鎴愬姛,鎴栬�呮病鏈夌綉缁滈兘鍙互鐧诲綍
if (loginSuccess == 1 || loginSuccess == 2)
{
@@ -121,9 +120,7 @@
var requestObj = new SendDataToServer.LoginObj
{
Account = account,
- Password = password,
- Source = source,
- Company = company
+ Password = password
};
var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestObj);
//鐧婚檰鎺ュ彛鐗规畩,闇�瑕佸揩涓�鐐硅闂�,璁剧疆3绉掕秴鏃�
@@ -180,6 +177,11 @@
//璐﹀彿涓嶅瓨鍦�
isLoginSuccess = 0;
}
+ else if (stateCodeStr == "BERESTRICT")
+ {
+ //姝よ处鍙锋棤鏉冪櫥褰�
+ isLoginSuccess = 0;
+ }
return isLoginSuccess;
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/CommonInfo.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/CommonInfo.cs
deleted file mode 100755
index cf4e433..0000000
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/CommonInfo.cs
+++ /dev/null
@@ -1,82 +0,0 @@
-锘縰sing System;
-using System.IO;
-using System.Net;
-using System.Text;
-
-namespace ZigBee.Common
-{
- public static class CommonInfo
- {
- /// <summary>
- /// 褰撳墠鐧诲綍鐢ㄦ埛
- /// </summary>
- //public static ZigBee.Common.UserInfo LoginUser;
-
- public static Encoding EncodingUTF8 = Encoding.UTF8;
- public static Encoding EncodingGB2312 = Encoding.GetEncoding("gb2312");
- public static string RequestHttpsHost = "https://developer.hdlcontrol.com";
-
- /// <summary>
- /// 鐢熸垚鏃堕棿鎴�
- /// </summary>
- public static string GetTimeStamp()
- {
- DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1, 0, 0, 0, 0));
- DateTime nowTime = DateTime.Now;
- long unixTime = (long)System.Math.Round((nowTime - startTime).TotalMilliseconds, MidpointRounding.AwayFromZero);
- return unixTime.ToString();
- }
-
- /// <summary>
- /// Unix鏃堕棿鎴宠浆涓篊#鏍煎紡鏃堕棿
- /// </summary>
- /// <param name="timeStamp">Unix鏃堕棿鎴虫牸寮�,渚嬪1482115779</param>
- /// <returns>C#鏍煎紡鏃堕棿</returns>
- public static DateTime GetTime(string timeStamp)
- {
- DateTime dtStart = TimeZone.CurrentTimeZone.ToLocalTime(new DateTime(1970, 1, 1));
- long lTime = long.Parse(timeStamp + "0000000");
- TimeSpan toNow = new TimeSpan(lTime);
- return dtStart.Add(toNow);
- }
-
-
- /// <summary>
- /// DateTime鏃堕棿鏍煎紡杞崲涓篣nix鏃堕棿鎴虫牸寮�
- /// </summary>
- /// <param name="time"> DateTime鏃堕棿鏍煎紡</param>
- /// <returns>Unix鏃堕棿鎴虫牸寮�</returns>
- public static long ConvertDateTimeLong(System.DateTime time)
- {
- System.DateTime startTime = TimeZone.CurrentTimeZone.ToLocalTime(new System.DateTime(1970, 1, 1));
- return (long)(time - startTime).TotalSeconds;
- }
- /// <summary>
- /// Get鏈嶅姟鍣ㄦ柟娉�
- /// </summary>
- public static string GetMethod(string requestUrl)
- {
- string requestMethod = "get";
- string urlHead = $"{RequestHttpsHost}/FeerView/";
- string url = urlHead + requestUrl;
- HttpWebRequest httpWebRequestObj = WebRequest.CreateHttp(url);
- httpWebRequestObj.Method = requestMethod;
- using (HttpWebResponse httpWebResponseObj = httpWebRequestObj.GetResponse() as HttpWebResponse)
- {
- if (httpWebResponseObj == null)
- {
- return null;
- }
- else
- {
- Stream ResponseStream = httpWebResponseObj.GetResponseStream();
- using (StreamReader Sr = new StreamReader(ResponseStream))
- {
- string responseString = Sr.ReadToEnd();
- return responseString;
- }
- }
- }
- }
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index c7ded70..10053b4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -435,10 +435,6 @@
/// 缁戝畾鍦烘櫙锛屽綋BindType=1鏃跺瓨鍦�
/// </summary>
public int BindScenesId;
- /// <summary>
- /// 缁戝畾鐨勮澶囨垨鍦烘櫙鍚嶇О
- /// </summary>
- public string ESName;
}
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index bda2e51..9a3120f 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -320,17 +320,28 @@
}
else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
{
- return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
}
else if (strDeviceType == ZigBee.Device.DeviceType.ColorTemperatureLight.ToString())
{
- return Newtonsoft.Json.JsonConvert.DeserializeObject<ColorTemperatureLight>(strDeviceByte);
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorTemperatureLight>(strDeviceByte);
}
else if (strDeviceType == ZigBee.Device.DeviceType.Buzzer.ToString())
{
- return Newtonsoft.Json.JsonConvert.DeserializeObject<Buzzer>(strDeviceByte);
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<Buzzer>(strDeviceByte);
}
- else { return null; }
+ else if (strDeviceType == ZigBee.Device.DeviceType.ColorDimmableLight.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<ColorDimmableLight>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.DimmerSwitch.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<DimmerSwitch>(strDeviceByte);
+ }
+ else
+ {
+ return null;
+ }
//鑳藉皯瀛樹竴涓彉閲忓氨灏戝瓨涓�涓�
device.Type = (DeviceType)device.DeviceID;
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
index be1ae91..22dd040 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DeviceType.cs
@@ -43,10 +43,16 @@
ColorTemperatureLight = 258,
/// <summary>
/// 棰滆壊璋冨厜鐏紑鍏�
- /// <para>璁惧ID涓�2</para>
+ /// <para>璁惧ID涓�261</para>
/// <para>瀹氫箟瀵硅薄 LevelControlSwitch</para>
/// </summary>
ColorDimmerSwitch = 261,
+ /// <summary>
+ /// 璋冨厜鍣ㄦ帶鍒跺櫒
+ /// <para>璁惧ID涓�260</para>
+ /// <para>瀹氫箟瀵硅薄 DimmerSwitch</para>
+ /// </summary>
+ DimmerSwitch = 260,
/// <summary>
/// 绐楀笜璁惧ID
/// <para>Rollershade:鍗峰笜</para>
@@ -61,6 +67,7 @@
/// 璁惧ID涓�528鐨勮澶�
/// <para>棰滆壊璋冨厜鐏細鏀寔浜害/鑹插害/楗卞拰搴�</para>
/// <para>璋冨厜璁惧</para>
+ /// <para>瀹氫箟瀵硅薄锛欳olorDimmableLight</para>
/// </summary>
ColorDimmableLight = 528,
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmerSwitch.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmerSwitch.cs
new file mode 100755
index 0000000..8cafd61
--- /dev/null
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmerSwitch.cs
@@ -0,0 +1,17 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace ZigBee.Device
+{
+ /// <summary>
+ /// 璋冨厜鍣ㄦ帶鍒跺櫒
+ /// </summary>
+ public class DimmerSwitch : LightBase
+ {
+ public DimmerSwitch()
+ {
+ this.Type = DeviceType.DimmerSwitch;
+ }
+ }
+}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index 26aad3f..aed8f7a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -1322,12 +1322,12 @@
/// </summary>
public ErrorResponData errorResponData;
/// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��)
+ ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�(杩欎釜鏄偣鍑诲悗鐨勫��,鎴栬�� 1-6骞叉帴鐐圭殑鑳屽厜鐏�)
/// </summary>
public int panelDirectionsLevel = -1;
/// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��)
+ /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�(杩欎釜鏄偣鍑诲墠鐨勫��,鎴栬�� 绗竷骞叉帴鐐圭殑鑳屽厜鐏�)
/// </summary>
public int panelBacklightLevel = -1;
}
diff --git a/ZigbeeApp/Shared/R.cs b/ZigbeeApp/Shared/R.cs
index 1d4ae1d..1f4212d 100755
--- a/ZigbeeApp/Shared/R.cs
+++ b/ZigbeeApp/Shared/R.cs
@@ -1642,8 +1642,514 @@
/// 褰撳墠 浜害
/// </summary>
public const int CurrentLightLevel = 13604;
-
-
+ /// <summary>
+ /// 妯℃澘
+ /// </summary>
+ public const int Templation = 13605;
+ /// <summary>
+ /// 璇诲彇涓�
+ /// </summary>
+ public const int Reading = 13606;
+ /// <summary>
+ /// 娣诲姞浣忓畢
+ /// </summary>
+ public const int AddResidence = 13607;
+ /// <summary>
+ /// 鏂板缓浣忓畢
+ /// </summary>
+ public const int CreatNewResidence = 13608;
+ /// <summary>
+ /// 鑷畾涔�
+ /// </summary>
+ public const int Customize = 13609;
+ /// <summary>
+ /// 椤圭洰鍚�
+ /// </summary>
+ public const int ProgramName = 13610;
+ /// <summary>
+ /// 璇峰～鍐欓」鐩悕绉�
+ /// </summary>
+ public const int PleaseInputProgramName = 13611;
+ /// <summary>
+ /// 妤煎彿
+ /// </summary>
+ public const int FloorNo = 13612;
+ /// <summary>
+ /// 1-100涔嬮棿
+ /// </summary>
+ public const int BetweenOneAndHundred = 13613;
+ /// <summary>
+ /// 鍗曞厓鍙�
+ /// </summary>
+ public const int UnitNo = 13614;
+ /// <summary>
+ /// 鎴峰彿
+ /// </summary>
+ public const int HouseholdsNo = 13615;
+ /// <summary>
+ /// 灞傚彿鍔犳埧鍙凤紝渚嬪0201
+ /// </summary>
+ public const int HouseholdsNoTip = 13616;
+ /// <summary>
+ /// 涓句緥锛氭垚閮介噾鍫傞噾鑼傚簻椤圭洰-2鏍�-3鍗曞厓-0201鎴�
+ /// </summary>
+ public const int HouseholdsNoExample = 13617;
+ /// <summary>
+ /// 閫夋嫨鍒涘缓鏂瑰紡
+ /// </summary>
+ public const int SelectCreatMode = 13618;
+ /// <summary>
+ /// 鏂瑰紡
+ /// </summary>
+ public const int Way = 13619;
+ /// <summary>
+ /// 鏈夋ā鏉�
+ /// </summary>
+ public const int HadTemplate = 13620;
+ /// <summary>
+ /// 鏃犳ā鏉�
+ /// </summary>
+ public const int NotHadTemplate = 13621;
+ /// <summary>
+ /// 鏃犺澶囧垱寤�
+ /// </summary>
+ public const int NotHadDeviceToCreat = 13622;
+ /// <summary>
+ /// 鏈夎澶囧垱寤�
+ /// </summary>
+ public const int HadDeviceToCreat = 13623;
+ /// <summary>
+ /// 鑷畾涔夋柊寤轰綇瀹�
+ /// </summary>
+ public const int CustomCreatNewResidence = 13624;
+ /// <summary>
+ /// 鑷畾涔夊悕绉�
+ /// </summary>
+ public const int CustomName = 13625;
+ /// <summary>
+ /// 鑷畾涔夊唴瀹�
+ /// </summary>
+ public const int CustomContent = 13626;
+ /// <summary>
+ /// 浣忓畢閰嶇疆
+ /// </summary>
+ public const int ResidenceSettion = 13627;
+ /// <summary>
+ /// 鏃犳ā鏉挎湁璁惧
+ /// </summary>
+ public const int NotTemplateAndHadDevice = 13628;
+ /// <summary>
+ /// 鏈夋ā鏉挎湁璁惧
+ /// </summary>
+ public const int HadTemplateAndHadDevice = 13629;
+ /// <summary>
+ /// 鏃犳ā鏉挎棤璁惧
+ /// </summary>
+ public const int NotTemplateAndNotDevice = 13630;
+ /// <summary>
+ /// 鍖哄煙
+ /// </summary>
+ public const int Area = 13631;
+ /// <summary>
+ /// 璁惧鍜屽姛鑳�
+ /// </summary>
+ public const int DeviceAndFunction = 13632;
+ /// <summary>
+ /// 妤煎眰鏁�
+ /// </summary>
+ public const int FloorCount = 13633;
+ /// <summary>
+ /// 鎴块棿鏁�
+ /// </summary>
+ public const int RoomCount = 13634;
+ /// <summary>
+ /// 璁惧鏁�
+ /// </summary>
+ public const int DeviceCount = 13635;
+ /// <summary>
+ /// 鍔熻兘鏁�
+ /// </summary>
+ public const int FunctionCount = 13636;
+ /// <summary>
+ /// 鏃犲睆缃戝叧
+ /// </summary>
+ public const int NotScreanGateway = 13637;
+ /// <summary>
+ /// 璺敱缃戝叧
+ /// </summary>
+ public const int RouterGateway = 13638;
+ /// <summary>
+ /// 鏈夌綉绾挎坊鍔犵綉鍏�
+ /// </summary>
+ public const int AddGatewayByNetworkCable = 13639;
+ /// <summary>
+ /// WIFI娣诲姞缃戝叧
+ /// </summary>
+ public const int AddGatewayByWifi = 13640;
+ /// <summary>
+ /// 璁惧鍒楄〃
+ /// </summary>
+ public const int DeviceList = 13641;
+ /// <summary>
+ /// 宸叉悳绱㈣澶囨暟锛�
+ /// </summary>
+ public const int HadScanDeviceCount = 13642;
+ /// <summary>
+ /// 涓�
+ /// </summary>
+ public const int An = 13643;
+ /// <summary>
+ /// 鍙栨秷鎼滅储
+ /// </summary>
+ public const int CancelSearch = 13644;
+ /// <summary>
+ /// 淇″彿
+ /// </summary>
+ public const int Signal = 13645;
+ /// <summary>
+ /// 瑙ｇ粦
+ /// </summary>
+ public const int UnBind = 13646;
+ /// <summary>
+ /// 璁惧鍑哄巶鍚嶇О
+ /// </summary>
+ public const int FactoryNameOfEquipmen = 13647;
+ /// <summary>
+ /// 璁惧澶囨敞鍚嶇О
+ /// </summary>
+ public const int DeviceNoteName = 13648;
+ /// <summary>
+ /// 鐐瑰嚮缂栬緫妤煎眰涓庡娉�
+ /// </summary>
+ public const int ClickAndEditorRoomAndNote = 13649;
+ /// <summary>
+ /// 缃戝叧閫夋嫨
+ /// </summary>
+ public const int GatewaySelect = 13650;
+ /// <summary>
+ /// 鍦烘櫙鍒楄〃
+ /// </summary>
+ public const int SceneList = 13651;
+ /// <summary>
+ /// 鏆傛棤鍦烘櫙,璇锋坊鍔�
+ /// </summary>
+ public const int NotScenePleaseAdd = 13652;
+ /// <summary>
+ /// 铏氭嫙
+ /// </summary>
+ public const int Virtual = 13653;
+ /// <summary>
+ /// 鏈湴
+ /// </summary>
+ public const int Local = 13654;
+ /// <summary>
+ /// 杩滅▼
+ /// </summary>
+ public const int Remote = 13655;
+ /// <summary>
+ /// 浣忓畢鍒楄〃
+ /// </summary>
+ public const int ResidenceList = 13656;
+ /// <summary>
+ /// 鎼滅储浣忓畢鍏抽敭璇�
+ /// </summary>
+ public const int SearchResidenceKeyWorld = 13657;
+ /// <summary>
+ /// 鎴峰悕
+ /// </summary>
+ public const int ResidenceName2 = 13658;
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ public const int EditorTime = 13659;
+ /// <summary>
+ /// 纭鍒囨崲
+ /// </summary>
+ public const int ConfirmSwitch = 13660;
+ /// <summary>
+ /// 璇疯緭鍏ヨ嚜瀹氫箟鍚嶇О
+ /// </summary>
+ public const int PleaseInputCustomName = 13661;
+ /// <summary>
+ /// 璇疯緭鑷畾涔夊唴瀹�
+ /// </summary>
+ public const int PleaseInputCustomContent = 13662;
+ /// <summary>
+ /// 榛樿
+ /// </summary>
+ public const int Default = 13663;
+ /// <summary>
+ /// 鐢辫繎鍒拌繙
+ /// </summary>
+ public const int FromNearToFar = 13664;
+ /// <summary>
+ /// 鐢辫繙鍒拌繎
+ /// </summary>
+ public const int FromFarToNear = 13665;
+ /// <summary>
+ /// 杩斿洖{0}涓婚〉
+ /// </summary>
+ public const int GobackToHomePage2 = 13666;
+ /// <summary>
+ /// 淇濆瓨妯℃澘{0}鍒癆PP
+ /// </summary>
+ public const int SaveTemplateDataToApp2 = 13667;
+ /// <summary>
+ /// 淇濆瓨澶囦唤{0}鍒癆PP
+ /// </summary>
+ public const int SaveBackDataToApp2 = 13668;
+ /// <summary>
+ /// 鏈湴澶囦唤淇濆瓨鎴愬姛
+ /// </summary>
+ public const int SaveLocalBackDataSuccess = 13669;
+ /// <summary>
+ /// 澶囦唤鏁版嵁宸茬粡瀛樺湪,鏄惁瑕嗙洊?
+ /// </summary>
+ public const int BackUpDataIsEsixtAndPickUp = 13670;
+ /// <summary>
+ /// 妫�娴嬩笉鍒板彲渚涢�夋嫨鐨勬ā鏉挎暟鎹�
+ /// </summary>
+ public const int NotHadTemplateDataToSelect = 13671;
+ /// <summary>
+ /// 閫夋嫨妯℃澘
+ /// </summary>
+ public const int SelectTemplate = 13672;
+ /// <summary>
+ /// 宸查�夋ā鐗�
+ /// </summary>
+ public const int HadSelectTemplate = 13673;
+ /// <summary>
+ /// 璇烽�夋嫨妯℃澘瀵硅薄
+ /// </summary>
+ public const int PleaseSelectTemplate = 13674;
+ /// <summary>
+ /// {0}杩樻病鏈夐�夋嫨妯℃澘瀵硅薄,纭瑕佽繑鍥�?
+ /// </summary>
+ public const int HadNotSelectTemplateAndGoBack = 13675;
+ /// <summary>
+ /// 妯℃澘涓搴旂殑缃戝叧
+ /// </summary>
+ public const int CorrespondingGatewayInTemplate = 13676;
+ /// <summary>
+ /// 鍙栨秷缁戝畾
+ /// </summary>
+ public const int CancelBinded = 13677;
+ /// <summary>
+ /// 妯℃澘涓搴旂殑缃戝叧杩樻病璁剧疆{0}纭瑕佽繑鍥烇紵
+ /// </summary>
+ public const int HadNotSelectTemplateAndGoBack2 = 13678;
+ /// <summary>
+ /// 妯℃澘涓澶囨暟锛�
+ /// </summary>
+ public const int DeviceCountInTemplate = 13679;
+ /// <summary>
+ /// 璇烽�夋嫨妯℃澘涓殑璁惧
+ /// </summary>
+ public const int PleaseSelectTemplateDevice = 13680;
+ /// <summary>
+ /// 妯℃澘涓搴旂殑璁惧
+ /// </summary>
+ public const int CorrespondingDeviceInTemplate = 13681;
+ /// <summary>
+ /// 妯℃澘
+ /// </summary>
+ public const int Template = 13683;
+ /// <summary>
+ /// 纭鍒犻櫎銆寋0}銆嶈澶囧強鍔熻兘锛�
+ /// </summary>
+ public const int DeleteDeviceMsg2 = 13684;
+ /// <summary>
+ /// 妯＄増璁惧鏁颁笌缁戝畾璁惧鏁颁笉涓�鑷磠0}璇锋鏌ヨ澶�
+ /// </summary>
+ public const int TemplateCountAndDeviceCountIsNotEqualMsg = 13685;
+ /// <summary>
+ /// 瀵煎叆鍔熻兘涓庡満鏅�
+ /// </summary>
+ public const int ImportFunctionAndScene = 13686;
+ /// <summary>
+ /// 鏈夎澶囨湭閫夋嫨妯℃澘
+ /// </summary>
+ public const int IsExsitNotSelectTemplateDevice = 13687;
+ /// <summary>
+ /// 鎵嬫満浼犵綉鍏�
+ /// </summary>
+ public const int PhoneSendToGateway = 13688;
+ /// <summary>
+ /// 缃戝叧浼犺澶�
+ /// </summary>
+ public const int GatewaySendToDevice = 13689;
+ /// <summary>
+ /// 棰勮鎬昏�楁椂
+ /// </summary>
+ public const int EstimatedTotalTime = 13690;
+ /// <summary>
+ /// 涓�閿鍏�
+ /// </summary>
+ public const int OneClickImport = 13691;
+ /// <summary>
+ /// 妯℃澘涓㈠け,璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆
+ /// </summary>
+ public const int TemplateDataIsLostPleaseReSetMsg = 13692;
+ /// <summary>
+ /// 璇峰厛閫夋嫨缃戝叧鐨勬ā鏉垮璞�
+ /// </summary>
+ public const int PleaseSelectgatewayTemplateBefore = 13693;
+ /// <summary>
+ /// 璁惧涓庢ā鏉垮凡缁忓畬鍏ㄥ尮閰�
+ /// </summary>
+ public const int DeviceAndTemplateAlreadyMatchExactly = 13694;
+ /// <summary>
+ /// 鏈湴澶囦唤
+ /// </summary>
+ public const int LocalBackup = 13695;
+ /// <summary>
+ /// 浜戠澶囦唤
+ /// </summary>
+ public const int CloudBackup = 13696;
+ /// <summary>
+ /// 鎭㈠鍒皗0}鏈湴
+ /// </summary>
+ public const int RecoverToLocation = 13697;
+ /// <summary>
+ /// 涓婁紶鍒皗0}浜戠
+ /// </summary>
+ public const int UplaodToCloud = 13698;
+ /// <summary>
+ /// 涓嬭浇鍒癆PP
+ /// </summary>
+ public const int DownLoadToApp = 13699;
+ /// <summary>
+ /// 纭畾涓嬭浇姝ゅ浠藉埌APP?
+ /// </summary>
+ public const int ComfirmDownLoadThisBackupToApp = 13700;
+ /// <summary>
+ /// 璇风偣鍑讳笂鏂硅彍鍗�,閲嶆柊璁剧疆椤圭洰绫诲瀷
+ /// </summary>
+ public const int PleaseClickTopMenuAndResetProgramType = 13701;
+ /// <summary>
+ /// 纭畾涓婁紶鎸囧畾澶囦唤鍒颁簯绔�?
+ /// </summary>
+ public const int ComfirmUploadBackupToCloud = 13702;
+ /// <summary>
+ /// 澶囦唤鏁版嵁涓嬭浇鎴愬姛
+ /// </summary>
+ public const int DownLoadBackuoSuccess = 13703;
+ /// <summary>
+ /// 纭畾灏嗘暟鎹仮澶嶅埌鏈湴锛�
+ /// </summary>
+ public const int ComfirmRecoverBackupToLocation = 13704;
+ /// <summary>
+ /// 绉讳氦缁檣0}鐢ㄦ埛
+ /// </summary>
+ public const int HandoverToUser = 13705;
+ /// <summary>
+ /// 鎺堟潈缁檣0}璋冭瘯浜哄憳
+ /// </summary>
+ public const int AuthorizedToCommissioningPersonnel = 13706;
+ /// <summary>
+ /// 閰嶇疆{0}浣忓畢
+ /// </summary>
+ public const int AllocationOfHousing = 13707;
+ /// <summary>
+ /// 鍒囨崲{0}浣忓畢
+ /// </summary>
+ public const int SwitchResidence2 = 13708;
+ /// <summary>
+ /// 鏈湴妯℃澘
+ /// </summary>
+ public const int LocalTemplate = 13709;
+ /// <summary>
+ /// 浜戠妯℃澘
+ /// </summary>
+ public const int CloudTemplate = 13710;
+ /// <summary>
+ /// 鏈湴杩樻病鏈夋ā鏉�
+ /// </summary>
+ public const int NotHadTemplateInLocal = 13711;
+ /// <summary>
+ /// 妯℃澘瀵煎叆鎴愬姛
+ /// </summary>
+ public const int ImportTemplateSuccess = 13712;
+ /// <summary>
+ /// 鍔熻兘鍦烘櫙宸插叏閮ㄥ鍏�
+ /// </summary>
+ public const int AllFUnctionAndSceneHadImported = 13713;
+ /// <summary>
+ /// 妯℃澘瀵煎叆澶辫触
+ /// </summary>
+ public const int ImportTemplateFail = 13714;
+ /// <summary>
+ /// 鏌ョ湅鍘熷洜
+ /// </summary>
+ public const int ViewReason = 13715;
+ /// <summary>
+ /// 瀵煎嚭鏂囨湰{0}璇存槑
+ /// </summary>
+ public const int ExportTextExplain = 13716;
+ /// <summary>
+ /// 杩樻病鏈夊垱寤哄尯鍩�
+ /// </summary>
+ public const int DoNotHadAddedRoom = 13717;
+ /// <summary>
+ /// 浜戠杩樻病鏈夋ā鏉�
+ /// </summary>
+ public const int NotHadTemplateInDb = 13718;
+ /// <summary>
+ /// 涓嬭浇鎴愬姛
+ /// </summary>
+ public const int DownLoadSuccess = 13719;
+ /// <summary>
+ /// 涓嬭浇澶辫触
+ /// </summary>
+ public const int DownLoadFail = 13720;
+ /// <summary>
+ /// 淇濆瓨鍒颁簯绔�
+ /// </summary>
+ public const int SaveToColund = 13721;
+ /// <summary>
+ /// 璇疯緭鍏ユā鏉垮悕瀛�
+ /// </summary>
+ public const int PleaseInputTemplateName = 13722;
+ /// <summary>
+ /// 妯℃澘鍚嶅瓧宸茬粡瀛樺湪
+ /// </summary>
+ public const int TheTemplateNameIsEsixt = 13723;
+ /// <summary>
+ /// 涓婁紶妯℃澘鎴愬姛
+ /// </summary>
+ public const int UploadTemplateSuccess = 13724;
+ /// <summary>
+ /// 涓婁紶妯℃澘澶辫触
+ /// </summary>
+ public const int UploadTemplateFail = 13725;
+ /// <summary>
+ /// 姝よ处鍙锋棤鏉冪櫥褰�
+ /// </summary>
+ public const int ThisAccountHasNoAuthorityToLogin = 13726;
+ /// <summary>
+ /// 涓嬭浇妯℃澘澶辫触
+ /// </summary>
+ public const int DownloadTemplateFail = 13727;
+ /// <summary>
+ /// 缂栬緫浣忓畢鍚嶇О澶辫触
+ /// </summary>
+ public const int uEditorResidenceNameFail = 13728;
+ /// <summary>
+ /// 缂栬緫浣忓畢鍖哄煙澶辫触
+ /// </summary>
+ public const int uEditorResidenceAreaFail = 13729;
+ /// <summary>
+ /// 涓嶈兘鑷繁杩囨埛缁欒嚜宸�
+ /// </summary>
+ public const int uYouCannotTransferOwnershipToYourself = 13730;
+ /// <summary>
+ /// 涓嶈兘鑷繁鎺堟潈缁欒嚜宸�
+ /// </summary>
+ public const int uYouCanotDelegateToYourself = 13731;
+ /// <summary>
+ /// 鎺堟潈璐﹀彿
+ /// </summary>
+ public const int uAuthorizedAccount = 13732;
/// <summary>
@@ -5950,6 +6456,30 @@
/// 涓嶅叧闂�
/// </summary>
public const int uNotClose = 16160;
+ /// <summary>
+ /// 缁堟
+ /// </summary>
+ public const int uTermination = 16161;
+ /// <summary>
+ /// 姝ｅ湪绉讳氦缁欑敤鎴�,璇风◢鍚�...
+ /// </summary>
+ public const int uHandoverToUserPleaseWaitting = 16162;
+ /// <summary>
+ /// 姝ｅ湪鎺堟潈缁欒皟璇曚汉鍛�,璇风◢鍚�...
+ /// </summary>
+ public const int uAuthorizingToDebuggingPersonnelPleaseWaitting = 16163;
+ /// <summary>
+ /// 杩囨埛鎴愬姛
+ /// </summary>
+ public const int uTransferSuccess = 16164;
+ /// <summary>
+ /// 杩囨埛澶辫触
+ /// </summary>
+ public const int uTransferFail = 16165;
+ /// <summary>
+ /// 鎭枩XXXXX鎴愪负銆孨NNNN銆嶇鐞嗗憳
+ /// </summary>
+ public const int uCongratulationsXXBecomingNNAdministrator = 16166;
//鈽呪槄鈽呪槄涓嬮潰杩欎簺鏄帴鍙ｇ殑杩斿洖淇℃伅缈昏瘧,浠�18000寮�濮嬧槄鈽呪槄鈽�
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index c60f196..bb0cba8 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -109,7 +109,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceColorTemperatureCardControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DeviceFreshAirCardControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceCard\DevicePmSensorCardControl.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceFunctionUnallocatedControl.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceFunctionMenuControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\Controls\DeviceSelectUnallocatedControl.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\SelectLocalDeviceImageForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\MainPage\DeviceDetailInfoForm.cs" />
@@ -141,6 +141,7 @@
<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\TemplateDataFormLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\TemplateData\TemplateDeviceDataLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\AbountForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Abount\SLAForm.cs" />
@@ -186,6 +187,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayBackupLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlGatewayUpdateLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlLogLogic.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlMessageLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlResidenceLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlRoomLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSceneLogic.cs" />
@@ -310,14 +312,18 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\EditorRoomInforForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\FloorListRoomForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomDeviceListForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceListMainForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceManagementForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\LookRoomSettionForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\TransferResidenceByIdForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\TransferResidenceMainForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\AlarmTargetStatuSelectAcForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswAddNewForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\CoercePswEditorForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Safety\PasswordUserEditorForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Transfer\TransferingResidenceForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Transfer\TransferMemberInfoForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Transfer\TransferResidenceByIdForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Transfer\TransferResidenceMainForm.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Transfer\TransferResidenceResultForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\MessageManagementForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\UserMain\QRCodeForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Password\ResetAccountPasswordForm.cs" />
@@ -411,7 +417,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\AddMemberSuccessForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Member\SubAccountLevelUpSuccessForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\OtherParty\OtherPartyAccountMenuForm.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\Residence\ResidenceListForm.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\ControlCommonResourse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\DirectoryFileNameResourse.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Resourse\FirmwareUpdateResourse.cs" />
@@ -447,6 +452,7 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ColorDimmerSwitch.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ColorTemperatureLight.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DimmableLight.cs" />
+ <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DimmerSwitch.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\DoorLock.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\FreshAir.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HumiditySensor.cs" />
@@ -493,7 +499,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Application.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\BigInteger.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\CloudMqttResponsePack.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\CommonInfo.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Config.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\EncryptionService.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Common\Global.cs" />
--
Gitblit v1.8.0