From 6bca8fcd37a48808a0b9c9342fc1be0adddfece6 Mon Sep 17 00:00:00 2001
From: xm <1271024303@qq.com>
Date: 星期五, 08 五月 2020 17:46:44 +0800
Subject: [PATCH] 请合并最新代码，优化绑定信息
---
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 273 +++++-------------------------------------------------
1 files changed, 26 insertions(+), 247 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 90bc8ff..2c814cd 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -26,71 +26,6 @@
public static void UpdateIdValues()
{
- global::Shared.Droid.TCL.Resource.Animation.timepicker_anim_enter_bottom = global::GateWay.Droid.Resource.Animation.timepicker_anim_enter_bottom;
- global::Shared.Droid.TCL.Resource.Animation.timepicker_anim_exit_bottom = global::GateWay.Droid.Resource.Animation.timepicker_anim_exit_bottom;
- global::Shared.Droid.TCL.Resource.Color.wheel_timebtn_nor = global::GateWay.Droid.Resource.Color.wheel_timebtn_nor;
- global::Shared.Droid.TCL.Resource.Color.wheel_timebtn_pre = global::GateWay.Droid.Resource.Color.wheel_timebtn_pre;
- global::Shared.Droid.TCL.Resource.Dimension.activity_horizontal_margin = global::GateWay.Droid.Resource.Dimension.activity_horizontal_margin;
- global::Shared.Droid.TCL.Resource.Dimension.activity_vertical_margin = global::GateWay.Droid.Resource.Dimension.activity_vertical_margin;
- global::Shared.Droid.TCL.Resource.Drawable.bg_above_timepicker = global::GateWay.Droid.Resource.Drawable.bg_above_timepicker;
- global::Shared.Droid.TCL.Resource.Drawable.bg_line_timepicker = global::GateWay.Droid.Resource.Drawable.bg_line_timepicker;
- global::Shared.Droid.TCL.Resource.Drawable.ic_launcher = global::GateWay.Droid.Resource.Drawable.ic_launcher;
- global::Shared.Droid.TCL.Resource.Drawable.wheel_timebtn = global::GateWay.Droid.Resource.Drawable.wheel_timebtn;
- global::Shared.Droid.TCL.Resource.Drawable.wheel_val = global::GateWay.Droid.Resource.Drawable.wheel_val;
- global::Shared.Droid.TCL.Resource.Id.action_settings = global::GateWay.Droid.Resource.Id.action_settings;
- global::Shared.Droid.TCL.Resource.Id.btnCancel = global::GateWay.Droid.Resource.Id.btnCancel;
- global::Shared.Droid.TCL.Resource.Id.btnSubmit = global::GateWay.Droid.Resource.Id.btnSubmit;
- global::Shared.Droid.TCL.Resource.Id.day = global::GateWay.Droid.Resource.Id.day;
- global::Shared.Droid.TCL.Resource.Id.hour = global::GateWay.Droid.Resource.Id.hour;
- global::Shared.Droid.TCL.Resource.Id.min = global::GateWay.Droid.Resource.Id.min;
- global::Shared.Droid.TCL.Resource.Id.month = global::GateWay.Droid.Resource.Id.month;
- global::Shared.Droid.TCL.Resource.Id.options1 = global::GateWay.Droid.Resource.Id.options1;
- global::Shared.Droid.TCL.Resource.Id.options2 = global::GateWay.Droid.Resource.Id.options2;
- global::Shared.Droid.TCL.Resource.Id.options3 = global::GateWay.Droid.Resource.Id.options3;
- global::Shared.Droid.TCL.Resource.Id.optionspicker = global::GateWay.Droid.Resource.Id.optionspicker;
- global::Shared.Droid.TCL.Resource.Id.timepicker = global::GateWay.Droid.Resource.Id.timepicker;
- global::Shared.Droid.TCL.Resource.Id.tvOptions = global::GateWay.Droid.Resource.Id.tvOptions;
- global::Shared.Droid.TCL.Resource.Id.tvTime = global::GateWay.Droid.Resource.Id.tvTime;
- global::Shared.Droid.TCL.Resource.Id.year = global::GateWay.Droid.Resource.Id.year;
- global::Shared.Droid.TCL.Resource.Layout.activity_main = global::GateWay.Droid.Resource.Layout.activity_main;
- global::Shared.Droid.TCL.Resource.Layout.include_optionspicker = global::GateWay.Droid.Resource.Layout.include_optionspicker;
- global::Shared.Droid.TCL.Resource.Layout.include_timepicker = global::GateWay.Droid.Resource.Layout.include_timepicker;
- global::Shared.Droid.TCL.Resource.Layout.pw_options = global::GateWay.Droid.Resource.Layout.pw_options;
- global::Shared.Droid.TCL.Resource.Layout.pw_time = global::GateWay.Droid.Resource.Layout.pw_time;
- global::Shared.Droid.TCL.Resource.Menu.main = global::GateWay.Droid.Resource.Menu.main;
- global::Shared.Droid.TCL.Resource.String.action_settings = global::GateWay.Droid.Resource.String.action_settings;
- global::Shared.Droid.TCL.Resource.String.app_name = global::GateWay.Droid.Resource.String.app_name;
- global::Shared.Droid.TCL.Resource.String.hello_world = global::GateWay.Droid.Resource.String.hello_world;
- global::Shared.Droid.TCL.Resource.String.pickerview_cancel = global::GateWay.Droid.Resource.String.pickerview_cancel;
- global::Shared.Droid.TCL.Resource.String.pickerview_day = global::GateWay.Droid.Resource.String.pickerview_day;
- global::Shared.Droid.TCL.Resource.String.pickerview_hours = global::GateWay.Droid.Resource.String.pickerview_hours;
- global::Shared.Droid.TCL.Resource.String.pickerview_minutes = global::GateWay.Droid.Resource.String.pickerview_minutes;
- global::Shared.Droid.TCL.Resource.String.pickerview_month = global::GateWay.Droid.Resource.String.pickerview_month;
- global::Shared.Droid.TCL.Resource.String.pickerview_seconds = global::GateWay.Droid.Resource.String.pickerview_seconds;
- global::Shared.Droid.TCL.Resource.String.pickerview_submit = global::GateWay.Droid.Resource.String.pickerview_submit;
- global::Shared.Droid.TCL.Resource.String.pickerview_year = global::GateWay.Droid.Resource.String.pickerview_year;
- global::Shared.Droid.TCL.Resource.Style.AppBaseTheme = global::GateWay.Droid.Resource.Style.AppBaseTheme;
- global::Shared.Droid.TCL.Resource.Style.AppTheme = global::GateWay.Droid.Resource.Style.AppTheme;
- global::Shared.Droid.TCL.Resource.Style.timepopwindow_anim_style = global::GateWay.Droid.Resource.Style.timepopwindow_anim_style;
- }
-
- public partial class Animation
- {
-
- // aapt resource value: 0x7f050000
- public const int timepicker_anim_enter_bottom = 2131034112;
-
- // aapt resource value: 0x7f050001
- public const int timepicker_anim_exit_bottom = 2131034113;
-
- static Animation()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Animation()
- {
- }
}
public partial class Attribute
@@ -106,67 +41,14 @@
}
}
- public partial class Color
- {
-
- // aapt resource value: 0x7f070000
- public const int wheel_timebtn_nor = 2131165184;
-
- // aapt resource value: 0x7f070001
- public const int wheel_timebtn_pre = 2131165185;
-
- static Color()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Color()
- {
- }
- }
-
- public partial class Dimension
- {
-
- // aapt resource value: 0x7f080000
- public const int activity_horizontal_margin = 2131230720;
-
- // aapt resource value: 0x7f080001
- public const int activity_vertical_margin = 2131230721;
-
- static Dimension()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Dimension()
- {
- }
- }
-
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int bg_above_timepicker = 2130837504;
+ // aapt resource value: 0x7F010000
+ public const int Icon = 2130771968;
- // aapt resource value: 0x7f020001
- public const int bg_line_timepicker = 2130837505;
-
- // aapt resource value: 0x7f020002
- public const int ic_launcher = 2130837506;
-
- // aapt resource value: 0x7f020003
- public const int Icon = 2130837507;
-
- // aapt resource value: 0x7f020004
- public const int Loading = 2130837508;
-
- // aapt resource value: 0x7f020005
- public const int wheel_timebtn = 2130837509;
-
- // aapt resource value: 0x7f020006
- public const int wheel_val = 2130837510;
+ // aapt resource value: 0x7F010001
+ public const int Loading = 2130771969;
static Drawable()
{
@@ -181,53 +63,17 @@
public partial class Id
{
- // aapt resource value: 0x7f0c000f
- public const int action_settings = 2131492879;
+ // aapt resource value: 0x7F020000
+ public const int myButton = 2130837504;
- // aapt resource value: 0x7f0c000b
- public const int btnCancel = 2131492875;
+ // aapt resource value: 0x7F020001
+ public const int tv_zxing_back = 2130837505;
- // aapt resource value: 0x7f0c000c
- public const int btnSubmit = 2131492876;
+ // aapt resource value: 0x7F020002
+ public const int tv_zxing_flash = 2130837506;
- // aapt resource value: 0x7f0c0007
- public const int day = 2131492871;
-
- // aapt resource value: 0x7f0c0008
- public const int hour = 2131492872;
-
- // aapt resource value: 0x7f0c0009
- public const int min = 2131492873;
-
- // aapt resource value: 0x7f0c0006
- public const int month = 2131492870;
-
- // aapt resource value: 0x7f0c000a
- public const int myButton = 2131492874;
-
- // aapt resource value: 0x7f0c0002
- public const int options1 = 2131492866;
-
- // aapt resource value: 0x7f0c0003
- public const int options2 = 2131492867;
-
- // aapt resource value: 0x7f0c0004
- public const int options3 = 2131492868;
-
- // aapt resource value: 0x7f0c000d
- public const int optionspicker = 2131492877;
-
- // aapt resource value: 0x7f0c000e
- public const int timepicker = 2131492878;
-
- // aapt resource value: 0x7f0c0001
- public const int tvOptions = 2131492865;
-
- // aapt resource value: 0x7f0c0000
- public const int tvTime = 2131492864;
-
- // aapt resource value: 0x7f0c0005
- public const int year = 2131492869;
+ // aapt resource value: 0x7F020003
+ public const int tv_zxing_scan = 2130837507;
static Id()
{
@@ -242,23 +88,11 @@
public partial class Layout
{
- // aapt resource value: 0x7f040000
- public const int activity_main = 2130968576;
+ // aapt resource value: 0x7F030000
+ public const int Main = 2130903040;
- // aapt resource value: 0x7f040001
- public const int include_optionspicker = 2130968577;
-
- // aapt resource value: 0x7f040002
- public const int include_timepicker = 2130968578;
-
- // aapt resource value: 0x7f040003
- public const int Main = 2130968579;
-
- // aapt resource value: 0x7f040004
- public const int pw_options = 2130968580;
-
- // aapt resource value: 0x7f040005
- public const int pw_time = 2130968581;
+ // aapt resource value: 0x7F030001
+ public const int zxing_layout = 2130903041;
static Layout()
{
@@ -270,27 +104,11 @@
}
}
- public partial class Menu
- {
-
- // aapt resource value: 0x7f0b0000
- public const int main = 2131427328;
-
- static Menu()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Menu()
- {
- }
- }
-
public partial class Mipmap
{
- // aapt resource value: 0x7f030000
- public const int Icon = 2130903040;
+ // aapt resource value: 0x7F040000
+ public const int Icon = 2130968576;
static Mipmap()
{
@@ -305,41 +123,11 @@
public partial class String
{
- // aapt resource value: 0x7f090001
- public const int action_settings = 2131296257;
+ // aapt resource value: 0x7F050000
+ public const int app_name = 2131034112;
- // aapt resource value: 0x7f090000
- public const int app_name = 2131296256;
-
- // aapt resource value: 0x7f09000b
- public const int hello = 2131296267;
-
- // aapt resource value: 0x7f090002
- public const int hello_world = 2131296258;
-
- // aapt resource value: 0x7f090003
- public const int pickerview_cancel = 2131296259;
-
- // aapt resource value: 0x7f090007
- public const int pickerview_day = 2131296263;
-
- // aapt resource value: 0x7f090008
- public const int pickerview_hours = 2131296264;
-
- // aapt resource value: 0x7f090009
- public const int pickerview_minutes = 2131296265;
-
- // aapt resource value: 0x7f090006
- public const int pickerview_month = 2131296262;
-
- // aapt resource value: 0x7f09000a
- public const int pickerview_seconds = 2131296266;
-
- // aapt resource value: 0x7f090004
- public const int pickerview_submit = 2131296260;
-
- // aapt resource value: 0x7f090005
- public const int pickerview_year = 2131296261;
+ // aapt resource value: 0x7F050001
+ public const int hello = 2131034113;
static String()
{
@@ -354,17 +142,8 @@
public partial class Style
{
- // aapt resource value: 0x7f0a0000
- public const int AppBaseTheme = 2131361792;
-
- // aapt resource value: 0x7f0a0001
- public const int AppTheme = 2131361793;
-
- // aapt resource value: 0x7f0a0003
- public const int MyTheme = 2131361795;
-
- // aapt resource value: 0x7f0a0002
- public const int timepopwindow_anim_style = 2131361794;
+ // aapt resource value: 0x7F060000
+ public const int MyTheme = 2131099648;
static Style()
{
@@ -379,8 +158,8 @@
public partial class Xml
{
- // aapt resource value: 0x7f060000
- public const int file_paths = 2131099648;
+ // aapt resource value: 0x7F070000
+ public const int file_paths = 2131165184;
static Xml()
{
--
Gitblit v1.8.0