From 3a26f6025130dcaae4aa82ea19b16ad902450eb8 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期四, 28 十一月 2019 11:43:47 +0800
Subject: [PATCH] 合并全部代码完成
---
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 65 +++++++++++++++++---------------
1 files changed, 34 insertions(+), 31 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 2f8a7a1..703272a 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -3439,97 +3439,100 @@
public const int gd_search_tip = 2131492902;
// aapt resource value: 0x7F0C0027
- public const int gd_setting = 2131492903;
+ public const int gd_select_distance = 2131492903;
// aapt resource value: 0x7F0C0028
- public const int hello = 2131492904;
+ public const int gd_setting = 2131492904;
// aapt resource value: 0x7F0C0029
- public const int not_recognized_fingerprint_hint = 2131492905;
+ public const int hello = 2131492905;
// aapt resource value: 0x7F0C002A
- public const int pickerview_cancel = 2131492906;
+ public const int not_recognized_fingerprint_hint = 2131492906;
// aapt resource value: 0x7F0C002B
- public const int pickerview_day = 2131492907;
+ public const int pickerview_cancel = 2131492907;
// aapt resource value: 0x7F0C002C
- public const int pickerview_hours = 2131492908;
+ public const int pickerview_day = 2131492908;
// aapt resource value: 0x7F0C002D
- public const int pickerview_minutes = 2131492909;
+ public const int pickerview_hours = 2131492909;
// aapt resource value: 0x7F0C002E
- public const int pickerview_month = 2131492910;
+ public const int pickerview_minutes = 2131492910;
// aapt resource value: 0x7F0C002F
- public const int pickerview_seconds = 2131492911;
+ public const int pickerview_month = 2131492911;
// aapt resource value: 0x7F0C0030
- public const int pickerview_submit = 2131492912;
+ public const int pickerview_seconds = 2131492912;
// aapt resource value: 0x7F0C0031
- public const int pickerview_year = 2131492913;
+ public const int pickerview_submit = 2131492913;
// aapt resource value: 0x7F0C0032
- public const int search_menu_title = 2131492914;
+ public const int pickerview_year = 2131492914;
// aapt resource value: 0x7F0C0033
- public const int srl_component_falsify = 2131492915;
+ public const int search_menu_title = 2131492915;
// aapt resource value: 0x7F0C0034
- public const int srl_content_empty = 2131492916;
+ public const int srl_component_falsify = 2131492916;
// aapt resource value: 0x7F0C0035
- public const int srl_footer_failed = 2131492917;
+ public const int srl_content_empty = 2131492917;
// aapt resource value: 0x7F0C0036
- public const int srl_footer_finish = 2131492918;
+ public const int srl_footer_failed = 2131492918;
// aapt resource value: 0x7F0C0037
- public const int srl_footer_loading = 2131492919;
+ public const int srl_footer_finish = 2131492919;
// aapt resource value: 0x7F0C0038
- public const int srl_footer_nothing = 2131492920;
+ public const int srl_footer_loading = 2131492920;
// aapt resource value: 0x7F0C0039
- public const int srl_footer_pulling = 2131492921;
+ public const int srl_footer_nothing = 2131492921;
// aapt resource value: 0x7F0C003A
- public const int srl_footer_refreshing = 2131492922;
+ public const int srl_footer_pulling = 2131492922;
// aapt resource value: 0x7F0C003B
- public const int srl_footer_release = 2131492923;
+ public const int srl_footer_refreshing = 2131492923;
// aapt resource value: 0x7F0C003C
- public const int srl_header_failed = 2131492924;
+ public const int srl_footer_release = 2131492924;
// aapt resource value: 0x7F0C003D
- public const int srl_header_finish = 2131492925;
+ public const int srl_header_failed = 2131492925;
// aapt resource value: 0x7F0C003E
- public const int srl_header_loading = 2131492926;
+ public const int srl_header_finish = 2131492926;
// aapt resource value: 0x7F0C003F
- public const int srl_header_pulling = 2131492927;
+ public const int srl_header_loading = 2131492927;
// aapt resource value: 0x7F0C0040
- public const int srl_header_refreshing = 2131492928;
+ public const int srl_header_pulling = 2131492928;
// aapt resource value: 0x7F0C0041
- public const int srl_header_release = 2131492929;
+ public const int srl_header_refreshing = 2131492929;
// aapt resource value: 0x7F0C0042
- public const int srl_header_secondary = 2131492930;
+ public const int srl_header_release = 2131492930;
// aapt resource value: 0x7F0C0043
- public const int srl_header_update = 2131492931;
+ public const int srl_header_secondary = 2131492931;
// aapt resource value: 0x7F0C0044
- public const int status_bar_notification_info_overflow = 2131492932;
+ public const int srl_header_update = 2131492932;
// aapt resource value: 0x7F0C0045
- public const int touch_fingerprint_sensor_hint = 2131492933;
+ public const int status_bar_notification_info_overflow = 2131492933;
+
+ // aapt resource value: 0x7F0C0046
+ public const int touch_fingerprint_sensor_hint = 2131492934;
static String()
{
--
Gitblit v1.8.0