From 1a0a7f736c6d2e7129e7591d40bed67ec7c0f09a Mon Sep 17 00:00:00 2001
From: JLChen <551775569@qq.com>
Date: 星期五, 05 二月 2021 10:47:42 +0800
Subject: [PATCH] 2021-02-05 1.编译冲突修改
---
HDL-ON_Android/Resources/Resource.designer.cs | 91 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 83 insertions(+), 8 deletions(-)
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index f6a25e6..52baaa6 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -71,11 +71,11 @@
global::Xamarin.Essentials.Resource.Drawable.notification_template_icon_low_bg = global::HDL_ON_Android.Resource.Drawable.notification_template_icon_low_bg;
global::Xamarin.Essentials.Resource.Drawable.notification_tile_bg = global::HDL_ON_Android.Resource.Drawable.notification_tile_bg;
global::Xamarin.Essentials.Resource.Drawable.notify_panel_notification_icon_bg = global::HDL_ON_Android.Resource.Drawable.notify_panel_notification_icon_bg;
+ global::Xamarin.Essentials.Resource.Id.actions = global::HDL_ON_Android.Resource.Id.actions;
global::Xamarin.Essentials.Resource.Id.action_container = global::HDL_ON_Android.Resource.Id.action_container;
global::Xamarin.Essentials.Resource.Id.action_divider = global::HDL_ON_Android.Resource.Id.action_divider;
global::Xamarin.Essentials.Resource.Id.action_image = global::HDL_ON_Android.Resource.Id.action_image;
global::Xamarin.Essentials.Resource.Id.action_text = global::HDL_ON_Android.Resource.Id.action_text;
- global::Xamarin.Essentials.Resource.Id.actions = global::HDL_ON_Android.Resource.Id.actions;
global::Xamarin.Essentials.Resource.Id.async = global::HDL_ON_Android.Resource.Id.async;
global::Xamarin.Essentials.Resource.Id.blocking = global::HDL_ON_Android.Resource.Id.blocking;
global::Xamarin.Essentials.Resource.Id.chronometer = global::HDL_ON_Android.Resource.Id.chronometer;
@@ -111,18 +111,18 @@
global::Xamarin.Essentials.Resource.Style.TextAppearance_Compat_Notification_Title = global::HDL_ON_Android.Resource.Style.TextAppearance_Compat_Notification_Title;
global::Xamarin.Essentials.Resource.Style.Widget_Compat_NotificationActionContainer = global::HDL_ON_Android.Resource.Style.Widget_Compat_NotificationActionContainer;
global::Xamarin.Essentials.Resource.Style.Widget_Compat_NotificationActionText = global::HDL_ON_Android.Resource.Style.Widget_Compat_NotificationActionText;
- global::Xamarin.Essentials.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::HDL_ON_Android.Resource.Xml.xamarin_essentials_fileprovider_file_paths;
global::Xamarin.Essentials.Resource.Styleable.FontFamily = global::HDL_ON_Android.Resource.Styleable.FontFamily;
+ global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont;
+ global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_font = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_font;
+ global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontStyle = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontStyle;
+ global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontWeight = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontWeight;
global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderAuthority = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderAuthority;
global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderCerts = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderCerts;
global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderFetchStrategy = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderFetchStrategy;
global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderFetchTimeout = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderFetchTimeout;
global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderPackage = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderPackage;
global::Xamarin.Essentials.Resource.Styleable.FontFamily_fontProviderQuery = global::HDL_ON_Android.Resource.Styleable.FontFamily_fontProviderQuery;
- global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont;
- global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_font = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_font;
- global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontStyle = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontStyle;
- global::Xamarin.Essentials.Resource.Styleable.FontFamilyFont_fontWeight = global::HDL_ON_Android.Resource.Styleable.FontFamilyFont_fontWeight;
+ global::Xamarin.Essentials.Resource.Xml.xamarin_essentials_fileprovider_file_paths = global::HDL_ON_Android.Resource.Xml.xamarin_essentials_fileprovider_file_paths;
global::ZXing.Mobile.Resource.Id.contentFrame = global::HDL_ON_Android.Resource.Id.contentFrame;
global::ZXing.Mobile.Resource.Layout.zxingscanneractivitylayout = global::HDL_ON_Android.Resource.Layout.zxingscanneractivitylayout;
global::ZXing.Mobile.Resource.Layout.zxingscannerfragmentlayout = global::HDL_ON_Android.Resource.Layout.zxingscannerfragmentlayout;
@@ -4438,7 +4438,79 @@
public const int status_bar_notification_info_overflow = 2131624016;
// aapt resource value: 0x7F0E0051
- public const int touch_fingerprint_sensor_hint = 2131624017;
+ public const int strNetworkTipsCancelBtn = 2131624017;
+
+ // aapt resource value: 0x7F0E0052
+ public const int strNetworkTipsConfirmBtn = 2131624018;
+
+ // aapt resource value: 0x7F0E0053
+ public const int strNetworkTipsMessage = 2131624019;
+
+ // aapt resource value: 0x7F0E0054
+ public const int strNetworkTipsTitle = 2131624020;
+
+ // aapt resource value: 0x7F0E0055
+ public const int strNotificationClickToContinue = 2131624021;
+
+ // aapt resource value: 0x7F0E0056
+ public const int strNotificationClickToInstall = 2131624022;
+
+ // aapt resource value: 0x7F0E0057
+ public const int strNotificationClickToRetry = 2131624023;
+
+ // aapt resource value: 0x7F0E0058
+ public const int strNotificationClickToView = 2131624024;
+
+ // aapt resource value: 0x7F0E0059
+ public const int strNotificationDownloadError = 2131624025;
+
+ // aapt resource value: 0x7F0E005B
+ public const int strNotificationDownloading = 2131624027;
+
+ // aapt resource value: 0x7F0E005A
+ public const int strNotificationDownloadSucc = 2131624026;
+
+ // aapt resource value: 0x7F0E005C
+ public const int strNotificationHaveNewVersion = 2131624028;
+
+ // aapt resource value: 0x7F0E005E
+ public const int strToastCheckingUpgrade = 2131624030;
+
+ // aapt resource value: 0x7F0E005D
+ public const int strToastCheckUpgradeError = 2131624029;
+
+ // aapt resource value: 0x7F0E005F
+ public const int strToastYourAreTheLatestVersion = 2131624031;
+
+ // aapt resource value: 0x7F0E0060
+ public const int strUpgradeDialogCancelBtn = 2131624032;
+
+ // aapt resource value: 0x7F0E0061
+ public const int strUpgradeDialogContinueBtn = 2131624033;
+
+ // aapt resource value: 0x7F0E0062
+ public const int strUpgradeDialogFeatureLabel = 2131624034;
+
+ // aapt resource value: 0x7F0E0063
+ public const int strUpgradeDialogFileSizeLabel = 2131624035;
+
+ // aapt resource value: 0x7F0E0064
+ public const int strUpgradeDialogInstallBtn = 2131624036;
+
+ // aapt resource value: 0x7F0E0065
+ public const int strUpgradeDialogRetryBtn = 2131624037;
+
+ // aapt resource value: 0x7F0E0066
+ public const int strUpgradeDialogUpdateTimeLabel = 2131624038;
+
+ // aapt resource value: 0x7F0E0067
+ public const int strUpgradeDialogUpgradeBtn = 2131624039;
+
+ // aapt resource value: 0x7F0E0068
+ public const int strUpgradeDialogVersionLabel = 2131624040;
+
+ // aapt resource value: 0x7F0E0069
+ public const int touch_fingerprint_sensor_hint = 2131624041;
static String()
{
@@ -8325,7 +8397,10 @@
public const int network_security_config = 2131820546;
// aapt resource value: 0x7F110003
- public const int xamarin_essentials_fileprovider_file_paths = 2131820547;
+ public const int provider_paths = 2131820547;
+
+ // aapt resource value: 0x7F110004
+ public const int xamarin_essentials_fileprovider_file_paths = 2131820548;
static Xml()
{
--
Gitblit v1.8.0