From 99da2604f81af29afc6b3c6f4f128b4e5a8a5649 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期三, 13 五月 2020 12:00:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev-tzy' into dev-2020xm

---
 ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs |  101 ++++++++++++++++++++++++++++++--------------------
 1 files changed, 60 insertions(+), 41 deletions(-)

diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 2c814cd..1a094aa 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -13,159 +13,178 @@
 
 namespace GateWay.Droid
 {
-	
-	
+
+
 	[System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "1.0.0.0")]
 	public partial class Resource
 	{
-		
+
 		static Resource()
 		{
 			global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 		}
-		
+
 		public static void UpdateIdValues()
 		{
 		}
-		
+
 		public partial class Attribute
 		{
-			
+
 			static Attribute()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Attribute()
 			{
 			}
 		}
-		
+
 		public partial class Drawable
 		{
-			
+
 			// aapt resource value: 0x7F010000
 			public const int Icon = 2130771968;
-			
+
 			// aapt resource value: 0x7F010001
 			public const int Loading = 2130771969;
-			
+
 			static Drawable()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Drawable()
 			{
 			}
 		}
-		
+
 		public partial class Id
 		{
-			
+
 			// aapt resource value: 0x7F020000
 			public const int myButton = 2130837504;
-			
+
 			// aapt resource value: 0x7F020001
 			public const int tv_zxing_back = 2130837505;
-			
+
 			// aapt resource value: 0x7F020002
 			public const int tv_zxing_flash = 2130837506;
-			
+
 			// aapt resource value: 0x7F020003
 			public const int tv_zxing_scan = 2130837507;
-			
+
 			static Id()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Id()
 			{
 			}
 		}
-		
+
 		public partial class Layout
 		{
-			
+
 			// aapt resource value: 0x7F030000
 			public const int Main = 2130903040;
-			
+
 			// aapt resource value: 0x7F030001
 			public const int zxing_layout = 2130903041;
-			
+
 			static Layout()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Layout()
 			{
 			}
 		}
-		
+
 		public partial class Mipmap
 		{
-			
+
 			// aapt resource value: 0x7F040000
 			public const int Icon = 2130968576;
-			
+
 			static Mipmap()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Mipmap()
 			{
 			}
 		}
-		
+
 		public partial class String
 		{
-			
+
 			// aapt resource value: 0x7F050000
 			public const int app_name = 2131034112;
-			
+
 			// aapt resource value: 0x7F050001
 			public const int hello = 2131034113;
-			
+
 			static String()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private String()
 			{
 			}
 		}
-		
+
 		public partial class Style
 		{
-			
+
 			// aapt resource value: 0x7F060000
 			public const int MyTheme = 2131099648;
-			
+
 			static Style()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
 			private Style()
 			{
 			}
 		}
-		
+
 		public partial class Xml
 		{
-			
+
 			// aapt resource value: 0x7F070000
 			public const int file_paths = 2131165184;
-			
+
 			static Xml()
 			{
 				global::Android.Runtime.ResourceIdManager.UpdateIdValues();
 			}
-			
+
+			private Xml()
+			{
+			}
+		}
+
+		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()
 			{
 			}

--
Gitblit v1.8.0