From ceeb0ef05eba599c96238f2469fb1815b5f5bd78 Mon Sep 17 00:00:00 2001
From: wei <kaede@kaededeMacBook-Air.local>
Date: 星期二, 07 九月 2021 16:18:53 +0800
Subject: [PATCH] 安卓信息推送开关
---
HDL-ON_Android/Properties/AndroidManifest.xml | 5
HDL_APP_Project.sln | 4
HDL-ON_Android/Assets/Language.ini | 2
HDL_ON/UI/UI2/UserPage.cs | 15 +
HDL_ON/Entity/DB_ResidenceData.cs | 18 +
HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs | 4
HDL-ON_Android/HDL-ON_Android.csproj | 8
HDL-ON_iOS/Info.plist | 4
HDL-ON_iOS/Resources/Language.ini | 2
HDL_ON/DAL/Server/HttpUtil.cs | 4
HDL-ON_Android/Resources/Resource.designer.cs | 575 ++++++++++++++++++++++----------------------
HDL_ON/Common/R.cs | 5
.vs/HDL_APP_Project/xs/UserPrefs.xml | 61 ----
HDL_ON/UI/MainPage.cs | 2
HDL-ON_Android/Application.cs | 18
15 files changed, 360 insertions(+), 367 deletions(-)
diff --git a/.vs/HDL_APP_Project/xs/UserPrefs.xml b/.vs/HDL_APP_Project/xs/UserPrefs.xml
index 694cda0..728da04 100644
--- a/.vs/HDL_APP_Project/xs/UserPrefs.xml
+++ b/.vs/HDL_APP_Project/xs/UserPrefs.xml
@@ -1,68 +1,15 @@
锘�<Properties StartupConfiguration="{D998E133-F0DD-4760-BE3C-461632F54DA4}|Default">
<MonoDevelop.Ide.ItemProperties.HDL-ON__iOS PreferredExecutionTarget="MonoDevelop.IPhone.IPhoneDeviceTarget.6242be7109c740c6cb8999a8904b6e0ea8d45192" />
- <MonoDevelop.Ide.Workbench ActiveDocument="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs">
+ <MonoDevelop.Ide.Workbench>
<Files>
- <File FileName="HDL_ON/DAL/Server/HttpUtil.cs" Line="27" Column="19" />
+ <File FileName="HDL-ON_Android/Assets/Language.ini" Line="1" Column="1" />
<File FileName="HDL-ON_iOS/Info.plist" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/LightScene/AddLightScene.cs" Line="383" Column="53" />
- <File FileName="HDL_ON/Common/R.cs" Line="9" Column="34" />
- <File FileName="HDL-ON_iOS/Resources/Language.ini" Line="1616" Column="9" />
- <File FileName="HDL-ON_Android/Assets/Language.ini" Line="2217" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/ColorTureLampPage.cs" Line="640" Column="26" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Light/RGBPage.cs" Line="170" Column="14" />
- <File FileName="HDL_ON/Entity/Function/Light.cs" Line="14" Column="49" />
- <File FileName="HDL_ON/UI/UI1-Login/LoginPage.cs" Line="225" Column="23" />
- <File FileName="HDL_ON/UI/UI2/2-Classification/FunctionPage.cs" Line="36" Column="10" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/CurtainModulePage.cs" Line="1" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPage.cs" Line="152" Column="1" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/MotorCurtainPageBLL.cs" Line="234" Column="66" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPage.cs" Line="148" Column="74" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/Curtain/RollingShutterPageBLL.cs" Line="261" Column="28" />
- <File FileName="HDL_ON/UI/UI2/FuntionControlView/FunctionBaseInfoSetPageBLL.cs" Line="70" Column="30" />
</Files>
<Pads>
<Pad Id="ProjectPad">
<State name="__root__">
<Node name="HDL_APP_Project" expanded="True">
- <Node name="HDL_ON" expanded="True">
- <Node name="Common" expanded="True" />
- <Node name="DAL" expanded="True">
- <Node name="Server" expanded="True" />
- </Node>
- <Node name="UI" expanded="True">
- <Node name="UI0-Public" expanded="True" />
- <Node name="UI1-Login" expanded="True" />
- <Node name="UI2" expanded="True">
- <Node name="1-HomePage" expanded="True" />
- <Node name="2-Classification" expanded="True" />
- <Node name="FuntionControlView" expanded="True">
- <Node name="Curtain" expanded="True" />
- <Node name="Electrical" expanded="True" />
- <Node name="Light" expanded="True">
- <Node name="LightScene" expanded="True" />
- </Node>
- <Node name="FunctionBaseInfoSetPageBLL.cs" selected="True" />
- </Node>
- </Node>
- </Node>
- </Node>
- <Node name="HDL-ON_Android" expanded="True">
- <Node name="Assets" expanded="True">
- <Node name="Phone" expanded="True" />
- </Node>
- </Node>
- <Node name="HDL-ON_iOS" expanded="True">
- <Node name="Resources" expanded="True">
- <Node name="Phone" expanded="True">
- <Node name="FunctionIcon" expanded="True">
- <Node name="Light" expanded="True">
- <Node name="LightScene" expanded="True" />
- </Node>
- </Node>
- <Node name="Public" expanded="True" />
- </Node>
- </Node>
- </Node>
+ <Node name="HDL-ON_iOS" expanded="True" selected="True" />
</Node>
</State>
</Pad>
@@ -74,7 +21,7 @@
<String>Shared.Droid.TouchID/Shared.Droid.TouchID.csproj</String>
<String>Shared.IOS/Shared.IOS.csproj</String>
</DisabledProjects>
- <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|iPhone" />
+ <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.HDL-ON__Android PreferredExecutionTarget="Android.SelectDevice" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore>
diff --git a/HDL-ON_Android/Application.cs b/HDL-ON_Android/Application.cs
index 7a4f0db..4c277a1 100644
--- a/HDL-ON_Android/Application.cs
+++ b/HDL-ON_Android/Application.cs
@@ -137,8 +137,6 @@
BaseActivity.OnResumeAction += (activity) =>
{
checkSomeInfo();
-
-
};
BaseActivity.OnDestroyAction += (activity) =>
{
@@ -146,7 +144,6 @@
//BusSocket.Stop();
//UserInfo.Current.unlockTime = DateTime.Now;
};
-
HDLUtils.SetAuthoritiesName("com.hdl.onpro.fileProvider");
@@ -168,8 +165,6 @@
}
MainPage.Log($"缁忕含搴�:::{lon}:{lat}");
};
-
-
}
/// <summary>
@@ -178,10 +173,8 @@
/// <param name="activity"></param>
void GetJPushRegistrationID(BaseActivity activity)
{
-
try
{
-
//淇濆瓨鑾峰彇鐨勬瀬鍏夋湇鍔″櫒涓婄殑娉ㄥ唽ID鍒版湰鍦版枃浠�
var tokenID = JPushInterface.GetRegistrationID(activity);
Console.WriteLine("RegistrationID: " + tokenID);
@@ -400,6 +393,17 @@
base.Dispose(disposing);
}
+ /// <summary>
+ /// 鏌ヨ閫氱煡鏉冮檺锛屽苟鎻愮ず
+ /// </summary>
+ public void QueryNotificationPermission()
+ {
+
+
+ }
+
+
+
}
}
diff --git a/HDL-ON_Android/Assets/Language.ini b/HDL-ON_Android/Assets/Language.ini
index 76f8b23..6b2bf94 100644
--- a/HDL-ON_Android/Assets/Language.ini
+++ b/HDL-ON_Android/Assets/Language.ini
@@ -497,6 +497,7 @@
509=Please enter security name.
510=Please select the deployment target.
511=Combined dimming
+512=Message push is not enabled, please go to settings.
1000=Room Humidity
@@ -1614,6 +1615,7 @@
509=璇疯緭鍏ュ畨闃插悕绉般��
510=璇烽�夋嫨甯冮槻鐩爣銆�
511=缁勫悎璋冨厜
+512=娑堟伅鎺ㄩ�佹湭寮�鍚紝璇峰墠寰�璁剧疆銆�
1000=瀹ゅ唴婀垮害
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 69087ed..737fee6 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -37,8 +37,8 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidDexTool>d8</AndroidDexTool>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
- <AndroidKeyStore>true</AndroidKeyStore>
- <AndroidSigningKeyStore>D:\job\job\On+\HDL_APP_Project\on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidKeyStore>True</AndroidKeyStore>
+ <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
@@ -63,8 +63,8 @@
<MandroidI18n>cjk</MandroidI18n>
<AndroidEnableSGenConcurrent>false</AndroidEnableSGenConcurrent>
<AndroidUseSharedRuntime>false</AndroidUseSharedRuntime>
- <AndroidKeyStore>true</AndroidKeyStore>
- <AndroidSigningKeyStore>D:\job\job\On+\HDL_APP_Project\on_plus.keystore</AndroidSigningKeyStore>
+ <AndroidKeyStore>True</AndroidKeyStore>
+ <AndroidSigningKeyStore>/Users/kaede/Desktop/HDL_APP_Project/on_plus.keystore</AndroidSigningKeyStore>
<AndroidSigningStorePass>85521566</AndroidSigningStorePass>
<AndroidSigningKeyPass>85521566</AndroidSigningKeyPass>
<AndroidSigningKeyAlias>on_plus</AndroidSigningKeyAlias>
diff --git a/HDL-ON_Android/Properties/AndroidManifest.xml b/HDL-ON_Android/Properties/AndroidManifest.xml
index 45f7e3c..bf47942 100644
--- a/HDL-ON_Android/Properties/AndroidManifest.xml
+++ b/HDL-ON_Android/Properties/AndroidManifest.xml
@@ -1,5 +1,5 @@
锘�<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202109021" android:versionName="1.2.202109021" package="com.hdl.onpro">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="202109071" android:versionName="1.2.202109071" package="com.hdl.onpro">
<uses-sdk android:minSdkVersion="23" android:targetSdkVersion="28" />
<!-- 涔愭鍙瀵硅闇�瑕佺殑鏉冮檺 -->
<!--<uses-permission android:name="android.permission.INTERNET" />-->
@@ -162,8 +162,6 @@
<category android:name="com.hdl.onpro" />
</intent-filter>
</activity>
-
-
<!-- Required. For publish channel feature -->
<!-- JPUSH_CHANNEL 鏄负浜嗘柟渚垮紑鍙戣�呯粺璁� APK 鍒嗗彂娓犻亾銆�-->
<!-- 渚嬪: -->
@@ -172,7 +170,6 @@
<meta-data android:name="JPUSH_CHANNEL" android:value="developer-default" />
<!-- Required. AppKey copied from Portal -->
<meta-data android:name="JPUSH_APPKEY" android:value="cbd90743ac45cbca06c8118b" />
-
<meta-data android:name="XIAOMI_APPKEY" android:value="MI-5871892343860" />
<meta-data android:name="XIAOMI_APPID" android:value="MI-2882303761518923860" />
<meta-data android:name="OPPO_APPKEY" android:value="OP-e942dafe77cf4b9f868d5421d701655a" />
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index a5f799a..1e4ccef 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -13148,8 +13148,8 @@
// aapt resource value: 0x7F100007
public const int AppTheme = 2131755015;
- // aapt resource value: 0x7F10019A
- public const int auto_wifi_status_style_normal = 2131755418;
+ // aapt resource value: 0x7F10019B
+ public const int auto_wifi_status_style_normal = 2131755419;
// aapt resource value: 0x7F100008
public const int Base_AlertDialog_AppCompat = 2131755016;
@@ -13643,8 +13643,8 @@
// aapt resource value: 0x7F1000AB
public const int BottomSheetDialogAnimation = 2131755179;
- // aapt resource value: 0x7F10019B
- public const int cc_line_long = 2131755419;
+ // aapt resource value: 0x7F10019C
+ public const int cc_line_long = 2131755420;
// aapt resource value: 0x7F1000AC
public const int CommonGroupLayout = 2131755180;
@@ -13652,8 +13652,8 @@
// aapt resource value: 0x7F1000AD
public const int CommonListView = 2131755181;
- // aapt resource value: 0x7F10019C
- public const int custom_dialog2 = 2131755420;
+ // aapt resource value: 0x7F10019D
+ public const int custom_dialog2 = 2131755421;
// aapt resource value: 0x7F1000AE
public const int DialogTheme = 2131755182;
@@ -13676,11 +13676,11 @@
// aapt resource value: 0x7F1000B4
public const int MyTheme1 = 2131755188;
- // aapt resource value: 0x7F10019D
- public const int picker_view_scale_anim = 2131755421;
-
// aapt resource value: 0x7F10019E
- public const int picker_view_slide_anim = 2131755422;
+ public const int picker_view_scale_anim = 2131755422;
+
+ // aapt resource value: 0x7F10019F
+ public const int picker_view_slide_anim = 2131755423;
// aapt resource value: 0x7F1000B5
public const int Platform_AppCompat = 2131755189;
@@ -13724,8 +13724,8 @@
// aapt resource value: 0x7F1000C2
public const int Platform_Widget_AppCompat_Spinner = 2131755202;
- // aapt resource value: 0x7F10019F
- public const int popwindowUpAnim = 2131755423;
+ // aapt resource value: 0x7F1001A0
+ public const int popwindowUpAnim = 2131755424;
// aapt resource value: 0x7F1000C3
public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131755203;
@@ -13770,607 +13770,610 @@
public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131755216;
// aapt resource value: 0x7F1000D1
- public const int TextAppearance_AppCompat = 2131755217;
+ public const int SplashTheme = 2131755217;
// aapt resource value: 0x7F1000D2
- public const int TextAppearance_AppCompat_Body1 = 2131755218;
+ public const int TextAppearance_AppCompat = 2131755218;
// aapt resource value: 0x7F1000D3
- public const int TextAppearance_AppCompat_Body2 = 2131755219;
+ public const int TextAppearance_AppCompat_Body1 = 2131755219;
// aapt resource value: 0x7F1000D4
- public const int TextAppearance_AppCompat_Button = 2131755220;
+ public const int TextAppearance_AppCompat_Body2 = 2131755220;
// aapt resource value: 0x7F1000D5
- public const int TextAppearance_AppCompat_Caption = 2131755221;
+ public const int TextAppearance_AppCompat_Button = 2131755221;
// aapt resource value: 0x7F1000D6
- public const int TextAppearance_AppCompat_Display1 = 2131755222;
+ public const int TextAppearance_AppCompat_Caption = 2131755222;
// aapt resource value: 0x7F1000D7
- public const int TextAppearance_AppCompat_Display2 = 2131755223;
+ public const int TextAppearance_AppCompat_Display1 = 2131755223;
// aapt resource value: 0x7F1000D8
- public const int TextAppearance_AppCompat_Display3 = 2131755224;
+ public const int TextAppearance_AppCompat_Display2 = 2131755224;
// aapt resource value: 0x7F1000D9
- public const int TextAppearance_AppCompat_Display4 = 2131755225;
+ public const int TextAppearance_AppCompat_Display3 = 2131755225;
// aapt resource value: 0x7F1000DA
- public const int TextAppearance_AppCompat_Headline = 2131755226;
+ public const int TextAppearance_AppCompat_Display4 = 2131755226;
// aapt resource value: 0x7F1000DB
- public const int TextAppearance_AppCompat_Inverse = 2131755227;
+ public const int TextAppearance_AppCompat_Headline = 2131755227;
// aapt resource value: 0x7F1000DC
- public const int TextAppearance_AppCompat_Large = 2131755228;
+ public const int TextAppearance_AppCompat_Inverse = 2131755228;
// aapt resource value: 0x7F1000DD
- public const int TextAppearance_AppCompat_Large_Inverse = 2131755229;
+ public const int TextAppearance_AppCompat_Large = 2131755229;
// aapt resource value: 0x7F1000DE
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131755230;
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131755230;
// aapt resource value: 0x7F1000DF
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131755231;
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131755231;
// aapt resource value: 0x7F1000E0
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755232;
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131755232;
// aapt resource value: 0x7F1000E1
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755233;
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131755233;
// aapt resource value: 0x7F1000E2
- public const int TextAppearance_AppCompat_Medium = 2131755234;
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131755234;
// aapt resource value: 0x7F1000E3
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131755235;
+ public const int TextAppearance_AppCompat_Medium = 2131755235;
// aapt resource value: 0x7F1000E4
- public const int TextAppearance_AppCompat_Menu = 2131755236;
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131755236;
// aapt resource value: 0x7F1000E5
- public const int TextAppearance_AppCompat_Notification = 2131755237;
+ public const int TextAppearance_AppCompat_Menu = 2131755237;
// aapt resource value: 0x7F1000E6
- public const int TextAppearance_AppCompat_Notification_Info = 2131755238;
+ public const int TextAppearance_AppCompat_Notification = 2131755238;
// aapt resource value: 0x7F1000E7
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131755239;
+ public const int TextAppearance_AppCompat_Notification_Info = 2131755239;
// aapt resource value: 0x7F1000E8
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131755240;
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131755240;
// aapt resource value: 0x7F1000E9
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131755241;
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131755241;
// aapt resource value: 0x7F1000EA
- public const int TextAppearance_AppCompat_Notification_Media = 2131755242;
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131755242;
// aapt resource value: 0x7F1000EB
- public const int TextAppearance_AppCompat_Notification_Time = 2131755243;
+ public const int TextAppearance_AppCompat_Notification_Media = 2131755243;
// aapt resource value: 0x7F1000EC
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131755244;
+ public const int TextAppearance_AppCompat_Notification_Time = 2131755244;
// aapt resource value: 0x7F1000ED
- public const int TextAppearance_AppCompat_Notification_Title = 2131755245;
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131755245;
// aapt resource value: 0x7F1000EE
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131755246;
+ public const int TextAppearance_AppCompat_Notification_Title = 2131755246;
// aapt resource value: 0x7F1000EF
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131755247;
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131755247;
// aapt resource value: 0x7F1000F0
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131755248;
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131755248;
// aapt resource value: 0x7F1000F1
- public const int TextAppearance_AppCompat_Small = 2131755249;
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131755249;
// aapt resource value: 0x7F1000F2
- public const int TextAppearance_AppCompat_Small_Inverse = 2131755250;
+ public const int TextAppearance_AppCompat_Small = 2131755250;
// aapt resource value: 0x7F1000F3
- public const int TextAppearance_AppCompat_Subhead = 2131755251;
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131755251;
// aapt resource value: 0x7F1000F4
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131755252;
+ public const int TextAppearance_AppCompat_Subhead = 2131755252;
// aapt resource value: 0x7F1000F5
- public const int TextAppearance_AppCompat_Title = 2131755253;
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131755253;
// aapt resource value: 0x7F1000F6
- public const int TextAppearance_AppCompat_Title_Inverse = 2131755254;
+ public const int TextAppearance_AppCompat_Title = 2131755254;
// aapt resource value: 0x7F1000F7
- public const int TextAppearance_AppCompat_Tooltip = 2131755255;
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131755255;
// aapt resource value: 0x7F1000F8
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755256;
+ public const int TextAppearance_AppCompat_Tooltip = 2131755256;
// aapt resource value: 0x7F1000F9
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755257;
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131755257;
// aapt resource value: 0x7F1000FA
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755258;
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131755258;
// aapt resource value: 0x7F1000FB
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755259;
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131755259;
// aapt resource value: 0x7F1000FC
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755260;
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131755260;
// aapt resource value: 0x7F1000FD
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755261;
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131755261;
// aapt resource value: 0x7F1000FE
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131755262;
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131755262;
// aapt resource value: 0x7F1000FF
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755263;
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131755263;
// aapt resource value: 0x7F100100
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131755264;
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131755264;
// aapt resource value: 0x7F100101
- public const int TextAppearance_AppCompat_Widget_Button = 2131755265;
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131755265;
// aapt resource value: 0x7F100102
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755266;
+ public const int TextAppearance_AppCompat_Widget_Button = 2131755266;
// aapt resource value: 0x7F100103
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131755267;
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131755267;
// aapt resource value: 0x7F100104
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131755268;
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131755268;
// aapt resource value: 0x7F100105
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131755269;
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131755269;
// aapt resource value: 0x7F100106
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755270;
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131755270;
// aapt resource value: 0x7F100107
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755271;
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131755271;
// aapt resource value: 0x7F100108
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755272;
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131755272;
// aapt resource value: 0x7F100109
- public const int TextAppearance_AppCompat_Widget_Switch = 2131755273;
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131755273;
// aapt resource value: 0x7F10010A
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755274;
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131755274;
// aapt resource value: 0x7F10010B
- public const int TextAppearance_Compat_Notification = 2131755275;
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131755275;
// aapt resource value: 0x7F10010C
- public const int TextAppearance_Compat_Notification_Info = 2131755276;
+ public const int TextAppearance_Compat_Notification = 2131755276;
// aapt resource value: 0x7F10010D
- public const int TextAppearance_Compat_Notification_Info_Media = 2131755277;
+ public const int TextAppearance_Compat_Notification_Info = 2131755277;
// aapt resource value: 0x7F10010E
- public const int TextAppearance_Compat_Notification_Line2 = 2131755278;
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131755278;
// aapt resource value: 0x7F10010F
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131755279;
+ public const int TextAppearance_Compat_Notification_Line2 = 2131755279;
// aapt resource value: 0x7F100110
- public const int TextAppearance_Compat_Notification_Media = 2131755280;
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131755280;
// aapt resource value: 0x7F100111
- public const int TextAppearance_Compat_Notification_Time = 2131755281;
+ public const int TextAppearance_Compat_Notification_Media = 2131755281;
// aapt resource value: 0x7F100112
- public const int TextAppearance_Compat_Notification_Time_Media = 2131755282;
+ public const int TextAppearance_Compat_Notification_Time = 2131755282;
// aapt resource value: 0x7F100113
- public const int TextAppearance_Compat_Notification_Title = 2131755283;
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131755283;
// aapt resource value: 0x7F100114
- public const int TextAppearance_Compat_Notification_Title_Media = 2131755284;
+ public const int TextAppearance_Compat_Notification_Title = 2131755284;
// aapt resource value: 0x7F100115
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131755285;
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131755285;
// aapt resource value: 0x7F100116
- public const int TextAppearance_Design_Counter = 2131755286;
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131755286;
// aapt resource value: 0x7F100117
- public const int TextAppearance_Design_Counter_Overflow = 2131755287;
+ public const int TextAppearance_Design_Counter = 2131755287;
// aapt resource value: 0x7F100118
- public const int TextAppearance_Design_Error = 2131755288;
+ public const int TextAppearance_Design_Counter_Overflow = 2131755288;
// aapt resource value: 0x7F100119
- public const int TextAppearance_Design_Hint = 2131755289;
+ public const int TextAppearance_Design_Error = 2131755289;
// aapt resource value: 0x7F10011A
- public const int TextAppearance_Design_Snackbar_Message = 2131755290;
+ public const int TextAppearance_Design_Hint = 2131755290;
// aapt resource value: 0x7F10011B
- public const int TextAppearance_Design_Tab = 2131755291;
+ public const int TextAppearance_Design_Snackbar_Message = 2131755291;
// aapt resource value: 0x7F10011C
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755292;
+ public const int TextAppearance_Design_Tab = 2131755292;
// aapt resource value: 0x7F10011D
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755293;
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131755293;
// aapt resource value: 0x7F10011E
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755294;
-
- // aapt resource value: 0x7F10013B
- public const int ThemeOverlay_AppCompat = 2131755323;
-
- // aapt resource value: 0x7F10013C
- public const int ThemeOverlay_AppCompat_ActionBar = 2131755324;
-
- // aapt resource value: 0x7F10013D
- public const int ThemeOverlay_AppCompat_Dark = 2131755325;
-
- // aapt resource value: 0x7F10013E
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131755326;
-
- // aapt resource value: 0x7F10013F
- public const int ThemeOverlay_AppCompat_Dialog = 2131755327;
-
- // aapt resource value: 0x7F100140
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131755328;
-
- // aapt resource value: 0x7F100141
- public const int ThemeOverlay_AppCompat_Light = 2131755329;
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131755294;
// aapt resource value: 0x7F10011F
- public const int Theme_AppCompat = 2131755295;
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131755295;
- // aapt resource value: 0x7F100120
- public const int Theme_AppCompat_CompactMenu = 2131755296;
+ // aapt resource value: 0x7F10013C
+ public const int ThemeOverlay_AppCompat = 2131755324;
- // aapt resource value: 0x7F100121
- public const int Theme_AppCompat_DayNight = 2131755297;
+ // aapt resource value: 0x7F10013D
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131755325;
- // aapt resource value: 0x7F100122
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131755298;
+ // aapt resource value: 0x7F10013E
+ public const int ThemeOverlay_AppCompat_Dark = 2131755326;
- // aapt resource value: 0x7F100123
- public const int Theme_AppCompat_DayNight_Dialog = 2131755299;
+ // aapt resource value: 0x7F10013F
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131755327;
- // aapt resource value: 0x7F100126
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131755302;
+ // aapt resource value: 0x7F100140
+ public const int ThemeOverlay_AppCompat_Dialog = 2131755328;
- // aapt resource value: 0x7F100124
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131755300;
-
- // aapt resource value: 0x7F100125
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131755301;
-
- // aapt resource value: 0x7F100127
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131755303;
-
- // aapt resource value: 0x7F100128
- public const int Theme_AppCompat_Dialog = 2131755304;
-
- // aapt resource value: 0x7F10012B
- public const int Theme_AppCompat_DialogWhenLarge = 2131755307;
-
- // aapt resource value: 0x7F100129
- public const int Theme_AppCompat_Dialog_Alert = 2131755305;
-
- // aapt resource value: 0x7F10012A
- public const int Theme_AppCompat_Dialog_MinWidth = 2131755306;
-
- // aapt resource value: 0x7F10012C
- public const int Theme_AppCompat_Light = 2131755308;
-
- // aapt resource value: 0x7F10012D
- public const int Theme_AppCompat_Light_DarkActionBar = 2131755309;
-
- // aapt resource value: 0x7F10012E
- public const int Theme_AppCompat_Light_Dialog = 2131755310;
-
- // aapt resource value: 0x7F100131
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131755313;
-
- // aapt resource value: 0x7F10012F
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131755311;
-
- // aapt resource value: 0x7F100130
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131755312;
-
- // aapt resource value: 0x7F100132
- public const int Theme_AppCompat_Light_NoActionBar = 2131755314;
-
- // aapt resource value: 0x7F100133
- public const int Theme_AppCompat_NoActionBar = 2131755315;
-
- // aapt resource value: 0x7F100134
- public const int Theme_BiometricPromptDialog = 2131755316;
-
- // aapt resource value: 0x7F100135
- public const int Theme_Design = 2131755317;
-
- // aapt resource value: 0x7F100136
- public const int Theme_Design_BottomSheetDialog = 2131755318;
-
- // aapt resource value: 0x7F100137
- public const int Theme_Design_Light = 2131755319;
-
- // aapt resource value: 0x7F100138
- public const int Theme_Design_Light_BottomSheetDialog = 2131755320;
-
- // aapt resource value: 0x7F100139
- public const int Theme_Design_Light_NoActionBar = 2131755321;
-
- // aapt resource value: 0x7F10013A
- public const int Theme_Design_NoActionBar = 2131755322;
+ // aapt resource value: 0x7F100141
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131755329;
// aapt resource value: 0x7F100142
- public const int TitleBar_Dark = 2131755330;
+ public const int ThemeOverlay_AppCompat_Light = 2131755330;
+
+ // aapt resource value: 0x7F100120
+ public const int Theme_AppCompat = 2131755296;
+
+ // aapt resource value: 0x7F100121
+ public const int Theme_AppCompat_CompactMenu = 2131755297;
+
+ // aapt resource value: 0x7F100122
+ public const int Theme_AppCompat_DayNight = 2131755298;
+
+ // aapt resource value: 0x7F100123
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131755299;
+
+ // aapt resource value: 0x7F100124
+ public const int Theme_AppCompat_DayNight_Dialog = 2131755300;
+
+ // aapt resource value: 0x7F100127
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131755303;
+
+ // aapt resource value: 0x7F100125
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131755301;
+
+ // aapt resource value: 0x7F100126
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131755302;
+
+ // aapt resource value: 0x7F100128
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131755304;
+
+ // aapt resource value: 0x7F100129
+ public const int Theme_AppCompat_Dialog = 2131755305;
+
+ // aapt resource value: 0x7F10012C
+ public const int Theme_AppCompat_DialogWhenLarge = 2131755308;
+
+ // aapt resource value: 0x7F10012A
+ public const int Theme_AppCompat_Dialog_Alert = 2131755306;
+
+ // aapt resource value: 0x7F10012B
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131755307;
+
+ // aapt resource value: 0x7F10012D
+ public const int Theme_AppCompat_Light = 2131755309;
+
+ // aapt resource value: 0x7F10012E
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131755310;
+
+ // aapt resource value: 0x7F10012F
+ public const int Theme_AppCompat_Light_Dialog = 2131755311;
+
+ // aapt resource value: 0x7F100132
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131755314;
+
+ // aapt resource value: 0x7F100130
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131755312;
+
+ // aapt resource value: 0x7F100131
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131755313;
+
+ // aapt resource value: 0x7F100133
+ public const int Theme_AppCompat_Light_NoActionBar = 2131755315;
+
+ // aapt resource value: 0x7F100134
+ public const int Theme_AppCompat_NoActionBar = 2131755316;
+
+ // aapt resource value: 0x7F100135
+ public const int Theme_BiometricPromptDialog = 2131755317;
+
+ // aapt resource value: 0x7F100136
+ public const int Theme_Design = 2131755318;
+
+ // aapt resource value: 0x7F100137
+ public const int Theme_Design_BottomSheetDialog = 2131755319;
+
+ // aapt resource value: 0x7F100138
+ public const int Theme_Design_Light = 2131755320;
+
+ // aapt resource value: 0x7F100139
+ public const int Theme_Design_Light_BottomSheetDialog = 2131755321;
+
+ // aapt resource value: 0x7F10013A
+ public const int Theme_Design_Light_NoActionBar = 2131755322;
+
+ // aapt resource value: 0x7F10013B
+ public const int Theme_Design_NoActionBar = 2131755323;
// aapt resource value: 0x7F100143
- public const int TitleBar_Light = 2131755331;
+ public const int TitleBar_Dark = 2131755331;
// aapt resource value: 0x7F100144
- public const int TitleBar_Light_Web = 2131755332;
+ public const int TitleBar_Light = 2131755332;
// aapt resource value: 0x7F100145
- public const int Widget_AppCompat_ActionBar = 2131755333;
+ public const int TitleBar_Light_Web = 2131755333;
// aapt resource value: 0x7F100146
- public const int Widget_AppCompat_ActionBar_Solid = 2131755334;
+ public const int Widget_AppCompat_ActionBar = 2131755334;
// aapt resource value: 0x7F100147
- public const int Widget_AppCompat_ActionBar_TabBar = 2131755335;
+ public const int Widget_AppCompat_ActionBar_Solid = 2131755335;
// aapt resource value: 0x7F100148
- public const int Widget_AppCompat_ActionBar_TabText = 2131755336;
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131755336;
// aapt resource value: 0x7F100149
- public const int Widget_AppCompat_ActionBar_TabView = 2131755337;
+ public const int Widget_AppCompat_ActionBar_TabText = 2131755337;
// aapt resource value: 0x7F10014A
- public const int Widget_AppCompat_ActionButton = 2131755338;
+ public const int Widget_AppCompat_ActionBar_TabView = 2131755338;
// aapt resource value: 0x7F10014B
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131755339;
+ public const int Widget_AppCompat_ActionButton = 2131755339;
// aapt resource value: 0x7F10014C
- public const int Widget_AppCompat_ActionButton_Overflow = 2131755340;
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131755340;
// aapt resource value: 0x7F10014D
- public const int Widget_AppCompat_ActionMode = 2131755341;
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131755341;
// aapt resource value: 0x7F10014E
- public const int Widget_AppCompat_ActivityChooserView = 2131755342;
+ public const int Widget_AppCompat_ActionMode = 2131755342;
// aapt resource value: 0x7F10014F
- public const int Widget_AppCompat_AutoCompleteTextView = 2131755343;
+ public const int Widget_AppCompat_ActivityChooserView = 2131755343;
// aapt resource value: 0x7F100150
- public const int Widget_AppCompat_Button = 2131755344;
-
- // aapt resource value: 0x7F100156
- public const int Widget_AppCompat_ButtonBar = 2131755350;
-
- // aapt resource value: 0x7F100157
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131755351;
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131755344;
// aapt resource value: 0x7F100151
- public const int Widget_AppCompat_Button_Borderless = 2131755345;
+ public const int Widget_AppCompat_Button = 2131755345;
- // aapt resource value: 0x7F100152
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131755346;
-
- // aapt resource value: 0x7F100153
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755347;
-
- // aapt resource value: 0x7F100154
- public const int Widget_AppCompat_Button_Colored = 2131755348;
-
- // aapt resource value: 0x7F100155
- public const int Widget_AppCompat_Button_Small = 2131755349;
+ // aapt resource value: 0x7F100157
+ public const int Widget_AppCompat_ButtonBar = 2131755351;
// aapt resource value: 0x7F100158
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131755352;
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131755352;
+
+ // aapt resource value: 0x7F100152
+ public const int Widget_AppCompat_Button_Borderless = 2131755346;
+
+ // aapt resource value: 0x7F100153
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131755347;
+
+ // aapt resource value: 0x7F100154
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131755348;
+
+ // aapt resource value: 0x7F100155
+ public const int Widget_AppCompat_Button_Colored = 2131755349;
+
+ // aapt resource value: 0x7F100156
+ public const int Widget_AppCompat_Button_Small = 2131755350;
// aapt resource value: 0x7F100159
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131755353;
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131755353;
// aapt resource value: 0x7F10015A
- public const int Widget_AppCompat_CompoundButton_Switch = 2131755354;
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131755354;
// aapt resource value: 0x7F10015B
- public const int Widget_AppCompat_DrawerArrowToggle = 2131755355;
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131755355;
// aapt resource value: 0x7F10015C
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131755356;
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131755356;
// aapt resource value: 0x7F10015D
- public const int Widget_AppCompat_EditText = 2131755357;
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131755357;
// aapt resource value: 0x7F10015E
- public const int Widget_AppCompat_ImageButton = 2131755358;
+ public const int Widget_AppCompat_EditText = 2131755358;
// aapt resource value: 0x7F10015F
- public const int Widget_AppCompat_Light_ActionBar = 2131755359;
+ public const int Widget_AppCompat_ImageButton = 2131755359;
// aapt resource value: 0x7F100160
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131755360;
+ public const int Widget_AppCompat_Light_ActionBar = 2131755360;
// aapt resource value: 0x7F100161
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131755361;
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131755361;
// aapt resource value: 0x7F100162
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131755362;
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131755362;
// aapt resource value: 0x7F100163
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131755363;
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131755363;
// aapt resource value: 0x7F100164
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131755364;
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131755364;
// aapt resource value: 0x7F100165
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755365;
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131755365;
// aapt resource value: 0x7F100166
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131755366;
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131755366;
// aapt resource value: 0x7F100167
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131755367;
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131755367;
// aapt resource value: 0x7F100168
- public const int Widget_AppCompat_Light_ActionButton = 2131755368;
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131755368;
// aapt resource value: 0x7F100169
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131755369;
+ public const int Widget_AppCompat_Light_ActionButton = 2131755369;
// aapt resource value: 0x7F10016A
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131755370;
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131755370;
// aapt resource value: 0x7F10016B
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131755371;
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131755371;
// aapt resource value: 0x7F10016C
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131755372;
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131755372;
// aapt resource value: 0x7F10016D
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131755373;
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131755373;
// aapt resource value: 0x7F10016E
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131755374;
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131755374;
// aapt resource value: 0x7F10016F
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131755375;
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131755375;
// aapt resource value: 0x7F100170
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131755376;
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131755376;
// aapt resource value: 0x7F100171
- public const int Widget_AppCompat_Light_PopupMenu = 2131755377;
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131755377;
// aapt resource value: 0x7F100172
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131755378;
+ public const int Widget_AppCompat_Light_PopupMenu = 2131755378;
// aapt resource value: 0x7F100173
- public const int Widget_AppCompat_Light_SearchView = 2131755379;
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131755379;
// aapt resource value: 0x7F100174
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131755380;
+ public const int Widget_AppCompat_Light_SearchView = 2131755380;
// aapt resource value: 0x7F100175
- public const int Widget_AppCompat_ListMenuView = 2131755381;
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131755381;
// aapt resource value: 0x7F100176
- public const int Widget_AppCompat_ListPopupWindow = 2131755382;
+ public const int Widget_AppCompat_ListMenuView = 2131755382;
// aapt resource value: 0x7F100177
- public const int Widget_AppCompat_ListView = 2131755383;
+ public const int Widget_AppCompat_ListPopupWindow = 2131755383;
// aapt resource value: 0x7F100178
- public const int Widget_AppCompat_ListView_DropDown = 2131755384;
+ public const int Widget_AppCompat_ListView = 2131755384;
// aapt resource value: 0x7F100179
- public const int Widget_AppCompat_ListView_Menu = 2131755385;
+ public const int Widget_AppCompat_ListView_DropDown = 2131755385;
// aapt resource value: 0x7F10017A
- public const int Widget_AppCompat_PopupMenu = 2131755386;
+ public const int Widget_AppCompat_ListView_Menu = 2131755386;
// aapt resource value: 0x7F10017B
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131755387;
+ public const int Widget_AppCompat_PopupMenu = 2131755387;
// aapt resource value: 0x7F10017C
- public const int Widget_AppCompat_PopupWindow = 2131755388;
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131755388;
// aapt resource value: 0x7F10017D
- public const int Widget_AppCompat_ProgressBar = 2131755389;
+ public const int Widget_AppCompat_PopupWindow = 2131755389;
// aapt resource value: 0x7F10017E
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131755390;
+ public const int Widget_AppCompat_ProgressBar = 2131755390;
// aapt resource value: 0x7F10017F
- public const int Widget_AppCompat_RatingBar = 2131755391;
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131755391;
// aapt resource value: 0x7F100180
- public const int Widget_AppCompat_RatingBar_Indicator = 2131755392;
+ public const int Widget_AppCompat_RatingBar = 2131755392;
// aapt resource value: 0x7F100181
- public const int Widget_AppCompat_RatingBar_Small = 2131755393;
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131755393;
// aapt resource value: 0x7F100182
- public const int Widget_AppCompat_SearchView = 2131755394;
+ public const int Widget_AppCompat_RatingBar_Small = 2131755394;
// aapt resource value: 0x7F100183
- public const int Widget_AppCompat_SearchView_ActionBar = 2131755395;
+ public const int Widget_AppCompat_SearchView = 2131755395;
// aapt resource value: 0x7F100184
- public const int Widget_AppCompat_SeekBar = 2131755396;
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131755396;
// aapt resource value: 0x7F100185
- public const int Widget_AppCompat_SeekBar_Discrete = 2131755397;
+ public const int Widget_AppCompat_SeekBar = 2131755397;
// aapt resource value: 0x7F100186
- public const int Widget_AppCompat_Spinner = 2131755398;
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131755398;
// aapt resource value: 0x7F100187
- public const int Widget_AppCompat_Spinner_DropDown = 2131755399;
+ public const int Widget_AppCompat_Spinner = 2131755399;
// aapt resource value: 0x7F100188
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131755400;
+ public const int Widget_AppCompat_Spinner_DropDown = 2131755400;
// aapt resource value: 0x7F100189
- public const int Widget_AppCompat_Spinner_Underlined = 2131755401;
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131755401;
// aapt resource value: 0x7F10018A
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131755402;
+ public const int Widget_AppCompat_Spinner_Underlined = 2131755402;
// aapt resource value: 0x7F10018B
- public const int Widget_AppCompat_Toolbar = 2131755403;
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131755403;
// aapt resource value: 0x7F10018C
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131755404;
+ public const int Widget_AppCompat_Toolbar = 2131755404;
// aapt resource value: 0x7F10018D
- public const int Widget_Compat_NotificationActionContainer = 2131755405;
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131755405;
// aapt resource value: 0x7F10018E
- public const int Widget_Compat_NotificationActionText = 2131755406;
+ public const int Widget_Compat_NotificationActionContainer = 2131755406;
// aapt resource value: 0x7F10018F
- public const int Widget_Design_AppBarLayout = 2131755407;
+ public const int Widget_Compat_NotificationActionText = 2131755407;
// aapt resource value: 0x7F100190
- public const int Widget_Design_BottomNavigationView = 2131755408;
+ public const int Widget_Design_AppBarLayout = 2131755408;
// aapt resource value: 0x7F100191
- public const int Widget_Design_BottomSheet_Modal = 2131755409;
+ public const int Widget_Design_BottomNavigationView = 2131755409;
// aapt resource value: 0x7F100192
- public const int Widget_Design_CollapsingToolbar = 2131755410;
+ public const int Widget_Design_BottomSheet_Modal = 2131755410;
// aapt resource value: 0x7F100193
- public const int Widget_Design_CoordinatorLayout = 2131755411;
+ public const int Widget_Design_CollapsingToolbar = 2131755411;
// aapt resource value: 0x7F100194
- public const int Widget_Design_FloatingActionButton = 2131755412;
+ public const int Widget_Design_CoordinatorLayout = 2131755412;
// aapt resource value: 0x7F100195
- public const int Widget_Design_NavigationView = 2131755413;
+ public const int Widget_Design_FloatingActionButton = 2131755413;
// aapt resource value: 0x7F100196
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131755414;
+ public const int Widget_Design_NavigationView = 2131755414;
// aapt resource value: 0x7F100197
- public const int Widget_Design_Snackbar = 2131755415;
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131755415;
// aapt resource value: 0x7F100198
- public const int Widget_Design_TabLayout = 2131755416;
+ public const int Widget_Design_Snackbar = 2131755416;
// aapt resource value: 0x7F100199
- public const int Widget_Design_TextInputLayout = 2131755417;
+ public const int Widget_Design_TabLayout = 2131755417;
+
+ // aapt resource value: 0x7F10019A
+ public const int Widget_Design_TextInputLayout = 2131755418;
static Style()
{
diff --git a/HDL-ON_iOS/Info.plist b/HDL-ON_iOS/Info.plist
index fa61411..18ee5dd 100644
--- a/HDL-ON_iOS/Info.plist
+++ b/HDL-ON_iOS/Info.plist
@@ -100,9 +100,9 @@
<key>UIStatusBarStyle</key>
<string>UIStatusBarStyleLightContent</string>
<key>CFBundleShortVersionString</key>
- <string>1.2.202109024</string>
+ <string>1.2.202109071</string>
<key>CFBundleVersion</key>
- <string>1.2.09024</string>
+ <string>1.2.09071</string>
<key>NSLocationWhenInUseUsageDescription</key>
<string>Use geographic location to provide services such as weather</string>
<key>NSAppleMusicUsageDescription</key>
diff --git a/HDL-ON_iOS/Resources/Language.ini b/HDL-ON_iOS/Resources/Language.ini
index 76f8b23..6b2bf94 100644
--- a/HDL-ON_iOS/Resources/Language.ini
+++ b/HDL-ON_iOS/Resources/Language.ini
@@ -497,6 +497,7 @@
509=Please enter security name.
510=Please select the deployment target.
511=Combined dimming
+512=Message push is not enabled, please go to settings.
1000=Room Humidity
@@ -1614,6 +1615,7 @@
509=璇疯緭鍏ュ畨闃插悕绉般��
510=璇烽�夋嫨甯冮槻鐩爣銆�
511=缁勫悎璋冨厜
+512=娑堟伅鎺ㄩ�佹湭寮�鍚紝璇峰墠寰�璁剧疆銆�
1000=瀹ゅ唴婀垮害
diff --git a/HDL_APP_Project.sln b/HDL_APP_Project.sln
index 429707e..c30175b 100644
--- a/HDL_APP_Project.sln
+++ b/HDL_APP_Project.sln
@@ -39,7 +39,7 @@
{09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhone.Build.0 = Release|Any CPU
{09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{09712674-2A38-407B-B1E2-560B2C352F9A}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
- {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.ActiveCfg = Debug|iPhoneSimulator
+ {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.ActiveCfg = Debug|iPhone
{D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.ActiveCfg = Debug|iPhone
{D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhone.Build.0 = Debug|iPhone
{D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|iPhoneSimulator.ActiveCfg = Debug|iPhoneSimulator
@@ -50,6 +50,7 @@
{D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhone.Build.0 = Release|iPhone
{D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.ActiveCfg = Release|iPhoneSimulator
{D998E133-F0DD-4760-BE3C-461632F54DA4}.Release|iPhoneSimulator.Build.0 = Release|iPhoneSimulator
+ {D998E133-F0DD-4760-BE3C-461632F54DA4}.Debug|Any CPU.Build.0 = Debug|iPhone
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhone.ActiveCfg = Debug|Any CPU
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|iPhone.Build.0 = Debug|Any CPU
@@ -61,6 +62,7 @@
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhone.Build.0 = Release|Any CPU
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
{2DDF4C3C-6998-432E-9F43-6786D82F0630}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+ {2DDF4C3C-6998-432E-9F43-6786D82F0630}.Debug|Any CPU.Build.0 = Debug|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/HDL_ON/Common/R.cs b/HDL_ON/Common/R.cs
index a743284..8d6c7bd 100644
--- a/HDL_ON/Common/R.cs
+++ b/HDL_ON/Common/R.cs
@@ -5,7 +5,10 @@
public static class StringId
{
-
+ /// <summary>
+ /// 瀹夊崜娑堟伅鎺ㄩ�佹彁绀�
+ /// </summary>
+ public const int Android_MessagePushTip = 512;
//public const int SaveAs
/// <summary>
/// 缁勫悎璋冨厜
diff --git a/HDL_ON/DAL/Server/HttpUtil.cs b/HDL_ON/DAL/Server/HttpUtil.cs
index 48d5724..67c665d 100644
--- a/HDL_ON/DAL/Server/HttpUtil.cs
+++ b/HDL_ON/DAL/Server/HttpUtil.cs
@@ -17,8 +17,8 @@
/// 鍥哄畾鍩熷悕,姝ｅ紡鐜
/// 鍏叡鍩熷悕灏辫繎瑙ｆ瀽
/// </summary>
- //public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
- public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
+ public const string GlobalRequestHttpsHost = "https://nearest.hdlcontrol.com";
+ //public const string GlobalRequestHttpsHost = "https://test-gz.hdlcontrol.com";//mmmm
/// <summary>
/// RegionMark
/// </summary>
diff --git a/HDL_ON/Entity/DB_ResidenceData.cs b/HDL_ON/Entity/DB_ResidenceData.cs
index 36a3d9e..7999151 100644
--- a/HDL_ON/Entity/DB_ResidenceData.cs
+++ b/HDL_ON/Entity/DB_ResidenceData.cs
@@ -447,5 +447,23 @@
}
#endregion
+
+
+
+ /// <summary>
+ /// 涓婁竴娆℃彁绀虹殑鏃堕棿
+ /// </summary>
+ public DateTime LastTipTime = DateTime.MinValue;
+ /// <summary>
+ /// 鏄惁闇�瑕佹彁绀�
+ /// </summary>
+ public bool NeedTip
+ {
+ get
+ {
+ return (DateTime.Now - LastTipTime).TotalDays > 2;
+ }
+ }
+
}
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index eae7a37..7842a6e 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -25,7 +25,7 @@
/// <summary>
/// 鐗堟湰鍙�
/// </summary>
- public static string VersionString = "1.2.0901";
+ public static string VersionString = "1.2.0907";
///// <summary>
///// 瀹㈡埛绔被鍨�
///// </summary>
diff --git a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
index a8d8520..b753ef8 100644
--- a/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
+++ b/HDL_ON/UI/UI0-Public/Widget/ConfirmDialog.cs
@@ -37,8 +37,8 @@
/// <summary>
/// 鍒濆鍖朌ialog
/// </summary>
- /// <param name="titleStr"></param>
- /// <param name="msgStr"></param>
+ /// <param name="titleStr">鏍囬</param>
+ /// <param name="msgStr">鎻愮ず淇℃伅</param>
/// <param name="okAction"></param>
/// <param name="cancelAction"></param>
/// <param name="cancelID"></param>
diff --git a/HDL_ON/UI/UI2/UserPage.cs b/HDL_ON/UI/UI2/UserPage.cs
index 0cca652..e8c5add 100644
--- a/HDL_ON/UI/UI2/UserPage.cs
+++ b/HDL_ON/UI/UI2/UserPage.cs
@@ -132,6 +132,21 @@
#if __Android__
//寮�鍚畾浣嶆湇鍔�
Shared.Application.StartGPSLocationService();
+
+ if (DB_ResidenceData.Instance.NeedTip) {
+ DB_ResidenceData.Instance.LastTipTime = DateTime.Now;
+ if (CN.Jpush.Android.Api.JPushInterface.IsNotificationEnabled(Shared.Application.Activity) != 1)
+ {
+ Action action = () =>
+ {
+ CN.Jpush.Android.Api.JPushInterface.GoToAppNotificationSettings(Shared.Application.Activity);
+ };
+ Shared.Application.RunOnMainThread(() =>
+ {
+ new HDL_ON.UI.ConfirmDialog().ShowDialog(StringId.Tip, StringId.Android_MessagePushTip, action);
+ });
+ }
+ }
#endif
}
--
Gitblit v1.8.0