From 2e7e5f9af5b32cfe1fc3c6ba40bf7eb984bbd0a4 Mon Sep 17 00:00:00 2001
From: 黄学彪 <hxb@hdlchina.com.cn>
Date: 星期一, 11 五月 2020 17:52:06 +0800
Subject: [PATCH] ???????
---
ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs | 19
ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs | 301
ZigbeeApp/GateWay.Droid/Assets/Language.ini | 4
ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs | 10050 +++++++++++++++++++------------------
ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs | 2
ZigbeeApp/Home.Ios/Resources/Language.ini | 4
ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs | 108
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs | 91
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs | 6
ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs | 12
ZigbeeApp/Shared/Phone/Device/Logic/Send.cs | 9
ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs | 4
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs | 810 --
ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs | 14
ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs | 83
ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs | 7
ZigbeeApp/Shared/Common/Device.cs | 4
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs | 18
ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs | 163
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs | 2
ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs | 172
ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs | 90
ZigbeeApp/Shared/Common/SceneUI.cs | 2
ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs | 2
ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs | 227
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs | 2
ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs | 537 -
ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs | 63
ZigbeeApp/Shared/Shared.projitems | 3
ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs | 1462 +---
/dev/null | 40
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs | 3
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs | 58
ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs | 1394 +----
ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs | 1
ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs | 1
ZigbeeApp/Shared/Common/House.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs | 1
ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs | 10
40 files changed, 6,634 insertions(+), 9,148 deletions(-)
diff --git a/ZigbeeApp/GateWay.Droid/Assets/Language.ini b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
index 6c4e455..9cc5450 100755
--- a/ZigbeeApp/GateWay.Droid/Assets/Language.ini
+++ b/ZigbeeApp/GateWay.Droid/Assets/Language.ini
@@ -590,8 +590,8 @@
5398=鍙敮鎸佹暟瀛楄緭鍏�
5399=鍏抽棴澶辫触
-5400=寮�鍚け璐�
-5401=娣诲姞澶辫触
+5400=寮�鍚父寮�妯″紡澶辫触
+5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
5402=鏃舵晥鎬у父寮�璁剧疆
5403=鏃跺叧闂�
diff --git a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
index 012ca3c..d393349 100644
--- a/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
+++ b/ZigbeeApp/GateWay.Droid/Resources/Resource.designer.cs
@@ -34,233 +34,233 @@
public partial class Animation
{
- // aapt resource value: 0x7f050000
- public const int abc_fade_in = 2131034112;
+ // aapt resource value: 0x7F010000
+ public const int abc_fade_in = 2130771968;
- // aapt resource value: 0x7f050001
- public const int abc_fade_out = 2131034113;
+ // aapt resource value: 0x7F010001
+ public const int abc_fade_out = 2130771969;
- // aapt resource value: 0x7f050002
- public const int abc_grow_fade_in_from_bottom = 2131034114;
+ // aapt resource value: 0x7F010002
+ public const int abc_grow_fade_in_from_bottom = 2130771970;
- // aapt resource value: 0x7f050003
- public const int abc_popup_enter = 2131034115;
+ // aapt resource value: 0x7F010003
+ public const int abc_popup_enter = 2130771971;
- // aapt resource value: 0x7f050004
- public const int abc_popup_exit = 2131034116;
+ // aapt resource value: 0x7F010004
+ public const int abc_popup_exit = 2130771972;
- // aapt resource value: 0x7f050005
- public const int abc_shrink_fade_out_from_bottom = 2131034117;
+ // aapt resource value: 0x7F010005
+ public const int abc_shrink_fade_out_from_bottom = 2130771973;
- // aapt resource value: 0x7f050006
- public const int abc_slide_in_bottom = 2131034118;
+ // aapt resource value: 0x7F010006
+ public const int abc_slide_in_bottom = 2130771974;
- // aapt resource value: 0x7f050007
- public const int abc_slide_in_top = 2131034119;
+ // aapt resource value: 0x7F010007
+ public const int abc_slide_in_top = 2130771975;
- // aapt resource value: 0x7f050008
- public const int abc_slide_out_bottom = 2131034120;
+ // aapt resource value: 0x7F010008
+ public const int abc_slide_out_bottom = 2130771976;
- // aapt resource value: 0x7f050009
- public const int abc_slide_out_top = 2131034121;
+ // aapt resource value: 0x7F010009
+ public const int abc_slide_out_top = 2130771977;
- // aapt resource value: 0x7f05000a
- public const int design_bottom_sheet_slide_in = 2131034122;
+ // aapt resource value: 0x7F01000A
+ public const int design_bottom_sheet_slide_in = 2130771978;
- // aapt resource value: 0x7f05000b
- public const int design_bottom_sheet_slide_out = 2131034123;
+ // aapt resource value: 0x7F01000B
+ public const int design_bottom_sheet_slide_out = 2130771979;
- // aapt resource value: 0x7f05000c
- public const int design_snackbar_in = 2131034124;
+ // aapt resource value: 0x7F01000C
+ public const int design_snackbar_in = 2130771980;
- // aapt resource value: 0x7f05000d
- public const int design_snackbar_out = 2131034125;
+ // aapt resource value: 0x7F01000D
+ public const int design_snackbar_out = 2130771981;
- // aapt resource value: 0x7f05000e
- public const int fingerprint_draw_off_animation_interpolator_0 = 2131034126;
+ // aapt resource value: 0x7F01000E
+ public const int fingerprint_draw_off_animation_interpolator_0 = 2130771982;
- // aapt resource value: 0x7f05000f
- public const int fingerprint_draw_off_animation_interpolator_1 = 2131034127;
+ // aapt resource value: 0x7F01000F
+ public const int fingerprint_draw_off_animation_interpolator_1 = 2130771983;
- // aapt resource value: 0x7f050010
- public const int fingerprint_draw_off_ridge_1_path_animation = 2131034128;
+ // aapt resource value: 0x7F010010
+ public const int fingerprint_draw_off_ridge_1_path_animation = 2130771984;
- // aapt resource value: 0x7f050011
- public const int fingerprint_draw_off_ridge_2_path_animation = 2131034129;
+ // aapt resource value: 0x7F010011
+ public const int fingerprint_draw_off_ridge_2_path_animation = 2130771985;
- // aapt resource value: 0x7f050012
- public const int fingerprint_draw_off_ridge_5_path_animation = 2131034130;
+ // aapt resource value: 0x7F010012
+ public const int fingerprint_draw_off_ridge_5_path_animation = 2130771986;
- // aapt resource value: 0x7f050013
- public const int fingerprint_draw_off_ridge_6_path_animation = 2131034131;
+ // aapt resource value: 0x7F010013
+ public const int fingerprint_draw_off_ridge_6_path_animation = 2130771987;
- // aapt resource value: 0x7f050014
- public const int fingerprint_draw_off_ridge_7_path_animation = 2131034132;
+ // aapt resource value: 0x7F010014
+ public const int fingerprint_draw_off_ridge_7_path_animation = 2130771988;
- // aapt resource value: 0x7f050015
- public const int fingerprint_draw_on_animation_interpolator_0 = 2131034133;
+ // aapt resource value: 0x7F010015
+ public const int fingerprint_draw_on_animation_interpolator_0 = 2130771989;
- // aapt resource value: 0x7f050016
- public const int fingerprint_draw_on_animation_interpolator_1 = 2131034134;
+ // aapt resource value: 0x7F010016
+ public const int fingerprint_draw_on_animation_interpolator_1 = 2130771990;
- // aapt resource value: 0x7f050017
- public const int fingerprint_draw_on_ridge_1_path_animation = 2131034135;
+ // aapt resource value: 0x7F010017
+ public const int fingerprint_draw_on_ridge_1_path_animation = 2130771991;
- // aapt resource value: 0x7f050018
- public const int fingerprint_draw_on_ridge_2_path_animation = 2131034136;
+ // aapt resource value: 0x7F010018
+ public const int fingerprint_draw_on_ridge_2_path_animation = 2130771992;
- // aapt resource value: 0x7f050019
- public const int fingerprint_draw_on_ridge_5_path_animation = 2131034137;
+ // aapt resource value: 0x7F010019
+ public const int fingerprint_draw_on_ridge_5_path_animation = 2130771993;
- // aapt resource value: 0x7f05001a
- public const int fingerprint_draw_on_ridge_6_path_animation = 2131034138;
+ // aapt resource value: 0x7F01001A
+ public const int fingerprint_draw_on_ridge_6_path_animation = 2130771994;
- // aapt resource value: 0x7f05001b
- public const int fingerprint_draw_on_ridge_7_path_animation = 2131034139;
+ // aapt resource value: 0x7F01001B
+ public const int fingerprint_draw_on_ridge_7_path_animation = 2130771995;
- // aapt resource value: 0x7f05001c
- public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2131034140;
+ // aapt resource value: 0x7F01001C
+ public const int fingerprint_error_state_to_fp_animation_interpolator_0 = 2130771996;
- // aapt resource value: 0x7f05001d
- public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2131034141;
+ // aapt resource value: 0x7F01001D
+ public const int fingerprint_error_state_to_fp_animation_interpolator_1 = 2130771997;
- // aapt resource value: 0x7f05001e
- public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2131034142;
+ // aapt resource value: 0x7F01001E
+ public const int fingerprint_error_state_to_fp_animation_interpolator_2 = 2130771998;
- // aapt resource value: 0x7f05001f
- public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2131034143;
+ // aapt resource value: 0x7F01001F
+ public const int fingerprint_error_state_to_fp_animation_interpolator_3 = 2130771999;
- // aapt resource value: 0x7f050020
- public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2131034144;
+ // aapt resource value: 0x7F010020
+ public const int fingerprint_error_state_to_fp_animation_interpolator_4 = 2130772000;
- // aapt resource value: 0x7f050021
- public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2131034145;
+ // aapt resource value: 0x7F010021
+ public const int fingerprint_error_state_to_fp_animation_interpolator_5 = 2130772001;
- // aapt resource value: 0x7f050022
- public const int fingerprint_error_state_to_fp_group_1_animation = 2131034146;
+ // aapt resource value: 0x7F010022
+ public const int fingerprint_error_state_to_fp_group_1_animation = 2130772002;
- // aapt resource value: 0x7f050023
- public const int fingerprint_error_state_to_fp_group_2_animation = 2131034147;
+ // aapt resource value: 0x7F010023
+ public const int fingerprint_error_state_to_fp_group_2_animation = 2130772003;
- // aapt resource value: 0x7f050024
- public const int fingerprint_error_state_to_fp_path_1_animation = 2131034148;
+ // aapt resource value: 0x7F010024
+ public const int fingerprint_error_state_to_fp_path_1_animation = 2130772004;
- // aapt resource value: 0x7f050025
- public const int fingerprint_error_state_to_fp_path_2_animation = 2131034149;
+ // aapt resource value: 0x7F010025
+ public const int fingerprint_error_state_to_fp_path_2_animation = 2130772005;
- // aapt resource value: 0x7f050026
- public const int fingerprint_error_state_to_fp_path_3_animation = 2131034150;
+ // aapt resource value: 0x7F010026
+ public const int fingerprint_error_state_to_fp_path_3_animation = 2130772006;
- // aapt resource value: 0x7f050027
- public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2131034151;
+ // aapt resource value: 0x7F010027
+ public const int fingerprint_error_state_to_fp_ridge_1_path_animation = 2130772007;
- // aapt resource value: 0x7f050028
- public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2131034152;
+ // aapt resource value: 0x7F010028
+ public const int fingerprint_error_state_to_fp_ridge_2_path_animation = 2130772008;
- // aapt resource value: 0x7f050029
- public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2131034153;
+ // aapt resource value: 0x7F010029
+ public const int fingerprint_error_state_to_fp_ridge_5_path_animation = 2130772009;
- // aapt resource value: 0x7f05002a
- public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2131034154;
+ // aapt resource value: 0x7F01002A
+ public const int fingerprint_error_state_to_fp_ridge_6_path_animation = 2130772010;
- // aapt resource value: 0x7f05002b
- public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2131034155;
+ // aapt resource value: 0x7F01002B
+ public const int fingerprint_error_state_to_fp_ridge_7_path_animation = 2130772011;
- // aapt resource value: 0x7f05002c
- public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2131034156;
+ // aapt resource value: 0x7F01002C
+ public const int fingerprint_error_state_to_fp_white_fingerprint_ridges_animation = 2130772012;
- // aapt resource value: 0x7f05002d
- public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2131034157;
+ // aapt resource value: 0x7F01002D
+ public const int fingerprint_fp_to_error_state_animation_interpolator_0 = 2130772013;
- // aapt resource value: 0x7f05002e
- public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2131034158;
+ // aapt resource value: 0x7F01002E
+ public const int fingerprint_fp_to_error_state_animation_interpolator_1 = 2130772014;
- // aapt resource value: 0x7f05002f
- public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2131034159;
+ // aapt resource value: 0x7F01002F
+ public const int fingerprint_fp_to_error_state_animation_interpolator_2 = 2130772015;
- // aapt resource value: 0x7f050030
- public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2131034160;
+ // aapt resource value: 0x7F010030
+ public const int fingerprint_fp_to_error_state_animation_interpolator_3 = 2130772016;
- // aapt resource value: 0x7f050031
- public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2131034161;
+ // aapt resource value: 0x7F010031
+ public const int fingerprint_fp_to_error_state_animation_interpolator_4 = 2130772017;
- // aapt resource value: 0x7f050032
- public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2131034162;
+ // aapt resource value: 0x7F010032
+ public const int fingerprint_fp_to_error_state_animation_interpolator_5 = 2130772018;
- // aapt resource value: 0x7f050033
- public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2131034163;
+ // aapt resource value: 0x7F010033
+ public const int fingerprint_fp_to_error_state_fingerprint_ridges_animation = 2130772019;
- // aapt resource value: 0x7f050034
- public const int fingerprint_fp_to_error_state_group_1_animation = 2131034164;
+ // aapt resource value: 0x7F010034
+ public const int fingerprint_fp_to_error_state_group_1_animation = 2130772020;
- // aapt resource value: 0x7f050035
- public const int fingerprint_fp_to_error_state_group_2_animation = 2131034165;
+ // aapt resource value: 0x7F010035
+ public const int fingerprint_fp_to_error_state_group_2_animation = 2130772021;
- // aapt resource value: 0x7f050036
- public const int fingerprint_fp_to_error_state_path_1_animation = 2131034166;
+ // aapt resource value: 0x7F010036
+ public const int fingerprint_fp_to_error_state_path_1_animation = 2130772022;
- // aapt resource value: 0x7f050037
- public const int fingerprint_fp_to_error_state_path_2_animation = 2131034167;
+ // aapt resource value: 0x7F010037
+ public const int fingerprint_fp_to_error_state_path_2_animation = 2130772023;
- // aapt resource value: 0x7f050038
- public const int fingerprint_fp_to_error_state_path_3_animation = 2131034168;
+ // aapt resource value: 0x7F010038
+ public const int fingerprint_fp_to_error_state_path_3_animation = 2130772024;
- // aapt resource value: 0x7f050039
- public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2131034169;
+ // aapt resource value: 0x7F010039
+ public const int fingerprint_fp_to_error_state_ridge_1_path_0_animation = 2130772025;
- // aapt resource value: 0x7f05003a
- public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2131034170;
+ // aapt resource value: 0x7F01003A
+ public const int fingerprint_fp_to_error_state_ridge_1_path_animation = 2130772026;
- // aapt resource value: 0x7f05003b
- public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2131034171;
+ // aapt resource value: 0x7F01003B
+ public const int fingerprint_fp_to_error_state_ridge_2_path_0_animation = 2130772027;
- // aapt resource value: 0x7f05003c
- public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2131034172;
+ // aapt resource value: 0x7F01003C
+ public const int fingerprint_fp_to_error_state_ridge_2_path_animation = 2130772028;
- // aapt resource value: 0x7f05003d
- public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2131034173;
+ // aapt resource value: 0x7F01003D
+ public const int fingerprint_fp_to_error_state_ridge_5_path_0_animation = 2130772029;
- // aapt resource value: 0x7f05003e
- public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2131034174;
+ // aapt resource value: 0x7F01003E
+ public const int fingerprint_fp_to_error_state_ridge_5_path_animation = 2130772030;
- // aapt resource value: 0x7f05003f
- public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2131034175;
+ // aapt resource value: 0x7F01003F
+ public const int fingerprint_fp_to_error_state_ridge_6_path_0_animation = 2130772031;
- // aapt resource value: 0x7f050040
- public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2131034176;
+ // aapt resource value: 0x7F010040
+ public const int fingerprint_fp_to_error_state_ridge_6_path_animation = 2130772032;
- // aapt resource value: 0x7f050041
- public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2131034177;
+ // aapt resource value: 0x7F010041
+ public const int fingerprint_fp_to_error_state_ridge_7_path_0_animation = 2130772033;
- // aapt resource value: 0x7f050042
- public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2131034178;
+ // aapt resource value: 0x7F010042
+ public const int fingerprint_fp_to_error_state_ridge_7_path_animation = 2130772034;
- // aapt resource value: 0x7f050043
- public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2131034179;
+ // aapt resource value: 0x7F010043
+ public const int fingerprint_fp_to_error_state_white_fingerprint_ridges_animation = 2130772035;
- // aapt resource value: 0x7f050044
- public const int move_in = 2131034180;
+ // aapt resource value: 0x7F010044
+ public const int move_in = 2130772036;
- // aapt resource value: 0x7f050045
- public const int move_out = 2131034181;
+ // aapt resource value: 0x7F010045
+ public const int move_out = 2130772037;
- // aapt resource value: 0x7f050046
- public const int pickerview_dialog_scale_in = 2131034182;
+ // aapt resource value: 0x7F010046
+ public const int pickerview_dialog_scale_in = 2130772038;
- // aapt resource value: 0x7f050047
- public const int pickerview_dialog_scale_out = 2131034183;
+ // aapt resource value: 0x7F010047
+ public const int pickerview_dialog_scale_out = 2130772039;
- // aapt resource value: 0x7f050048
- public const int pickerview_slide_in_bottom = 2131034184;
+ // aapt resource value: 0x7F010048
+ public const int pickerview_slide_in_bottom = 2130772040;
- // aapt resource value: 0x7f050049
- public const int pickerview_slide_out_bottom = 2131034185;
+ // aapt resource value: 0x7F010049
+ public const int pickerview_slide_out_bottom = 2130772041;
- // aapt resource value: 0x7f05004a
- public const int tooltip_enter = 2131034186;
+ // aapt resource value: 0x7F01004A
+ public const int tooltip_enter = 2130772042;
- // aapt resource value: 0x7f05004b
- public const int tooltip_exit = 2131034187;
+ // aapt resource value: 0x7F01004B
+ public const int tooltip_exit = 2130772043;
static Animation()
{
@@ -275,8 +275,8 @@
public partial class Animator
{
- // aapt resource value: 0x7f060000
- public const int design_appbar_state_list_animator = 2131099648;
+ // aapt resource value: 0x7F020000
+ public const int design_appbar_state_list_animator = 2130837504;
static Animator()
{
@@ -291,8 +291,8 @@
public partial class Array
{
- // aapt resource value: 0x7f0f0000
- public const int arc_colors_default = 2131689472;
+ // aapt resource value: 0x7F030000
+ public const int arc_colors_default = 2130903040;
static Array()
{
@@ -307,1355 +307,1355 @@
public partial class Attribute
{
- // aapt resource value: 0x7f010052
- public const int actionBarDivider = 2130772050;
+ // aapt resource value: 0x7F040000
+ public const int actionBarDivider = 2130968576;
- // aapt resource value: 0x7f010053
- public const int actionBarItemBackground = 2130772051;
+ // aapt resource value: 0x7F040001
+ public const int actionBarItemBackground = 2130968577;
- // aapt resource value: 0x7f01004c
- public const int actionBarPopupTheme = 2130772044;
+ // aapt resource value: 0x7F040002
+ public const int actionBarPopupTheme = 2130968578;
- // aapt resource value: 0x7f010051
- public const int actionBarSize = 2130772049;
+ // aapt resource value: 0x7F040003
+ public const int actionBarSize = 2130968579;
- // aapt resource value: 0x7f01004e
- public const int actionBarSplitStyle = 2130772046;
+ // aapt resource value: 0x7F040004
+ public const int actionBarSplitStyle = 2130968580;
- // aapt resource value: 0x7f01004d
- public const int actionBarStyle = 2130772045;
+ // aapt resource value: 0x7F040005
+ public const int actionBarStyle = 2130968581;
- // aapt resource value: 0x7f010048
- public const int actionBarTabBarStyle = 2130772040;
+ // aapt resource value: 0x7F040006
+ public const int actionBarTabBarStyle = 2130968582;
- // aapt resource value: 0x7f010047
- public const int actionBarTabStyle = 2130772039;
+ // aapt resource value: 0x7F040007
+ public const int actionBarTabStyle = 2130968583;
- // aapt resource value: 0x7f010049
- public const int actionBarTabTextStyle = 2130772041;
+ // aapt resource value: 0x7F040008
+ public const int actionBarTabTextStyle = 2130968584;
- // aapt resource value: 0x7f01004f
- public const int actionBarTheme = 2130772047;
+ // aapt resource value: 0x7F040009
+ public const int actionBarTheme = 2130968585;
- // aapt resource value: 0x7f010050
- public const int actionBarWidgetTheme = 2130772048;
+ // aapt resource value: 0x7F04000A
+ public const int actionBarWidgetTheme = 2130968586;
- // aapt resource value: 0x7f01006d
- public const int actionButtonStyle = 2130772077;
+ // aapt resource value: 0x7F04000B
+ public const int actionButtonStyle = 2130968587;
- // aapt resource value: 0x7f010069
- public const int actionDropDownStyle = 2130772073;
+ // aapt resource value: 0x7F04000C
+ public const int actionDropDownStyle = 2130968588;
- // aapt resource value: 0x7f0100c4
- public const int actionLayout = 2130772164;
+ // aapt resource value: 0x7F04000D
+ public const int actionLayout = 2130968589;
- // aapt resource value: 0x7f010054
- public const int actionMenuTextAppearance = 2130772052;
+ // aapt resource value: 0x7F04000E
+ public const int actionMenuTextAppearance = 2130968590;
- // aapt resource value: 0x7f010055
- public const int actionMenuTextColor = 2130772053;
+ // aapt resource value: 0x7F04000F
+ public const int actionMenuTextColor = 2130968591;
- // aapt resource value: 0x7f010058
- public const int actionModeBackground = 2130772056;
+ // aapt resource value: 0x7F040010
+ public const int actionModeBackground = 2130968592;
- // aapt resource value: 0x7f010057
- public const int actionModeCloseButtonStyle = 2130772055;
+ // aapt resource value: 0x7F040011
+ public const int actionModeCloseButtonStyle = 2130968593;
- // aapt resource value: 0x7f01005a
- public const int actionModeCloseDrawable = 2130772058;
+ // aapt resource value: 0x7F040012
+ public const int actionModeCloseDrawable = 2130968594;
- // aapt resource value: 0x7f01005c
- public const int actionModeCopyDrawable = 2130772060;
+ // aapt resource value: 0x7F040013
+ public const int actionModeCopyDrawable = 2130968595;
- // aapt resource value: 0x7f01005b
- public const int actionModeCutDrawable = 2130772059;
+ // aapt resource value: 0x7F040014
+ public const int actionModeCutDrawable = 2130968596;
- // aapt resource value: 0x7f010060
- public const int actionModeFindDrawable = 2130772064;
+ // aapt resource value: 0x7F040015
+ public const int actionModeFindDrawable = 2130968597;
- // aapt resource value: 0x7f01005d
- public const int actionModePasteDrawable = 2130772061;
+ // aapt resource value: 0x7F040016
+ public const int actionModePasteDrawable = 2130968598;
- // aapt resource value: 0x7f010062
- public const int actionModePopupWindowStyle = 2130772066;
+ // aapt resource value: 0x7F040017
+ public const int actionModePopupWindowStyle = 2130968599;
- // aapt resource value: 0x7f01005e
- public const int actionModeSelectAllDrawable = 2130772062;
+ // aapt resource value: 0x7F040018
+ public const int actionModeSelectAllDrawable = 2130968600;
- // aapt resource value: 0x7f01005f
- public const int actionModeShareDrawable = 2130772063;
+ // aapt resource value: 0x7F040019
+ public const int actionModeShareDrawable = 2130968601;
- // aapt resource value: 0x7f010059
- public const int actionModeSplitBackground = 2130772057;
+ // aapt resource value: 0x7F04001A
+ public const int actionModeSplitBackground = 2130968602;
- // aapt resource value: 0x7f010056
- public const int actionModeStyle = 2130772054;
+ // aapt resource value: 0x7F04001B
+ public const int actionModeStyle = 2130968603;
- // aapt resource value: 0x7f010061
- public const int actionModeWebSearchDrawable = 2130772065;
+ // aapt resource value: 0x7F04001C
+ public const int actionModeWebSearchDrawable = 2130968604;
- // aapt resource value: 0x7f01004a
- public const int actionOverflowButtonStyle = 2130772042;
+ // aapt resource value: 0x7F04001D
+ public const int actionOverflowButtonStyle = 2130968605;
- // aapt resource value: 0x7f01004b
- public const int actionOverflowMenuStyle = 2130772043;
+ // aapt resource value: 0x7F04001E
+ public const int actionOverflowMenuStyle = 2130968606;
- // aapt resource value: 0x7f0100c6
- public const int actionProviderClass = 2130772166;
+ // aapt resource value: 0x7F04001F
+ public const int actionProviderClass = 2130968607;
- // aapt resource value: 0x7f0100c5
- public const int actionViewClass = 2130772165;
+ // aapt resource value: 0x7F040020
+ public const int actionViewClass = 2130968608;
- // aapt resource value: 0x7f010075
- public const int activityChooserViewStyle = 2130772085;
+ // aapt resource value: 0x7F040021
+ public const int activityChooserViewStyle = 2130968609;
- // aapt resource value: 0x7f01009a
- public const int alertDialogButtonGroupStyle = 2130772122;
+ // aapt resource value: 0x7F040022
+ public const int alertDialogButtonGroupStyle = 2130968610;
- // aapt resource value: 0x7f01009b
- public const int alertDialogCenterButtons = 2130772123;
+ // aapt resource value: 0x7F040023
+ public const int alertDialogCenterButtons = 2130968611;
- // aapt resource value: 0x7f010099
- public const int alertDialogStyle = 2130772121;
+ // aapt resource value: 0x7F040024
+ public const int alertDialogStyle = 2130968612;
- // aapt resource value: 0x7f01009c
- public const int alertDialogTheme = 2130772124;
+ // aapt resource value: 0x7F040025
+ public const int alertDialogTheme = 2130968613;
- // aapt resource value: 0x7f0100b2
- public const int allowStacking = 2130772146;
+ // aapt resource value: 0x7F040026
+ public const int allowStacking = 2130968614;
- // aapt resource value: 0x7f0100b3
- public const int alpha = 2130772147;
+ // aapt resource value: 0x7F040027
+ public const int alpha = 2130968615;
- // aapt resource value: 0x7f0100c1
- public const int alphabeticModifiers = 2130772161;
+ // aapt resource value: 0x7F040028
+ public const int alphabeticModifiers = 2130968616;
- // aapt resource value: 0x7f0101a3
- public const int arc_border_color = 2130772387;
+ // aapt resource value: 0x7F040029
+ public const int arc_border_color = 2130968617;
- // aapt resource value: 0x7f0101a2
- public const int arc_border_width = 2130772386;
+ // aapt resource value: 0x7F04002A
+ public const int arc_border_width = 2130968618;
- // aapt resource value: 0x7f0101a1
- public const int arc_colors = 2130772385;
+ // aapt resource value: 0x7F04002B
+ public const int arc_colors = 2130968619;
- // aapt resource value: 0x7f0101a4
- public const int arc_max = 2130772388;
+ // aapt resource value: 0x7F04002C
+ public const int arc_max = 2130968620;
- // aapt resource value: 0x7f0101a5
- public const int arc_min = 2130772389;
+ // aapt resource value: 0x7F04002D
+ public const int arc_min = 2130968621;
- // aapt resource value: 0x7f01019f
- public const int arc_open_angle = 2130772383;
+ // aapt resource value: 0x7F04002E
+ public const int arc_open_angle = 2130968622;
- // aapt resource value: 0x7f0101a6
- public const int arc_progress = 2130772390;
+ // aapt resource value: 0x7F04002F
+ public const int arc_progress = 2130968623;
- // aapt resource value: 0x7f0101ae
- public const int arc_progress_bar_color = 2130772398;
+ // aapt resource value: 0x7F040030
+ public const int arc_progress_bar_color = 2130968624;
- // aapt resource value: 0x7f0101af
- public const int arc_progress_bar_text_unit = 2130772399;
+ // aapt resource value: 0x7F040031
+ public const int arc_progress_bar_text_unit = 2130968625;
- // aapt resource value: 0x7f0101a0
- public const int arc_rotate_angle = 2130772384;
+ // aapt resource value: 0x7F040032
+ public const int arc_rotate_angle = 2130968626;
- // aapt resource value: 0x7f0101ad
- public const int arc_shadow_radius = 2130772397;
+ // aapt resource value: 0x7F040033
+ public const int arc_shadow_radius = 2130968627;
- // aapt resource value: 0x7f0101a8
- public const int arc_thumb_color = 2130772392;
+ // aapt resource value: 0x7F040034
+ public const int arc_thumb_color = 2130968628;
- // aapt resource value: 0x7f0101a9
- public const int arc_thumb_radius = 2130772393;
+ // aapt resource value: 0x7F040035
+ public const int arc_thumb_radius = 2130968629;
- // aapt resource value: 0x7f0101ab
- public const int arc_thumb_shadow_color = 2130772395;
+ // aapt resource value: 0x7F040036
+ public const int arc_thumb_shadow_color = 2130968630;
- // aapt resource value: 0x7f0101aa
- public const int arc_thumb_shadow_radius = 2130772394;
+ // aapt resource value: 0x7F040037
+ public const int arc_thumb_shadow_radius = 2130968631;
- // aapt resource value: 0x7f0101a7
- public const int arc_thumb_width = 2130772391;
+ // aapt resource value: 0x7F040038
+ public const int arc_thumb_width = 2130968632;
- // aapt resource value: 0x7f01019e
- public const int arc_width = 2130772382;
+ // aapt resource value: 0x7F040039
+ public const int arc_width = 2130968633;
- // aapt resource value: 0x7f0100ba
- public const int arrowHeadLength = 2130772154;
+ // aapt resource value: 0x7F04003A
+ public const int arrowHeadLength = 2130968634;
- // aapt resource value: 0x7f0100bb
- public const int arrowShaftLength = 2130772155;
+ // aapt resource value: 0x7F04003B
+ public const int arrowShaftLength = 2130968635;
- // aapt resource value: 0x7f0100a1
- public const int autoCompleteTextViewStyle = 2130772129;
+ // aapt resource value: 0x7F04003C
+ public const int autoCompleteTextViewStyle = 2130968636;
- // aapt resource value: 0x7f01003b
- public const int autoSizeMaxTextSize = 2130772027;
+ // aapt resource value: 0x7F04003D
+ public const int autoSizeMaxTextSize = 2130968637;
- // aapt resource value: 0x7f01003a
- public const int autoSizeMinTextSize = 2130772026;
+ // aapt resource value: 0x7F04003E
+ public const int autoSizeMinTextSize = 2130968638;
- // aapt resource value: 0x7f010039
- public const int autoSizePresetSizes = 2130772025;
+ // aapt resource value: 0x7F04003F
+ public const int autoSizePresetSizes = 2130968639;
- // aapt resource value: 0x7f010038
- public const int autoSizeStepGranularity = 2130772024;
+ // aapt resource value: 0x7F040040
+ public const int autoSizeStepGranularity = 2130968640;
- // aapt resource value: 0x7f010037
- public const int autoSizeTextType = 2130772023;
+ // aapt resource value: 0x7F040041
+ public const int autoSizeTextType = 2130968641;
- // aapt resource value: 0x7f010015
- public const int background = 2130771989;
+ // aapt resource value: 0x7F040042
+ public const int background = 2130968642;
- // aapt resource value: 0x7f010017
- public const int backgroundSplit = 2130771991;
+ // aapt resource value: 0x7F040043
+ public const int backgroundSplit = 2130968643;
- // aapt resource value: 0x7f010016
- public const int backgroundStacked = 2130771990;
+ // aapt resource value: 0x7F040044
+ public const int backgroundStacked = 2130968644;
- // aapt resource value: 0x7f0100fd
- public const int backgroundTint = 2130772221;
+ // aapt resource value: 0x7F040045
+ public const int backgroundTint = 2130968645;
- // aapt resource value: 0x7f0100fe
- public const int backgroundTintMode = 2130772222;
+ // aapt resource value: 0x7F040046
+ public const int backgroundTintMode = 2130968646;
- // aapt resource value: 0x7f0100bc
- public const int barLength = 2130772156;
+ // aapt resource value: 0x7F040047
+ public const int barLength = 2130968647;
- // aapt resource value: 0x7f010128
- public const int behavior_autoHide = 2130772264;
+ // aapt resource value: 0x7F040048
+ public const int behavior_autoHide = 2130968648;
- // aapt resource value: 0x7f010105
- public const int behavior_hideable = 2130772229;
+ // aapt resource value: 0x7F040049
+ public const int behavior_hideable = 2130968649;
- // aapt resource value: 0x7f010131
- public const int behavior_overlapTop = 2130772273;
+ // aapt resource value: 0x7F04004A
+ public const int behavior_overlapTop = 2130968650;
- // aapt resource value: 0x7f010104
- public const int behavior_peekHeight = 2130772228;
+ // aapt resource value: 0x7F04004B
+ public const int behavior_peekHeight = 2130968651;
- // aapt resource value: 0x7f010106
- public const int behavior_skipCollapsed = 2130772230;
+ // aapt resource value: 0x7F04004C
+ public const int behavior_skipCollapsed = 2130968652;
- // aapt resource value: 0x7f01015a
- public const int biometricPromptDialogTheme = 2130772314;
+ // aapt resource value: 0x7F04004D
+ public const int biometricPromptDialogTheme = 2130968653;
- // aapt resource value: 0x7f010126
- public const int borderWidth = 2130772262;
+ // aapt resource value: 0x7F04004F
+ public const int borderlessButtonStyle = 2130968655;
- // aapt resource value: 0x7f010072
- public const int borderlessButtonStyle = 2130772082;
+ // aapt resource value: 0x7F04004E
+ public const int borderWidth = 2130968654;
- // aapt resource value: 0x7f010120
- public const int bottomSheetDialogTheme = 2130772256;
+ // aapt resource value: 0x7F040050
+ public const int bottomSheetDialogTheme = 2130968656;
- // aapt resource value: 0x7f010121
- public const int bottomSheetStyle = 2130772257;
+ // aapt resource value: 0x7F040051
+ public const int bottomSheetStyle = 2130968657;
- // aapt resource value: 0x7f01006f
- public const int buttonBarButtonStyle = 2130772079;
+ // aapt resource value: 0x7F040052
+ public const int buttonBarButtonStyle = 2130968658;
- // aapt resource value: 0x7f01009f
- public const int buttonBarNegativeButtonStyle = 2130772127;
+ // aapt resource value: 0x7F040053
+ public const int buttonBarNegativeButtonStyle = 2130968659;
- // aapt resource value: 0x7f0100a0
- public const int buttonBarNeutralButtonStyle = 2130772128;
+ // aapt resource value: 0x7F040054
+ public const int buttonBarNeutralButtonStyle = 2130968660;
- // aapt resource value: 0x7f01009e
- public const int buttonBarPositiveButtonStyle = 2130772126;
+ // aapt resource value: 0x7F040055
+ public const int buttonBarPositiveButtonStyle = 2130968661;
- // aapt resource value: 0x7f01006e
- public const int buttonBarStyle = 2130772078;
+ // aapt resource value: 0x7F040056
+ public const int buttonBarStyle = 2130968662;
- // aapt resource value: 0x7f0100f2
- public const int buttonGravity = 2130772210;
+ // aapt resource value: 0x7F040057
+ public const int buttonGravity = 2130968663;
- // aapt resource value: 0x7f01002a
- public const int buttonPanelSideLayout = 2130772010;
+ // aapt resource value: 0x7F040058
+ public const int buttonPanelSideLayout = 2130968664;
- // aapt resource value: 0x7f0100a2
- public const int buttonStyle = 2130772130;
+ // aapt resource value: 0x7F040059
+ public const int buttonStyle = 2130968665;
- // aapt resource value: 0x7f0100a3
- public const int buttonStyleSmall = 2130772131;
+ // aapt resource value: 0x7F04005A
+ public const int buttonStyleSmall = 2130968666;
- // aapt resource value: 0x7f0100b4
- public const int buttonTint = 2130772148;
+ // aapt resource value: 0x7F04005B
+ public const int buttonTint = 2130968667;
- // aapt resource value: 0x7f0100b5
- public const int buttonTintMode = 2130772149;
+ // aapt resource value: 0x7F04005C
+ public const int buttonTintMode = 2130968668;
- // aapt resource value: 0x7f0100a4
- public const int checkboxStyle = 2130772132;
+ // aapt resource value: 0x7F04005D
+ public const int checkboxStyle = 2130968669;
- // aapt resource value: 0x7f0100a5
- public const int checkedTextViewStyle = 2130772133;
+ // aapt resource value: 0x7F04005E
+ public const int checkedTextViewStyle = 2130968670;
- // aapt resource value: 0x7f0100d5
- public const int closeIcon = 2130772181;
+ // aapt resource value: 0x7F04005F
+ public const int closeIcon = 2130968671;
- // aapt resource value: 0x7f010027
- public const int closeItemLayout = 2130772007;
+ // aapt resource value: 0x7F040060
+ public const int closeItemLayout = 2130968672;
- // aapt resource value: 0x7f0100f4
- public const int collapseContentDescription = 2130772212;
+ // aapt resource value: 0x7F040061
+ public const int collapseContentDescription = 2130968673;
- // aapt resource value: 0x7f0100f3
- public const int collapseIcon = 2130772211;
+ // aapt resource value: 0x7F040063
+ public const int collapsedTitleGravity = 2130968675;
- // aapt resource value: 0x7f010113
- public const int collapsedTitleGravity = 2130772243;
+ // aapt resource value: 0x7F040064
+ public const int collapsedTitleTextAppearance = 2130968676;
- // aapt resource value: 0x7f01010d
- public const int collapsedTitleTextAppearance = 2130772237;
+ // aapt resource value: 0x7F040062
+ public const int collapseIcon = 2130968674;
- // aapt resource value: 0x7f0100b6
- public const int color = 2130772150;
+ // aapt resource value: 0x7F040065
+ public const int color = 2130968677;
- // aapt resource value: 0x7f010091
- public const int colorAccent = 2130772113;
+ // aapt resource value: 0x7F040066
+ public const int colorAccent = 2130968678;
- // aapt resource value: 0x7f010098
- public const int colorBackgroundFloating = 2130772120;
+ // aapt resource value: 0x7F040067
+ public const int colorBackgroundFloating = 2130968679;
- // aapt resource value: 0x7f010095
- public const int colorButtonNormal = 2130772117;
+ // aapt resource value: 0x7F040068
+ public const int colorButtonNormal = 2130968680;
- // aapt resource value: 0x7f010093
- public const int colorControlActivated = 2130772115;
+ // aapt resource value: 0x7F040069
+ public const int colorControlActivated = 2130968681;
- // aapt resource value: 0x7f010094
- public const int colorControlHighlight = 2130772116;
+ // aapt resource value: 0x7F04006A
+ public const int colorControlHighlight = 2130968682;
- // aapt resource value: 0x7f010092
- public const int colorControlNormal = 2130772114;
+ // aapt resource value: 0x7F04006B
+ public const int colorControlNormal = 2130968683;
- // aapt resource value: 0x7f0100b1
- public const int colorError = 2130772145;
+ // aapt resource value: 0x7F04006C
+ public const int colorError = 2130968684;
- // aapt resource value: 0x7f01008f
- public const int colorPrimary = 2130772111;
+ // aapt resource value: 0x7F04006D
+ public const int colorPrimary = 2130968685;
- // aapt resource value: 0x7f010090
- public const int colorPrimaryDark = 2130772112;
+ // aapt resource value: 0x7F04006E
+ public const int colorPrimaryDark = 2130968686;
- // aapt resource value: 0x7f010096
- public const int colorSwitchThumbNormal = 2130772118;
+ // aapt resource value: 0x7F04006F
+ public const int colorSwitchThumbNormal = 2130968687;
- // aapt resource value: 0x7f0100da
- public const int commitIcon = 2130772186;
+ // aapt resource value: 0x7F040070
+ public const int commitIcon = 2130968688;
- // aapt resource value: 0x7f0100c7
- public const int contentDescription = 2130772167;
+ // aapt resource value: 0x7F040071
+ public const int contentDescription = 2130968689;
- // aapt resource value: 0x7f010020
- public const int contentInsetEnd = 2130772000;
+ // aapt resource value: 0x7F040072
+ public const int contentInsetEnd = 2130968690;
- // aapt resource value: 0x7f010024
- public const int contentInsetEndWithActions = 2130772004;
+ // aapt resource value: 0x7F040073
+ public const int contentInsetEndWithActions = 2130968691;
- // aapt resource value: 0x7f010021
- public const int contentInsetLeft = 2130772001;
+ // aapt resource value: 0x7F040074
+ public const int contentInsetLeft = 2130968692;
- // aapt resource value: 0x7f010022
- public const int contentInsetRight = 2130772002;
+ // aapt resource value: 0x7F040075
+ public const int contentInsetRight = 2130968693;
- // aapt resource value: 0x7f01001f
- public const int contentInsetStart = 2130771999;
+ // aapt resource value: 0x7F040076
+ public const int contentInsetStart = 2130968694;
- // aapt resource value: 0x7f010023
- public const int contentInsetStartWithNavigation = 2130772003;
+ // aapt resource value: 0x7F040077
+ public const int contentInsetStartWithNavigation = 2130968695;
- // aapt resource value: 0x7f01010e
- public const int contentScrim = 2130772238;
+ // aapt resource value: 0x7F040078
+ public const int contentScrim = 2130968696;
- // aapt resource value: 0x7f010097
- public const int controlBackground = 2130772119;
+ // aapt resource value: 0x7F040079
+ public const int controlBackground = 2130968697;
- // aapt resource value: 0x7f010147
- public const int counterEnabled = 2130772295;
+ // aapt resource value: 0x7F04007A
+ public const int counterEnabled = 2130968698;
- // aapt resource value: 0x7f010148
- public const int counterMaxLength = 2130772296;
+ // aapt resource value: 0x7F04007B
+ public const int counterMaxLength = 2130968699;
- // aapt resource value: 0x7f01014a
- public const int counterOverflowTextAppearance = 2130772298;
+ // aapt resource value: 0x7F04007C
+ public const int counterOverflowTextAppearance = 2130968700;
- // aapt resource value: 0x7f010149
- public const int counterTextAppearance = 2130772297;
+ // aapt resource value: 0x7F04007D
+ public const int counterTextAppearance = 2130968701;
- // aapt resource value: 0x7f0101b2
- public const int curtain_bar_bg_color = 2130772402;
+ // aapt resource value: 0x7F04007E
+ public const int curtain_bar_bg_color = 2130968702;
- // aapt resource value: 0x7f0101b3
- public const int curtain_bar_border_color = 2130772403;
+ // aapt resource value: 0x7F04007F
+ public const int curtain_bar_border_color = 2130968703;
- // aapt resource value: 0x7f0101b0
- public const int curtain_bar_color = 2130772400;
+ // aapt resource value: 0x7F040080
+ public const int curtain_bar_color = 2130968704;
- // aapt resource value: 0x7f0101b5
- public const int curtain_bar_height = 2130772405;
+ // aapt resource value: 0x7F040081
+ public const int curtain_bar_height = 2130968705;
- // aapt resource value: 0x7f0101b4
- public const int curtain_bar_width = 2130772404;
+ // aapt resource value: 0x7F040082
+ public const int curtain_bar_width = 2130968706;
- // aapt resource value: 0x7f010018
- public const int customNavigationLayout = 2130771992;
+ // aapt resource value: 0x7F040083
+ public const int customNavigationLayout = 2130968707;
- // aapt resource value: 0x7f0100d4
- public const int defaultQueryHint = 2130772180;
+ // aapt resource value: 0x7F040084
+ public const int defaultQueryHint = 2130968708;
- // aapt resource value: 0x7f010067
- public const int dialogPreferredPadding = 2130772071;
+ // aapt resource value: 0x7F040085
+ public const int dialogPreferredPadding = 2130968709;
- // aapt resource value: 0x7f010066
- public const int dialogTheme = 2130772070;
+ // aapt resource value: 0x7F040086
+ public const int dialogTheme = 2130968710;
- // aapt resource value: 0x7f01000e
- public const int displayOptions = 2130771982;
+ // aapt resource value: 0x7F040087
+ public const int displayOptions = 2130968711;
- // aapt resource value: 0x7f010014
- public const int divider = 2130771988;
+ // aapt resource value: 0x7F040088
+ public const int divider = 2130968712;
- // aapt resource value: 0x7f010074
- public const int dividerHorizontal = 2130772084;
+ // aapt resource value: 0x7F040089
+ public const int dividerHorizontal = 2130968713;
- // aapt resource value: 0x7f0100c0
- public const int dividerPadding = 2130772160;
+ // aapt resource value: 0x7F04008A
+ public const int dividerPadding = 2130968714;
- // aapt resource value: 0x7f010073
- public const int dividerVertical = 2130772083;
+ // aapt resource value: 0x7F04008B
+ public const int dividerVertical = 2130968715;
- // aapt resource value: 0x7f0100b8
- public const int drawableSize = 2130772152;
+ // aapt resource value: 0x7F04008C
+ public const int drawableSize = 2130968716;
- // aapt resource value: 0x7f010009
- public const int drawerArrowStyle = 2130771977;
+ // aapt resource value: 0x7F04008D
+ public const int drawerArrowStyle = 2130968717;
- // aapt resource value: 0x7f010086
- public const int dropDownListViewStyle = 2130772102;
+ // aapt resource value: 0x7F04008F
+ public const int dropdownListPreferredItemHeight = 2130968719;
- // aapt resource value: 0x7f01006a
- public const int dropdownListPreferredItemHeight = 2130772074;
+ // aapt resource value: 0x7F04008E
+ public const int dropDownListViewStyle = 2130968718;
- // aapt resource value: 0x7f01007b
- public const int editTextBackground = 2130772091;
+ // aapt resource value: 0x7F040090
+ public const int editTextBackground = 2130968720;
- // aapt resource value: 0x7f01007a
- public const int editTextColor = 2130772090;
+ // aapt resource value: 0x7F040091
+ public const int editTextColor = 2130968721;
- // aapt resource value: 0x7f0100a6
- public const int editTextStyle = 2130772134;
+ // aapt resource value: 0x7F040092
+ public const int editTextStyle = 2130968722;
- // aapt resource value: 0x7f010025
- public const int elevation = 2130772005;
+ // aapt resource value: 0x7F040093
+ public const int elevation = 2130968723;
- // aapt resource value: 0x7f010145
- public const int errorEnabled = 2130772293;
+ // aapt resource value: 0x7F040094
+ public const int errorEnabled = 2130968724;
- // aapt resource value: 0x7f010146
- public const int errorTextAppearance = 2130772294;
+ // aapt resource value: 0x7F040095
+ public const int errorTextAppearance = 2130968725;
- // aapt resource value: 0x7f010029
- public const int expandActivityOverflowButtonDrawable = 2130772009;
+ // aapt resource value: 0x7F040096
+ public const int expandActivityOverflowButtonDrawable = 2130968726;
- // aapt resource value: 0x7f0100ff
- public const int expanded = 2130772223;
+ // aapt resource value: 0x7F040097
+ public const int expanded = 2130968727;
- // aapt resource value: 0x7f010114
- public const int expandedTitleGravity = 2130772244;
+ // aapt resource value: 0x7F040098
+ public const int expandedTitleGravity = 2130968728;
- // aapt resource value: 0x7f010107
- public const int expandedTitleMargin = 2130772231;
+ // aapt resource value: 0x7F040099
+ public const int expandedTitleMargin = 2130968729;
- // aapt resource value: 0x7f01010b
- public const int expandedTitleMarginBottom = 2130772235;
+ // aapt resource value: 0x7F04009A
+ public const int expandedTitleMarginBottom = 2130968730;
- // aapt resource value: 0x7f01010a
- public const int expandedTitleMarginEnd = 2130772234;
+ // aapt resource value: 0x7F04009B
+ public const int expandedTitleMarginEnd = 2130968731;
- // aapt resource value: 0x7f010108
- public const int expandedTitleMarginStart = 2130772232;
+ // aapt resource value: 0x7F04009C
+ public const int expandedTitleMarginStart = 2130968732;
- // aapt resource value: 0x7f010109
- public const int expandedTitleMarginTop = 2130772233;
+ // aapt resource value: 0x7F04009D
+ public const int expandedTitleMarginTop = 2130968733;
- // aapt resource value: 0x7f01010c
- public const int expandedTitleTextAppearance = 2130772236;
+ // aapt resource value: 0x7F04009E
+ public const int expandedTitleTextAppearance = 2130968734;
- // aapt resource value: 0x7f010124
- public const int fabSize = 2130772260;
+ // aapt resource value: 0x7F04009F
+ public const int fabSize = 2130968735;
- // aapt resource value: 0x7f010004
- public const int fastScrollEnabled = 2130771972;
+ // aapt resource value: 0x7F0400A0
+ public const int fastScrollEnabled = 2130968736;
- // aapt resource value: 0x7f010007
- public const int fastScrollHorizontalThumbDrawable = 2130771975;
+ // aapt resource value: 0x7F0400A1
+ public const int fastScrollHorizontalThumbDrawable = 2130968737;
- // aapt resource value: 0x7f010008
- public const int fastScrollHorizontalTrackDrawable = 2130771976;
+ // aapt resource value: 0x7F0400A2
+ public const int fastScrollHorizontalTrackDrawable = 2130968738;
- // aapt resource value: 0x7f010005
- public const int fastScrollVerticalThumbDrawable = 2130771973;
+ // aapt resource value: 0x7F0400A3
+ public const int fastScrollVerticalThumbDrawable = 2130968739;
- // aapt resource value: 0x7f010006
- public const int fastScrollVerticalTrackDrawable = 2130771974;
+ // aapt resource value: 0x7F0400A4
+ public const int fastScrollVerticalTrackDrawable = 2130968740;
- // aapt resource value: 0x7f010158
- public const int font = 2130772312;
+ // aapt resource value: 0x7F0400A5
+ public const int font = 2130968741;
- // aapt resource value: 0x7f01003c
- public const int fontFamily = 2130772028;
+ // aapt resource value: 0x7F0400A6
+ public const int fontFamily = 2130968742;
- // aapt resource value: 0x7f010151
- public const int fontProviderAuthority = 2130772305;
+ // aapt resource value: 0x7F0400A7
+ public const int fontProviderAuthority = 2130968743;
- // aapt resource value: 0x7f010154
- public const int fontProviderCerts = 2130772308;
+ // aapt resource value: 0x7F0400A8
+ public const int fontProviderCerts = 2130968744;
- // aapt resource value: 0x7f010155
- public const int fontProviderFetchStrategy = 2130772309;
+ // aapt resource value: 0x7F0400A9
+ public const int fontProviderFetchStrategy = 2130968745;
- // aapt resource value: 0x7f010156
- public const int fontProviderFetchTimeout = 2130772310;
+ // aapt resource value: 0x7F0400AA
+ public const int fontProviderFetchTimeout = 2130968746;
- // aapt resource value: 0x7f010152
- public const int fontProviderPackage = 2130772306;
+ // aapt resource value: 0x7F0400AB
+ public const int fontProviderPackage = 2130968747;
- // aapt resource value: 0x7f010153
- public const int fontProviderQuery = 2130772307;
+ // aapt resource value: 0x7F0400AC
+ public const int fontProviderQuery = 2130968748;
- // aapt resource value: 0x7f010157
- public const int fontStyle = 2130772311;
+ // aapt resource value: 0x7F0400AD
+ public const int fontStyle = 2130968749;
- // aapt resource value: 0x7f010159
- public const int fontWeight = 2130772313;
+ // aapt resource value: 0x7F0400AE
+ public const int fontWeight = 2130968750;
- // aapt resource value: 0x7f010129
- public const int foregroundInsidePadding = 2130772265;
+ // aapt resource value: 0x7F0400AF
+ public const int foregroundInsidePadding = 2130968751;
- // aapt resource value: 0x7f0100b9
- public const int gapBetweenBars = 2130772153;
+ // aapt resource value: 0x7F0400B0
+ public const int gapBetweenBars = 2130968752;
- // aapt resource value: 0x7f0100d6
- public const int goIcon = 2130772182;
+ // aapt resource value: 0x7F0400B1
+ public const int goIcon = 2130968753;
- // aapt resource value: 0x7f0101ac
- public const int hdl_arc_thumb_mode = 2130772396;
+ // aapt resource value: 0x7F0400B2
+ public const int hdl_arc_thumb_mode = 2130968754;
- // aapt resource value: 0x7f01012f
- public const int headerLayout = 2130772271;
+ // aapt resource value: 0x7F0400B3
+ public const int headerLayout = 2130968755;
- // aapt resource value: 0x7f01000a
- public const int height = 2130771978;
+ // aapt resource value: 0x7F0400B4
+ public const int height = 2130968756;
- // aapt resource value: 0x7f01001e
- public const int hideOnContentScroll = 2130771998;
+ // aapt resource value: 0x7F0400B5
+ public const int hideOnContentScroll = 2130968757;
- // aapt resource value: 0x7f01014b
- public const int hintAnimationEnabled = 2130772299;
+ // aapt resource value: 0x7F0400B6
+ public const int hintAnimationEnabled = 2130968758;
- // aapt resource value: 0x7f010144
- public const int hintEnabled = 2130772292;
+ // aapt resource value: 0x7F0400B7
+ public const int hintEnabled = 2130968759;
- // aapt resource value: 0x7f010143
- public const int hintTextAppearance = 2130772291;
+ // aapt resource value: 0x7F0400B8
+ public const int hintTextAppearance = 2130968760;
- // aapt resource value: 0x7f01006c
- public const int homeAsUpIndicator = 2130772076;
+ // aapt resource value: 0x7F0400B9
+ public const int homeAsUpIndicator = 2130968761;
- // aapt resource value: 0x7f010019
- public const int homeLayout = 2130771993;
+ // aapt resource value: 0x7F0400BA
+ public const int homeLayout = 2130968762;
- // aapt resource value: 0x7f010012
- public const int icon = 2130771986;
+ // aapt resource value: 0x7F0400BB
+ public const int icon = 2130968763;
- // aapt resource value: 0x7f0100c9
- public const int iconTint = 2130772169;
+ // aapt resource value: 0x7F0400BE
+ public const int iconifiedByDefault = 2130968766;
- // aapt resource value: 0x7f0100ca
- public const int iconTintMode = 2130772170;
+ // aapt resource value: 0x7F0400BC
+ public const int iconTint = 2130968764;
- // aapt resource value: 0x7f0100d2
- public const int iconifiedByDefault = 2130772178;
+ // aapt resource value: 0x7F0400BD
+ public const int iconTintMode = 2130968765;
- // aapt resource value: 0x7f01007c
- public const int imageButtonStyle = 2130772092;
+ // aapt resource value: 0x7F0400BF
+ public const int imageButtonStyle = 2130968767;
- // aapt resource value: 0x7f01001b
- public const int indeterminateProgressStyle = 2130771995;
+ // aapt resource value: 0x7F0400C0
+ public const int indeterminateProgressStyle = 2130968768;
- // aapt resource value: 0x7f010028
- public const int initialActivityCount = 2130772008;
+ // aapt resource value: 0x7F0400C1
+ public const int initialActivityCount = 2130968769;
- // aapt resource value: 0x7f010130
- public const int insetForeground = 2130772272;
+ // aapt resource value: 0x7F0400C2
+ public const int insetForeground = 2130968770;
- // aapt resource value: 0x7f01000b
- public const int isLightTheme = 2130771979;
+ // aapt resource value: 0x7F0400C3
+ public const int isLightTheme = 2130968771;
- // aapt resource value: 0x7f01012d
- public const int itemBackground = 2130772269;
+ // aapt resource value: 0x7F0400C4
+ public const int itemBackground = 2130968772;
- // aapt resource value: 0x7f01012b
- public const int itemIconTint = 2130772267;
+ // aapt resource value: 0x7F0400C5
+ public const int itemIconTint = 2130968773;
- // aapt resource value: 0x7f01001d
- public const int itemPadding = 2130771997;
+ // aapt resource value: 0x7F0400C6
+ public const int itemPadding = 2130968774;
- // aapt resource value: 0x7f01012e
- public const int itemTextAppearance = 2130772270;
+ // aapt resource value: 0x7F0400C7
+ public const int itemTextAppearance = 2130968775;
- // aapt resource value: 0x7f01012c
- public const int itemTextColor = 2130772268;
+ // aapt resource value: 0x7F0400C8
+ public const int itemTextColor = 2130968776;
- // aapt resource value: 0x7f010118
- public const int keylines = 2130772248;
+ // aapt resource value: 0x7F0400C9
+ public const int keylines = 2130968777;
- // aapt resource value: 0x7f0100d1
- public const int layout = 2130772177;
+ // aapt resource value: 0x7F0400CA
+ public const int layout = 2130968778;
- // aapt resource value: 0x7f010000
- public const int layoutManager = 2130771968;
+ // aapt resource value: 0x7F0400CB
+ public const int layoutManager = 2130968779;
- // aapt resource value: 0x7f01011b
- public const int layout_anchor = 2130772251;
+ // aapt resource value: 0x7F0400CC
+ public const int layout_anchor = 2130968780;
- // aapt resource value: 0x7f01011d
- public const int layout_anchorGravity = 2130772253;
+ // aapt resource value: 0x7F0400CD
+ public const int layout_anchorGravity = 2130968781;
- // aapt resource value: 0x7f01011a
- public const int layout_behavior = 2130772250;
+ // aapt resource value: 0x7F0400CE
+ public const int layout_behavior = 2130968782;
- // aapt resource value: 0x7f010116
- public const int layout_collapseMode = 2130772246;
+ // aapt resource value: 0x7F0400CF
+ public const int layout_collapseMode = 2130968783;
- // aapt resource value: 0x7f010117
- public const int layout_collapseParallaxMultiplier = 2130772247;
+ // aapt resource value: 0x7F0400D0
+ public const int layout_collapseParallaxMultiplier = 2130968784;
- // aapt resource value: 0x7f01011f
- public const int layout_dodgeInsetEdges = 2130772255;
+ // aapt resource value: 0x7F0400D1
+ public const int layout_dodgeInsetEdges = 2130968785;
- // aapt resource value: 0x7f01011e
- public const int layout_insetEdge = 2130772254;
+ // aapt resource value: 0x7F0400D2
+ public const int layout_insetEdge = 2130968786;
- // aapt resource value: 0x7f01011c
- public const int layout_keyline = 2130772252;
+ // aapt resource value: 0x7F0400D3
+ public const int layout_keyline = 2130968787;
- // aapt resource value: 0x7f010102
- public const int layout_scrollFlags = 2130772226;
+ // aapt resource value: 0x7F0400D4
+ public const int layout_scrollFlags = 2130968788;
- // aapt resource value: 0x7f010103
- public const int layout_scrollInterpolator = 2130772227;
+ // aapt resource value: 0x7F0400D5
+ public const int layout_scrollInterpolator = 2130968789;
- // aapt resource value: 0x7f010197
- public const int layout_srlBackgroundColor = 2130772375;
+ // aapt resource value: 0x7F0400D6
+ public const int layout_srlBackgroundColor = 2130968790;
- // aapt resource value: 0x7f01015b
- public const int layout_srlSpinnerStyle = 2130772315;
+ // aapt resource value: 0x7F0400D7
+ public const int layout_srlSpinnerStyle = 2130968791;
- // aapt resource value: 0x7f01008e
- public const int listChoiceBackgroundIndicator = 2130772110;
+ // aapt resource value: 0x7F0400D8
+ public const int listChoiceBackgroundIndicator = 2130968792;
- // aapt resource value: 0x7f010068
- public const int listDividerAlertDialog = 2130772072;
+ // aapt resource value: 0x7F0400D9
+ public const int listDividerAlertDialog = 2130968793;
- // aapt resource value: 0x7f01002e
- public const int listItemLayout = 2130772014;
+ // aapt resource value: 0x7F0400DA
+ public const int listItemLayout = 2130968794;
- // aapt resource value: 0x7f01002b
- public const int listLayout = 2130772011;
+ // aapt resource value: 0x7F0400DB
+ public const int listLayout = 2130968795;
- // aapt resource value: 0x7f0100ae
- public const int listMenuViewStyle = 2130772142;
+ // aapt resource value: 0x7F0400DC
+ public const int listMenuViewStyle = 2130968796;
- // aapt resource value: 0x7f010087
- public const int listPopupWindowStyle = 2130772103;
+ // aapt resource value: 0x7F0400DD
+ public const int listPopupWindowStyle = 2130968797;
- // aapt resource value: 0x7f010081
- public const int listPreferredItemHeight = 2130772097;
+ // aapt resource value: 0x7F0400DE
+ public const int listPreferredItemHeight = 2130968798;
- // aapt resource value: 0x7f010083
- public const int listPreferredItemHeightLarge = 2130772099;
+ // aapt resource value: 0x7F0400DF
+ public const int listPreferredItemHeightLarge = 2130968799;
- // aapt resource value: 0x7f010082
- public const int listPreferredItemHeightSmall = 2130772098;
+ // aapt resource value: 0x7F0400E0
+ public const int listPreferredItemHeightSmall = 2130968800;
- // aapt resource value: 0x7f010084
- public const int listPreferredItemPaddingLeft = 2130772100;
+ // aapt resource value: 0x7F0400E1
+ public const int listPreferredItemPaddingLeft = 2130968801;
- // aapt resource value: 0x7f010085
- public const int listPreferredItemPaddingRight = 2130772101;
+ // aapt resource value: 0x7F0400E2
+ public const int listPreferredItemPaddingRight = 2130968802;
- // aapt resource value: 0x7f010013
- public const int logo = 2130771987;
+ // aapt resource value: 0x7F0400E3
+ public const int logo = 2130968803;
- // aapt resource value: 0x7f0100f7
- public const int logoDescription = 2130772215;
+ // aapt resource value: 0x7F0400E4
+ public const int logoDescription = 2130968804;
- // aapt resource value: 0x7f010132
- public const int maxActionInlineWidth = 2130772274;
+ // aapt resource value: 0x7F0400E5
+ public const int maxActionInlineWidth = 2130968805;
- // aapt resource value: 0x7f0100f1
- public const int maxButtonHeight = 2130772209;
+ // aapt resource value: 0x7F0400E6
+ public const int maxButtonHeight = 2130968806;
- // aapt resource value: 0x7f0100be
- public const int measureWithLargestChild = 2130772158;
+ // aapt resource value: 0x7F0400E7
+ public const int measureWithLargestChild = 2130968807;
- // aapt resource value: 0x7f01012a
- public const int menu = 2130772266;
+ // aapt resource value: 0x7F0400E8
+ public const int menu = 2130968808;
- // aapt resource value: 0x7f01002c
- public const int multiChoiceItemLayout = 2130772012;
+ // aapt resource value: 0x7F0400E9
+ public const int multiChoiceItemLayout = 2130968809;
- // aapt resource value: 0x7f0100f6
- public const int navigationContentDescription = 2130772214;
+ // aapt resource value: 0x7F0400EA
+ public const int navigationContentDescription = 2130968810;
- // aapt resource value: 0x7f0100f5
- public const int navigationIcon = 2130772213;
+ // aapt resource value: 0x7F0400EB
+ public const int navigationIcon = 2130968811;
- // aapt resource value: 0x7f01000d
- public const int navigationMode = 2130771981;
+ // aapt resource value: 0x7F0400EC
+ public const int navigationMode = 2130968812;
- // aapt resource value: 0x7f0100c2
- public const int numericModifiers = 2130772162;
+ // aapt resource value: 0x7F0400ED
+ public const int numericModifiers = 2130968813;
- // aapt resource value: 0x7f0100cd
- public const int overlapAnchor = 2130772173;
+ // aapt resource value: 0x7F0400EE
+ public const int overlapAnchor = 2130968814;
- // aapt resource value: 0x7f0100cf
- public const int paddingBottomNoButtons = 2130772175;
+ // aapt resource value: 0x7F0400EF
+ public const int paddingBottomNoButtons = 2130968815;
- // aapt resource value: 0x7f0100fb
- public const int paddingEnd = 2130772219;
+ // aapt resource value: 0x7F0400F0
+ public const int paddingEnd = 2130968816;
- // aapt resource value: 0x7f0100fa
- public const int paddingStart = 2130772218;
+ // aapt resource value: 0x7F0400F1
+ public const int paddingStart = 2130968817;
- // aapt resource value: 0x7f0100d0
- public const int paddingTopNoTitle = 2130772176;
+ // aapt resource value: 0x7F0400F2
+ public const int paddingTopNoTitle = 2130968818;
- // aapt resource value: 0x7f01008b
- public const int panelBackground = 2130772107;
+ // aapt resource value: 0x7F0400F3
+ public const int panelBackground = 2130968819;
- // aapt resource value: 0x7f01008d
- public const int panelMenuListTheme = 2130772109;
+ // aapt resource value: 0x7F0400F4
+ public const int panelMenuListTheme = 2130968820;
- // aapt resource value: 0x7f01008c
- public const int panelMenuListWidth = 2130772108;
+ // aapt resource value: 0x7F0400F5
+ public const int panelMenuListWidth = 2130968821;
- // aapt resource value: 0x7f01014e
- public const int passwordToggleContentDescription = 2130772302;
+ // aapt resource value: 0x7F0400F6
+ public const int passwordToggleContentDescription = 2130968822;
- // aapt resource value: 0x7f01014d
- public const int passwordToggleDrawable = 2130772301;
+ // aapt resource value: 0x7F0400F7
+ public const int passwordToggleDrawable = 2130968823;
- // aapt resource value: 0x7f01014c
- public const int passwordToggleEnabled = 2130772300;
+ // aapt resource value: 0x7F0400F8
+ public const int passwordToggleEnabled = 2130968824;
- // aapt resource value: 0x7f01014f
- public const int passwordToggleTint = 2130772303;
+ // aapt resource value: 0x7F0400F9
+ public const int passwordToggleTint = 2130968825;
- // aapt resource value: 0x7f010150
- public const int passwordToggleTintMode = 2130772304;
+ // aapt resource value: 0x7F0400FA
+ public const int passwordToggleTintMode = 2130968826;
- // aapt resource value: 0x7f010078
- public const int popupMenuStyle = 2130772088;
+ // aapt resource value: 0x7F0400FB
+ public const int popupMenuStyle = 2130968827;
- // aapt resource value: 0x7f010026
- public const int popupTheme = 2130772006;
+ // aapt resource value: 0x7F0400FC
+ public const int popupTheme = 2130968828;
- // aapt resource value: 0x7f010079
- public const int popupWindowStyle = 2130772089;
+ // aapt resource value: 0x7F0400FD
+ public const int popupWindowStyle = 2130968829;
- // aapt resource value: 0x7f0100cb
- public const int preserveIconSpacing = 2130772171;
+ // aapt resource value: 0x7F0400FE
+ public const int preserveIconSpacing = 2130968830;
- // aapt resource value: 0x7f010125
- public const int pressedTranslationZ = 2130772261;
+ // aapt resource value: 0x7F0400FF
+ public const int pressedTranslationZ = 2130968831;
- // aapt resource value: 0x7f01001c
- public const int progressBarPadding = 2130771996;
+ // aapt resource value: 0x7F040100
+ public const int progressBarPadding = 2130968832;
- // aapt resource value: 0x7f01001a
- public const int progressBarStyle = 2130771994;
+ // aapt resource value: 0x7F040101
+ public const int progressBarStyle = 2130968833;
- // aapt resource value: 0x7f0100dc
- public const int queryBackground = 2130772188;
+ // aapt resource value: 0x7F040102
+ public const int queryBackground = 2130968834;
- // aapt resource value: 0x7f0100d3
- public const int queryHint = 2130772179;
+ // aapt resource value: 0x7F040103
+ public const int queryHint = 2130968835;
- // aapt resource value: 0x7f0100a7
- public const int radioButtonStyle = 2130772135;
+ // aapt resource value: 0x7F040104
+ public const int radioButtonStyle = 2130968836;
- // aapt resource value: 0x7f0100a8
- public const int ratingBarStyle = 2130772136;
+ // aapt resource value: 0x7F040105
+ public const int ratingBarStyle = 2130968837;
- // aapt resource value: 0x7f0100a9
- public const int ratingBarStyleIndicator = 2130772137;
+ // aapt resource value: 0x7F040106
+ public const int ratingBarStyleIndicator = 2130968838;
- // aapt resource value: 0x7f0100aa
- public const int ratingBarStyleSmall = 2130772138;
+ // aapt resource value: 0x7F040107
+ public const int ratingBarStyleSmall = 2130968839;
- // aapt resource value: 0x7f010002
- public const int reverseLayout = 2130771970;
+ // aapt resource value: 0x7F040108
+ public const int reverseLayout = 2130968840;
- // aapt resource value: 0x7f010123
- public const int rippleColor = 2130772259;
+ // aapt resource value: 0x7F040109
+ public const int rippleColor = 2130968841;
- // aapt resource value: 0x7f010112
- public const int scrimAnimationDuration = 2130772242;
+ // aapt resource value: 0x7F04010A
+ public const int scrimAnimationDuration = 2130968842;
- // aapt resource value: 0x7f010111
- public const int scrimVisibleHeightTrigger = 2130772241;
+ // aapt resource value: 0x7F04010B
+ public const int scrimVisibleHeightTrigger = 2130968843;
- // aapt resource value: 0x7f0100d8
- public const int searchHintIcon = 2130772184;
+ // aapt resource value: 0x7F04010C
+ public const int searchHintIcon = 2130968844;
- // aapt resource value: 0x7f0100d7
- public const int searchIcon = 2130772183;
+ // aapt resource value: 0x7F04010D
+ public const int searchIcon = 2130968845;
- // aapt resource value: 0x7f010080
- public const int searchViewStyle = 2130772096;
+ // aapt resource value: 0x7F04010E
+ public const int searchViewStyle = 2130968846;
- // aapt resource value: 0x7f0101b1
- public const int second_curtain_bar_color = 2130772401;
+ // aapt resource value: 0x7F04010F
+ public const int second_curtain_bar_color = 2130968847;
- // aapt resource value: 0x7f0101b7
- public const int second_wave_color = 2130772407;
+ // aapt resource value: 0x7F040110
+ public const int second_wave_color = 2130968848;
- // aapt resource value: 0x7f0100ab
- public const int seekBarStyle = 2130772139;
+ // aapt resource value: 0x7F040111
+ public const int seekBarStyle = 2130968849;
- // aapt resource value: 0x7f010070
- public const int selectableItemBackground = 2130772080;
+ // aapt resource value: 0x7F040112
+ public const int selectableItemBackground = 2130968850;
- // aapt resource value: 0x7f010071
- public const int selectableItemBackgroundBorderless = 2130772081;
+ // aapt resource value: 0x7F040113
+ public const int selectableItemBackgroundBorderless = 2130968851;
- // aapt resource value: 0x7f0100c3
- public const int showAsAction = 2130772163;
+ // aapt resource value: 0x7F040114
+ public const int showAsAction = 2130968852;
- // aapt resource value: 0x7f0100bf
- public const int showDividers = 2130772159;
+ // aapt resource value: 0x7F040115
+ public const int showDividers = 2130968853;
- // aapt resource value: 0x7f0100e8
- public const int showText = 2130772200;
+ // aapt resource value: 0x7F040116
+ public const int showText = 2130968854;
- // aapt resource value: 0x7f01002f
- public const int showTitle = 2130772015;
+ // aapt resource value: 0x7F040117
+ public const int showTitle = 2130968855;
- // aapt resource value: 0x7f01002d
- public const int singleChoiceItemLayout = 2130772013;
+ // aapt resource value: 0x7F040118
+ public const int singleChoiceItemLayout = 2130968856;
- // aapt resource value: 0x7f010001
- public const int spanCount = 2130771969;
+ // aapt resource value: 0x7F040119
+ public const int spanCount = 2130968857;
- // aapt resource value: 0x7f0100b7
- public const int spinBars = 2130772151;
+ // aapt resource value: 0x7F04011A
+ public const int spinBars = 2130968858;
- // aapt resource value: 0x7f01006b
- public const int spinnerDropDownItemStyle = 2130772075;
+ // aapt resource value: 0x7F04011B
+ public const int spinnerDropDownItemStyle = 2130968859;
- // aapt resource value: 0x7f0100ac
- public const int spinnerStyle = 2130772140;
+ // aapt resource value: 0x7F04011C
+ public const int spinnerStyle = 2130968860;
- // aapt resource value: 0x7f0100e7
- public const int splitTrack = 2130772199;
+ // aapt resource value: 0x7F04011D
+ public const int splitTrack = 2130968861;
- // aapt resource value: 0x7f010030
- public const int srcCompat = 2130772016;
+ // aapt resource value: 0x7F04011E
+ public const int srcCompat = 2130968862;
- // aapt resource value: 0x7f01015c
- public const int srlAccentColor = 2130772316;
+ // aapt resource value: 0x7F04011F
+ public const int srlAccentColor = 2130968863;
- // aapt resource value: 0x7f010172
- public const int srlAnimatingColor = 2130772338;
+ // aapt resource value: 0x7F040120
+ public const int srlAnimatingColor = 2130968864;
- // aapt resource value: 0x7f01015d
- public const int srlClassicsSpinnerStyle = 2130772317;
+ // aapt resource value: 0x7F040121
+ public const int srlClassicsSpinnerStyle = 2130968865;
- // aapt resource value: 0x7f010194
- public const int srlDisableContentWhenLoading = 2130772372;
+ // aapt resource value: 0x7F040122
+ public const int srlDisableContentWhenLoading = 2130968866;
- // aapt resource value: 0x7f010193
- public const int srlDisableContentWhenRefresh = 2130772371;
+ // aapt resource value: 0x7F040123
+ public const int srlDisableContentWhenRefresh = 2130968867;
- // aapt resource value: 0x7f01017b
- public const int srlDragRate = 2130772347;
+ // aapt resource value: 0x7F040124
+ public const int srlDragRate = 2130968868;
- // aapt resource value: 0x7f01015e
- public const int srlDrawableArrow = 2130772318;
+ // aapt resource value: 0x7F040125
+ public const int srlDrawableArrow = 2130968869;
- // aapt resource value: 0x7f01015f
- public const int srlDrawableArrowSize = 2130772319;
+ // aapt resource value: 0x7F040126
+ public const int srlDrawableArrowSize = 2130968870;
- // aapt resource value: 0x7f010160
- public const int srlDrawableMarginRight = 2130772320;
+ // aapt resource value: 0x7F040127
+ public const int srlDrawableMarginRight = 2130968871;
- // aapt resource value: 0x7f010161
- public const int srlDrawableProgress = 2130772321;
+ // aapt resource value: 0x7F040128
+ public const int srlDrawableProgress = 2130968872;
- // aapt resource value: 0x7f010162
- public const int srlDrawableProgressSize = 2130772322;
+ // aapt resource value: 0x7F040129
+ public const int srlDrawableProgressSize = 2130968873;
- // aapt resource value: 0x7f010163
- public const int srlDrawableSize = 2130772323;
+ // aapt resource value: 0x7F04012A
+ public const int srlDrawableSize = 2130968874;
- // aapt resource value: 0x7f010187
- public const int srlEnableAutoLoadMore = 2130772359;
+ // aapt resource value: 0x7F04012B
+ public const int srlEnableAutoLoadMore = 2130968875;
- // aapt resource value: 0x7f010191
- public const int srlEnableClipFooterWhenFixedBehind = 2130772369;
+ // aapt resource value: 0x7F04012C
+ public const int srlEnableClipFooterWhenFixedBehind = 2130968876;
- // aapt resource value: 0x7f010190
- public const int srlEnableClipHeaderWhenFixedBehind = 2130772368;
+ // aapt resource value: 0x7F04012D
+ public const int srlEnableClipHeaderWhenFixedBehind = 2130968877;
- // aapt resource value: 0x7f01018e
- public const int srlEnableFooterFollowWhenLoadFinished = 2130772366;
+ // aapt resource value: 0x7F04012E
+ public const int srlEnableFooterFollowWhenLoadFinished = 2130968878;
- // aapt resource value: 0x7f01018f
- public const int srlEnableFooterFollowWhenNoMoreData = 2130772367;
+ // aapt resource value: 0x7F04012F
+ public const int srlEnableFooterFollowWhenNoMoreData = 2130968879;
- // aapt resource value: 0x7f010183
- public const int srlEnableFooterTranslationContent = 2130772355;
+ // aapt resource value: 0x7F040130
+ public const int srlEnableFooterTranslationContent = 2130968880;
- // aapt resource value: 0x7f010182
- public const int srlEnableHeaderTranslationContent = 2130772354;
+ // aapt resource value: 0x7F040131
+ public const int srlEnableHeaderTranslationContent = 2130968881;
- // aapt resource value: 0x7f010164
- public const int srlEnableHorizontalDrag = 2130772324;
+ // aapt resource value: 0x7F040132
+ public const int srlEnableHorizontalDrag = 2130968882;
- // aapt resource value: 0x7f010175
- public const int srlEnableLastTime = 2130772341;
+ // aapt resource value: 0x7F040133
+ public const int srlEnableLastTime = 2130968883;
- // aapt resource value: 0x7f010181
- public const int srlEnableLoadMore = 2130772353;
+ // aapt resource value: 0x7F040134
+ public const int srlEnableLoadMore = 2130968884;
- // aapt resource value: 0x7f01018d
- public const int srlEnableLoadMoreWhenContentNotFull = 2130772365;
+ // aapt resource value: 0x7F040135
+ public const int srlEnableLoadMoreWhenContentNotFull = 2130968885;
- // aapt resource value: 0x7f01018a
- public const int srlEnableNestedScrolling = 2130772362;
+ // aapt resource value: 0x7F040136
+ public const int srlEnableNestedScrolling = 2130968886;
- // aapt resource value: 0x7f010188
- public const int srlEnableOverScrollBounce = 2130772360;
+ // aapt resource value: 0x7F040137
+ public const int srlEnableOverScrollBounce = 2130968887;
- // aapt resource value: 0x7f010192
- public const int srlEnableOverScrollDrag = 2130772370;
+ // aapt resource value: 0x7F040138
+ public const int srlEnableOverScrollDrag = 2130968888;
- // aapt resource value: 0x7f010186
- public const int srlEnablePreviewInEditMode = 2130772358;
+ // aapt resource value: 0x7F040139
+ public const int srlEnablePreviewInEditMode = 2130968889;
- // aapt resource value: 0x7f01019d
- public const int srlEnablePullToCloseTwoLevel = 2130772381;
+ // aapt resource value: 0x7F04013A
+ public const int srlEnablePullToCloseTwoLevel = 2130968890;
- // aapt resource value: 0x7f010189
- public const int srlEnablePureScrollMode = 2130772361;
+ // aapt resource value: 0x7F04013B
+ public const int srlEnablePureScrollMode = 2130968891;
- // aapt resource value: 0x7f010180
- public const int srlEnableRefresh = 2130772352;
+ // aapt resource value: 0x7F04013C
+ public const int srlEnableRefresh = 2130968892;
- // aapt resource value: 0x7f01018b
- public const int srlEnableScrollContentWhenLoaded = 2130772363;
+ // aapt resource value: 0x7F04013D
+ public const int srlEnableScrollContentWhenLoaded = 2130968893;
- // aapt resource value: 0x7f01018c
- public const int srlEnableScrollContentWhenRefreshed = 2130772364;
+ // aapt resource value: 0x7F04013E
+ public const int srlEnableScrollContentWhenRefreshed = 2130968894;
- // aapt resource value: 0x7f01019c
- public const int srlEnableTwoLevel = 2130772380;
+ // aapt resource value: 0x7F04013F
+ public const int srlEnableTwoLevel = 2130968895;
- // aapt resource value: 0x7f010165
- public const int srlFinishDuration = 2130772325;
+ // aapt resource value: 0x7F040140
+ public const int srlFinishDuration = 2130968896;
- // aapt resource value: 0x7f010196
- public const int srlFixedFooterViewId = 2130772374;
+ // aapt resource value: 0x7F040141
+ public const int srlFixedFooterViewId = 2130968897;
- // aapt resource value: 0x7f010195
- public const int srlFixedHeaderViewId = 2130772373;
+ // aapt resource value: 0x7F040142
+ public const int srlFixedHeaderViewId = 2130968898;
- // aapt resource value: 0x7f01019b
- public const int srlFloorDuration = 2130772379;
+ // aapt resource value: 0x7F040143
+ public const int srlFloorDuration = 2130968899;
- // aapt resource value: 0x7f010199
- public const int srlFloorRage = 2130772377;
+ // aapt resource value: 0x7F040144
+ public const int srlFloorRage = 2130968900;
- // aapt resource value: 0x7f010178
- public const int srlFooterHeight = 2130772344;
+ // aapt resource value: 0x7F040145
+ public const int srlFooterHeight = 2130968901;
- // aapt resource value: 0x7f01017a
- public const int srlFooterInsetStart = 2130772346;
+ // aapt resource value: 0x7F040146
+ public const int srlFooterInsetStart = 2130968902;
- // aapt resource value: 0x7f01017d
- public const int srlFooterMaxDragRate = 2130772349;
+ // aapt resource value: 0x7F040147
+ public const int srlFooterMaxDragRate = 2130968903;
- // aapt resource value: 0x7f010185
- public const int srlFooterTranslationViewId = 2130772357;
+ // aapt resource value: 0x7F040148
+ public const int srlFooterTranslationViewId = 2130968904;
- // aapt resource value: 0x7f01017f
- public const int srlFooterTriggerRate = 2130772351;
+ // aapt resource value: 0x7F040149
+ public const int srlFooterTriggerRate = 2130968905;
- // aapt resource value: 0x7f010177
- public const int srlHeaderHeight = 2130772343;
+ // aapt resource value: 0x7F04014A
+ public const int srlHeaderHeight = 2130968906;
- // aapt resource value: 0x7f010179
- public const int srlHeaderInsetStart = 2130772345;
+ // aapt resource value: 0x7F04014B
+ public const int srlHeaderInsetStart = 2130968907;
- // aapt resource value: 0x7f01017c
- public const int srlHeaderMaxDragRate = 2130772348;
+ // aapt resource value: 0x7F04014C
+ public const int srlHeaderMaxDragRate = 2130968908;
- // aapt resource value: 0x7f010184
- public const int srlHeaderTranslationViewId = 2130772356;
+ // aapt resource value: 0x7F04014D
+ public const int srlHeaderTranslationViewId = 2130968909;
- // aapt resource value: 0x7f01017e
- public const int srlHeaderTriggerRate = 2130772350;
+ // aapt resource value: 0x7F04014E
+ public const int srlHeaderTriggerRate = 2130968910;
- // aapt resource value: 0x7f010198
- public const int srlMaxRage = 2130772376;
+ // aapt resource value: 0x7F04014F
+ public const int srlMaxRage = 2130968911;
- // aapt resource value: 0x7f010173
- public const int srlNormalColor = 2130772339;
+ // aapt resource value: 0x7F040150
+ public const int srlNormalColor = 2130968912;
- // aapt resource value: 0x7f010166
- public const int srlPrimaryColor = 2130772326;
+ // aapt resource value: 0x7F040151
+ public const int srlPrimaryColor = 2130968913;
- // aapt resource value: 0x7f010176
- public const int srlReboundDuration = 2130772342;
+ // aapt resource value: 0x7F040152
+ public const int srlReboundDuration = 2130968914;
- // aapt resource value: 0x7f01019a
- public const int srlRefreshRage = 2130772378;
+ // aapt resource value: 0x7F040153
+ public const int srlRefreshRage = 2130968915;
- // aapt resource value: 0x7f010167
- public const int srlTextFailed = 2130772327;
+ // aapt resource value: 0x7F040154
+ public const int srlTextFailed = 2130968916;
- // aapt resource value: 0x7f010168
- public const int srlTextFinish = 2130772328;
+ // aapt resource value: 0x7F040155
+ public const int srlTextFinish = 2130968917;
- // aapt resource value: 0x7f010169
- public const int srlTextLoading = 2130772329;
+ // aapt resource value: 0x7F040156
+ public const int srlTextLoading = 2130968918;
- // aapt resource value: 0x7f01016a
- public const int srlTextNothing = 2130772330;
+ // aapt resource value: 0x7F040157
+ public const int srlTextNothing = 2130968919;
- // aapt resource value: 0x7f01016b
- public const int srlTextPulling = 2130772331;
+ // aapt resource value: 0x7F040158
+ public const int srlTextPulling = 2130968920;
- // aapt resource value: 0x7f01016c
- public const int srlTextRefreshing = 2130772332;
+ // aapt resource value: 0x7F040159
+ public const int srlTextRefreshing = 2130968921;
- // aapt resource value: 0x7f01016d
- public const int srlTextRelease = 2130772333;
+ // aapt resource value: 0x7F04015A
+ public const int srlTextRelease = 2130968922;
- // aapt resource value: 0x7f01016e
- public const int srlTextSecondary = 2130772334;
+ // aapt resource value: 0x7F04015B
+ public const int srlTextSecondary = 2130968923;
- // aapt resource value: 0x7f01016f
- public const int srlTextSizeTime = 2130772335;
+ // aapt resource value: 0x7F04015C
+ public const int srlTextSizeTime = 2130968924;
- // aapt resource value: 0x7f010170
- public const int srlTextSizeTitle = 2130772336;
+ // aapt resource value: 0x7F04015D
+ public const int srlTextSizeTitle = 2130968925;
- // aapt resource value: 0x7f010174
- public const int srlTextTimeMarginTop = 2130772340;
+ // aapt resource value: 0x7F04015E
+ public const int srlTextTimeMarginTop = 2130968926;
- // aapt resource value: 0x7f010171
- public const int srlTextUpdate = 2130772337;
+ // aapt resource value: 0x7F04015F
+ public const int srlTextUpdate = 2130968927;
- // aapt resource value: 0x7f010003
- public const int stackFromEnd = 2130771971;
+ // aapt resource value: 0x7F040160
+ public const int stackFromEnd = 2130968928;
- // aapt resource value: 0x7f0100ce
- public const int state_above_anchor = 2130772174;
+ // aapt resource value: 0x7F040161
+ public const int state_above_anchor = 2130968929;
- // aapt resource value: 0x7f010100
- public const int state_collapsed = 2130772224;
+ // aapt resource value: 0x7F040162
+ public const int state_collapsed = 2130968930;
- // aapt resource value: 0x7f010101
- public const int state_collapsible = 2130772225;
+ // aapt resource value: 0x7F040163
+ public const int state_collapsible = 2130968931;
- // aapt resource value: 0x7f010119
- public const int statusBarBackground = 2130772249;
+ // aapt resource value: 0x7F040164
+ public const int statusBarBackground = 2130968932;
- // aapt resource value: 0x7f01010f
- public const int statusBarScrim = 2130772239;
+ // aapt resource value: 0x7F040165
+ public const int statusBarScrim = 2130968933;
- // aapt resource value: 0x7f0100cc
- public const int subMenuArrow = 2130772172;
+ // aapt resource value: 0x7F040166
+ public const int subMenuArrow = 2130968934;
- // aapt resource value: 0x7f0100dd
- public const int submitBackground = 2130772189;
+ // aapt resource value: 0x7F040167
+ public const int submitBackground = 2130968935;
- // aapt resource value: 0x7f01000f
- public const int subtitle = 2130771983;
+ // aapt resource value: 0x7F040168
+ public const int subtitle = 2130968936;
- // aapt resource value: 0x7f0100ea
- public const int subtitleTextAppearance = 2130772202;
+ // aapt resource value: 0x7F040169
+ public const int subtitleTextAppearance = 2130968937;
- // aapt resource value: 0x7f0100f9
- public const int subtitleTextColor = 2130772217;
+ // aapt resource value: 0x7F04016A
+ public const int subtitleTextColor = 2130968938;
- // aapt resource value: 0x7f010011
- public const int subtitleTextStyle = 2130771985;
+ // aapt resource value: 0x7F04016B
+ public const int subtitleTextStyle = 2130968939;
- // aapt resource value: 0x7f0100db
- public const int suggestionRowLayout = 2130772187;
+ // aapt resource value: 0x7F04016C
+ public const int suggestionRowLayout = 2130968940;
- // aapt resource value: 0x7f0100e5
- public const int switchMinWidth = 2130772197;
+ // aapt resource value: 0x7F04016D
+ public const int switchMinWidth = 2130968941;
- // aapt resource value: 0x7f0100e6
- public const int switchPadding = 2130772198;
+ // aapt resource value: 0x7F04016E
+ public const int switchPadding = 2130968942;
- // aapt resource value: 0x7f0100ad
- public const int switchStyle = 2130772141;
+ // aapt resource value: 0x7F04016F
+ public const int switchStyle = 2130968943;
- // aapt resource value: 0x7f0100e4
- public const int switchTextAppearance = 2130772196;
+ // aapt resource value: 0x7F040170
+ public const int switchTextAppearance = 2130968944;
- // aapt resource value: 0x7f010136
- public const int tabBackground = 2130772278;
+ // aapt resource value: 0x7F040171
+ public const int tabBackground = 2130968945;
- // aapt resource value: 0x7f010135
- public const int tabContentStart = 2130772277;
+ // aapt resource value: 0x7F040172
+ public const int tabContentStart = 2130968946;
- // aapt resource value: 0x7f010138
- public const int tabGravity = 2130772280;
+ // aapt resource value: 0x7F040173
+ public const int tabGravity = 2130968947;
- // aapt resource value: 0x7f010133
- public const int tabIndicatorColor = 2130772275;
+ // aapt resource value: 0x7F040174
+ public const int tabIndicatorColor = 2130968948;
- // aapt resource value: 0x7f010134
- public const int tabIndicatorHeight = 2130772276;
+ // aapt resource value: 0x7F040175
+ public const int tabIndicatorHeight = 2130968949;
- // aapt resource value: 0x7f01013a
- public const int tabMaxWidth = 2130772282;
+ // aapt resource value: 0x7F040176
+ public const int tabMaxWidth = 2130968950;
- // aapt resource value: 0x7f010139
- public const int tabMinWidth = 2130772281;
+ // aapt resource value: 0x7F040177
+ public const int tabMinWidth = 2130968951;
- // aapt resource value: 0x7f010137
- public const int tabMode = 2130772279;
+ // aapt resource value: 0x7F040178
+ public const int tabMode = 2130968952;
- // aapt resource value: 0x7f010142
- public const int tabPadding = 2130772290;
+ // aapt resource value: 0x7F040179
+ public const int tabPadding = 2130968953;
- // aapt resource value: 0x7f010141
- public const int tabPaddingBottom = 2130772289;
+ // aapt resource value: 0x7F04017A
+ public const int tabPaddingBottom = 2130968954;
- // aapt resource value: 0x7f010140
- public const int tabPaddingEnd = 2130772288;
+ // aapt resource value: 0x7F04017B
+ public const int tabPaddingEnd = 2130968955;
- // aapt resource value: 0x7f01013e
- public const int tabPaddingStart = 2130772286;
+ // aapt resource value: 0x7F04017C
+ public const int tabPaddingStart = 2130968956;
- // aapt resource value: 0x7f01013f
- public const int tabPaddingTop = 2130772287;
+ // aapt resource value: 0x7F04017D
+ public const int tabPaddingTop = 2130968957;
- // aapt resource value: 0x7f01013d
- public const int tabSelectedTextColor = 2130772285;
+ // aapt resource value: 0x7F04017E
+ public const int tabSelectedTextColor = 2130968958;
- // aapt resource value: 0x7f01013b
- public const int tabTextAppearance = 2130772283;
+ // aapt resource value: 0x7F04017F
+ public const int tabTextAppearance = 2130968959;
- // aapt resource value: 0x7f01013c
- public const int tabTextColor = 2130772284;
+ // aapt resource value: 0x7F040180
+ public const int tabTextColor = 2130968960;
- // aapt resource value: 0x7f010036
- public const int textAllCaps = 2130772022;
+ // aapt resource value: 0x7F040181
+ public const int textAllCaps = 2130968961;
- // aapt resource value: 0x7f010063
- public const int textAppearanceLargePopupMenu = 2130772067;
+ // aapt resource value: 0x7F040182
+ public const int textAppearanceLargePopupMenu = 2130968962;
- // aapt resource value: 0x7f010088
- public const int textAppearanceListItem = 2130772104;
+ // aapt resource value: 0x7F040183
+ public const int textAppearanceListItem = 2130968963;
- // aapt resource value: 0x7f010089
- public const int textAppearanceListItemSecondary = 2130772105;
+ // aapt resource value: 0x7F040184
+ public const int textAppearanceListItemSecondary = 2130968964;
- // aapt resource value: 0x7f01008a
- public const int textAppearanceListItemSmall = 2130772106;
+ // aapt resource value: 0x7F040185
+ public const int textAppearanceListItemSmall = 2130968965;
- // aapt resource value: 0x7f010065
- public const int textAppearancePopupMenuHeader = 2130772069;
+ // aapt resource value: 0x7F040186
+ public const int textAppearancePopupMenuHeader = 2130968966;
- // aapt resource value: 0x7f01007e
- public const int textAppearanceSearchResultSubtitle = 2130772094;
+ // aapt resource value: 0x7F040187
+ public const int textAppearanceSearchResultSubtitle = 2130968967;
- // aapt resource value: 0x7f01007d
- public const int textAppearanceSearchResultTitle = 2130772093;
+ // aapt resource value: 0x7F040188
+ public const int textAppearanceSearchResultTitle = 2130968968;
- // aapt resource value: 0x7f010064
- public const int textAppearanceSmallPopupMenu = 2130772068;
+ // aapt resource value: 0x7F040189
+ public const int textAppearanceSmallPopupMenu = 2130968969;
- // aapt resource value: 0x7f01009d
- public const int textColorAlertDialogListItem = 2130772125;
+ // aapt resource value: 0x7F04018A
+ public const int textColorAlertDialogListItem = 2130968970;
- // aapt resource value: 0x7f010122
- public const int textColorError = 2130772258;
+ // aapt resource value: 0x7F04018B
+ public const int textColorError = 2130968971;
- // aapt resource value: 0x7f01007f
- public const int textColorSearchUrl = 2130772095;
+ // aapt resource value: 0x7F04018C
+ public const int textColorSearchUrl = 2130968972;
- // aapt resource value: 0x7f0100fc
- public const int theme = 2130772220;
+ // aapt resource value: 0x7F04018D
+ public const int theme = 2130968973;
- // aapt resource value: 0x7f0100bd
- public const int thickness = 2130772157;
+ // aapt resource value: 0x7F04018E
+ public const int thickness = 2130968974;
- // aapt resource value: 0x7f0100e3
- public const int thumbTextPadding = 2130772195;
+ // aapt resource value: 0x7F04018F
+ public const int thumbTextPadding = 2130968975;
- // aapt resource value: 0x7f0100de
- public const int thumbTint = 2130772190;
+ // aapt resource value: 0x7F040190
+ public const int thumbTint = 2130968976;
- // aapt resource value: 0x7f0100df
- public const int thumbTintMode = 2130772191;
+ // aapt resource value: 0x7F040191
+ public const int thumbTintMode = 2130968977;
- // aapt resource value: 0x7f010033
- public const int tickMark = 2130772019;
+ // aapt resource value: 0x7F040192
+ public const int tickMark = 2130968978;
- // aapt resource value: 0x7f010034
- public const int tickMarkTint = 2130772020;
+ // aapt resource value: 0x7F040193
+ public const int tickMarkTint = 2130968979;
- // aapt resource value: 0x7f010035
- public const int tickMarkTintMode = 2130772021;
+ // aapt resource value: 0x7F040194
+ public const int tickMarkTintMode = 2130968980;
- // aapt resource value: 0x7f010031
- public const int tint = 2130772017;
+ // aapt resource value: 0x7F040195
+ public const int tint = 2130968981;
- // aapt resource value: 0x7f010032
- public const int tintMode = 2130772018;
+ // aapt resource value: 0x7F040196
+ public const int tintMode = 2130968982;
- // aapt resource value: 0x7f01000c
- public const int title = 2130771980;
+ // aapt resource value: 0x7F040197
+ public const int title = 2130968983;
- // aapt resource value: 0x7f010115
- public const int titleEnabled = 2130772245;
+ // aapt resource value: 0x7F040198
+ public const int titleEnabled = 2130968984;
- // aapt resource value: 0x7f0100eb
- public const int titleMargin = 2130772203;
+ // aapt resource value: 0x7F040199
+ public const int titleMargin = 2130968985;
- // aapt resource value: 0x7f0100ef
- public const int titleMarginBottom = 2130772207;
+ // aapt resource value: 0x7F04019A
+ public const int titleMarginBottom = 2130968986;
- // aapt resource value: 0x7f0100ed
- public const int titleMarginEnd = 2130772205;
+ // aapt resource value: 0x7F04019B
+ public const int titleMarginEnd = 2130968987;
- // aapt resource value: 0x7f0100ec
- public const int titleMarginStart = 2130772204;
+ // aapt resource value: 0x7F04019E
+ public const int titleMargins = 2130968990;
- // aapt resource value: 0x7f0100ee
- public const int titleMarginTop = 2130772206;
+ // aapt resource value: 0x7F04019C
+ public const int titleMarginStart = 2130968988;
- // aapt resource value: 0x7f0100f0
- public const int titleMargins = 2130772208;
+ // aapt resource value: 0x7F04019D
+ public const int titleMarginTop = 2130968989;
- // aapt resource value: 0x7f0100e9
- public const int titleTextAppearance = 2130772201;
+ // aapt resource value: 0x7F04019F
+ public const int titleTextAppearance = 2130968991;
- // aapt resource value: 0x7f0100f8
- public const int titleTextColor = 2130772216;
+ // aapt resource value: 0x7F0401A0
+ public const int titleTextColor = 2130968992;
- // aapt resource value: 0x7f010010
- public const int titleTextStyle = 2130771984;
+ // aapt resource value: 0x7F0401A1
+ public const int titleTextStyle = 2130968993;
- // aapt resource value: 0x7f010110
- public const int toolbarId = 2130772240;
+ // aapt resource value: 0x7F0401A2
+ public const int toolbarId = 2130968994;
- // aapt resource value: 0x7f010077
- public const int toolbarNavigationButtonStyle = 2130772087;
+ // aapt resource value: 0x7F0401A3
+ public const int toolbarNavigationButtonStyle = 2130968995;
- // aapt resource value: 0x7f010076
- public const int toolbarStyle = 2130772086;
+ // aapt resource value: 0x7F0401A4
+ public const int toolbarStyle = 2130968996;
- // aapt resource value: 0x7f0100b0
- public const int tooltipForegroundColor = 2130772144;
+ // aapt resource value: 0x7F0401A5
+ public const int tooltipForegroundColor = 2130968997;
- // aapt resource value: 0x7f0100af
- public const int tooltipFrameBackground = 2130772143;
+ // aapt resource value: 0x7F0401A6
+ public const int tooltipFrameBackground = 2130968998;
- // aapt resource value: 0x7f0100c8
- public const int tooltipText = 2130772168;
+ // aapt resource value: 0x7F0401A7
+ public const int tooltipText = 2130968999;
- // aapt resource value: 0x7f0100e0
- public const int track = 2130772192;
+ // aapt resource value: 0x7F0401A8
+ public const int track = 2130969000;
- // aapt resource value: 0x7f0100e1
- public const int trackTint = 2130772193;
+ // aapt resource value: 0x7F0401A9
+ public const int trackTint = 2130969001;
- // aapt resource value: 0x7f0100e2
- public const int trackTintMode = 2130772194;
+ // aapt resource value: 0x7F0401AA
+ public const int trackTintMode = 2130969002;
- // aapt resource value: 0x7f010127
- public const int useCompatPadding = 2130772263;
+ // aapt resource value: 0x7F0401AB
+ public const int useCompatPadding = 2130969003;
- // aapt resource value: 0x7f0100d9
- public const int voiceIcon = 2130772185;
+ // aapt resource value: 0x7F0401AC
+ public const int voiceIcon = 2130969004;
- // aapt resource value: 0x7f0101b8
- public const int wave_bg_color = 2130772408;
+ // aapt resource value: 0x7F0401AD
+ public const int wave_bg_color = 2130969005;
- // aapt resource value: 0x7f0101b9
- public const int wave_border_color = 2130772409;
+ // aapt resource value: 0x7F0401AE
+ public const int wave_border_color = 2130969006;
- // aapt resource value: 0x7f0101b6
- public const int wave_color = 2130772406;
+ // aapt resource value: 0x7F0401AF
+ public const int wave_color = 2130969007;
- // aapt resource value: 0x7f0101bb
- public const int wave_height = 2130772411;
+ // aapt resource value: 0x7F0401B0
+ public const int wave_height = 2130969008;
- // aapt resource value: 0x7f0101ba
- public const int wave_width = 2130772410;
+ // aapt resource value: 0x7F0401B1
+ public const int wave_width = 2130969009;
- // aapt resource value: 0x7f0101c0
- public const int wheelview_dividerColor = 2130772416;
+ // aapt resource value: 0x7F0401B2
+ public const int wheelview_dividerColor = 2130969010;
- // aapt resource value: 0x7f0101bc
- public const int wheelview_gravity = 2130772412;
+ // aapt resource value: 0x7F0401B3
+ public const int wheelview_gravity = 2130969011;
- // aapt resource value: 0x7f0101c1
- public const int wheelview_lineSpacingMultiplier = 2130772417;
+ // aapt resource value: 0x7F0401B4
+ public const int wheelview_lineSpacingMultiplier = 2130969012;
- // aapt resource value: 0x7f0101bf
- public const int wheelview_textColorCenter = 2130772415;
+ // aapt resource value: 0x7F0401B5
+ public const int wheelview_textColorCenter = 2130969013;
- // aapt resource value: 0x7f0101be
- public const int wheelview_textColorOut = 2130772414;
+ // aapt resource value: 0x7F0401B6
+ public const int wheelview_textColorOut = 2130969014;
- // aapt resource value: 0x7f0101bd
- public const int wheelview_textSize = 2130772413;
+ // aapt resource value: 0x7F0401B7
+ public const int wheelview_textSize = 2130969015;
- // aapt resource value: 0x7f01003d
- public const int windowActionBar = 2130772029;
+ // aapt resource value: 0x7F0401B8
+ public const int windowActionBar = 2130969016;
- // aapt resource value: 0x7f01003f
- public const int windowActionBarOverlay = 2130772031;
+ // aapt resource value: 0x7F0401B9
+ public const int windowActionBarOverlay = 2130969017;
- // aapt resource value: 0x7f010040
- public const int windowActionModeOverlay = 2130772032;
+ // aapt resource value: 0x7F0401BA
+ public const int windowActionModeOverlay = 2130969018;
- // aapt resource value: 0x7f010044
- public const int windowFixedHeightMajor = 2130772036;
+ // aapt resource value: 0x7F0401BB
+ public const int windowFixedHeightMajor = 2130969019;
- // aapt resource value: 0x7f010042
- public const int windowFixedHeightMinor = 2130772034;
+ // aapt resource value: 0x7F0401BC
+ public const int windowFixedHeightMinor = 2130969020;
- // aapt resource value: 0x7f010041
- public const int windowFixedWidthMajor = 2130772033;
+ // aapt resource value: 0x7F0401BD
+ public const int windowFixedWidthMajor = 2130969021;
- // aapt resource value: 0x7f010043
- public const int windowFixedWidthMinor = 2130772035;
+ // aapt resource value: 0x7F0401BE
+ public const int windowFixedWidthMinor = 2130969022;
- // aapt resource value: 0x7f010045
- public const int windowMinWidthMajor = 2130772037;
+ // aapt resource value: 0x7F0401BF
+ public const int windowMinWidthMajor = 2130969023;
- // aapt resource value: 0x7f010046
- public const int windowMinWidthMinor = 2130772038;
+ // aapt resource value: 0x7F0401C0
+ public const int windowMinWidthMinor = 2130969024;
- // aapt resource value: 0x7f01003e
- public const int windowNoTitle = 2130772030;
+ // aapt resource value: 0x7F0401C1
+ public const int windowNoTitle = 2130969025;
static Attribute()
{
@@ -1670,20 +1670,20 @@
public partial class Boolean
{
- // aapt resource value: 0x7f0c0000
- public const int abc_action_bar_embed_tabs = 2131492864;
+ // aapt resource value: 0x7F050000
+ public const int abc_action_bar_embed_tabs = 2131034112;
- // aapt resource value: 0x7f0c0001
- public const int abc_allow_stacked_button_bar = 2131492865;
+ // aapt resource value: 0x7F050001
+ public const int abc_allow_stacked_button_bar = 2131034113;
- // aapt resource value: 0x7f0c0002
- public const int abc_config_actionMenuItemAllCaps = 2131492866;
+ // aapt resource value: 0x7F050002
+ public const int abc_config_actionMenuItemAllCaps = 2131034114;
- // aapt resource value: 0x7f0c0003
- public const int abc_config_closeDialogWhenTouchOutside = 2131492867;
+ // aapt resource value: 0x7F050003
+ public const int abc_config_closeDialogWhenTouchOutside = 2131034115;
- // aapt resource value: 0x7f0c0004
- public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131492868;
+ // aapt resource value: 0x7F050004
+ public const int abc_config_showMenuShortcutsWhenKeyboardPresent = 2131034116;
static Boolean()
{
@@ -1698,323 +1698,323 @@
public partial class Color
{
- // aapt resource value: 0x7f0d0052
- public const int abc_background_cache_hint_selector_material_dark = 2131558482;
+ // aapt resource value: 0x7F060000
+ public const int abc_background_cache_hint_selector_material_dark = 2131099648;
- // aapt resource value: 0x7f0d0053
- public const int abc_background_cache_hint_selector_material_light = 2131558483;
+ // aapt resource value: 0x7F060001
+ public const int abc_background_cache_hint_selector_material_light = 2131099649;
- // aapt resource value: 0x7f0d0054
- public const int abc_btn_colored_borderless_text_material = 2131558484;
+ // aapt resource value: 0x7F060002
+ public const int abc_btn_colored_borderless_text_material = 2131099650;
- // aapt resource value: 0x7f0d0055
- public const int abc_btn_colored_text_material = 2131558485;
+ // aapt resource value: 0x7F060003
+ public const int abc_btn_colored_text_material = 2131099651;
- // aapt resource value: 0x7f0d0056
- public const int abc_color_highlight_material = 2131558486;
+ // aapt resource value: 0x7F060004
+ public const int abc_color_highlight_material = 2131099652;
- // aapt resource value: 0x7f0d0057
- public const int abc_hint_foreground_material_dark = 2131558487;
+ // aapt resource value: 0x7F060005
+ public const int abc_hint_foreground_material_dark = 2131099653;
- // aapt resource value: 0x7f0d0058
- public const int abc_hint_foreground_material_light = 2131558488;
+ // aapt resource value: 0x7F060006
+ public const int abc_hint_foreground_material_light = 2131099654;
- // aapt resource value: 0x7f0d0000
- public const int abc_input_method_navigation_guard = 2131558400;
+ // aapt resource value: 0x7F060007
+ public const int abc_input_method_navigation_guard = 2131099655;
- // aapt resource value: 0x7f0d0059
- public const int abc_primary_text_disable_only_material_dark = 2131558489;
+ // aapt resource value: 0x7F060008
+ public const int abc_primary_text_disable_only_material_dark = 2131099656;
- // aapt resource value: 0x7f0d005a
- public const int abc_primary_text_disable_only_material_light = 2131558490;
+ // aapt resource value: 0x7F060009
+ public const int abc_primary_text_disable_only_material_light = 2131099657;
- // aapt resource value: 0x7f0d005b
- public const int abc_primary_text_material_dark = 2131558491;
+ // aapt resource value: 0x7F06000A
+ public const int abc_primary_text_material_dark = 2131099658;
- // aapt resource value: 0x7f0d005c
- public const int abc_primary_text_material_light = 2131558492;
+ // aapt resource value: 0x7F06000B
+ public const int abc_primary_text_material_light = 2131099659;
- // aapt resource value: 0x7f0d005d
- public const int abc_search_url_text = 2131558493;
+ // aapt resource value: 0x7F06000C
+ public const int abc_search_url_text = 2131099660;
- // aapt resource value: 0x7f0d0001
- public const int abc_search_url_text_normal = 2131558401;
+ // aapt resource value: 0x7F06000D
+ public const int abc_search_url_text_normal = 2131099661;
- // aapt resource value: 0x7f0d0002
- public const int abc_search_url_text_pressed = 2131558402;
+ // aapt resource value: 0x7F06000E
+ public const int abc_search_url_text_pressed = 2131099662;
- // aapt resource value: 0x7f0d0003
- public const int abc_search_url_text_selected = 2131558403;
+ // aapt resource value: 0x7F06000F
+ public const int abc_search_url_text_selected = 2131099663;
- // aapt resource value: 0x7f0d005e
- public const int abc_secondary_text_material_dark = 2131558494;
+ // aapt resource value: 0x7F060010
+ public const int abc_secondary_text_material_dark = 2131099664;
- // aapt resource value: 0x7f0d005f
- public const int abc_secondary_text_material_light = 2131558495;
+ // aapt resource value: 0x7F060011
+ public const int abc_secondary_text_material_light = 2131099665;
- // aapt resource value: 0x7f0d0060
- public const int abc_tint_btn_checkable = 2131558496;
+ // aapt resource value: 0x7F060012
+ public const int abc_tint_btn_checkable = 2131099666;
- // aapt resource value: 0x7f0d0061
- public const int abc_tint_default = 2131558497;
+ // aapt resource value: 0x7F060013
+ public const int abc_tint_default = 2131099667;
- // aapt resource value: 0x7f0d0062
- public const int abc_tint_edittext = 2131558498;
+ // aapt resource value: 0x7F060014
+ public const int abc_tint_edittext = 2131099668;
- // aapt resource value: 0x7f0d0063
- public const int abc_tint_seek_thumb = 2131558499;
+ // aapt resource value: 0x7F060015
+ public const int abc_tint_seek_thumb = 2131099669;
- // aapt resource value: 0x7f0d0064
- public const int abc_tint_spinner = 2131558500;
+ // aapt resource value: 0x7F060016
+ public const int abc_tint_spinner = 2131099670;
- // aapt resource value: 0x7f0d0065
- public const int abc_tint_switch_track = 2131558501;
+ // aapt resource value: 0x7F060017
+ public const int abc_tint_switch_track = 2131099671;
- // aapt resource value: 0x7f0d0004
- public const int accent_material_dark = 2131558404;
+ // aapt resource value: 0x7F060018
+ public const int accent_material_dark = 2131099672;
- // aapt resource value: 0x7f0d0005
- public const int accent_material_light = 2131558405;
+ // aapt resource value: 0x7F060019
+ public const int accent_material_light = 2131099673;
- // aapt resource value: 0x7f0d0006
- public const int background_floating_material_dark = 2131558406;
+ // aapt resource value: 0x7F06001A
+ public const int background_floating_material_dark = 2131099674;
- // aapt resource value: 0x7f0d0007
- public const int background_floating_material_light = 2131558407;
+ // aapt resource value: 0x7F06001B
+ public const int background_floating_material_light = 2131099675;
- // aapt resource value: 0x7f0d0008
- public const int background_material_dark = 2131558408;
+ // aapt resource value: 0x7F06001C
+ public const int background_material_dark = 2131099676;
- // aapt resource value: 0x7f0d0009
- public const int background_material_light = 2131558409;
+ // aapt resource value: 0x7F06001D
+ public const int background_material_light = 2131099677;
- // aapt resource value: 0x7f0d000a
- public const int bright_foreground_disabled_material_dark = 2131558410;
+ // aapt resource value: 0x7F06001E
+ public const int bright_foreground_disabled_material_dark = 2131099678;
- // aapt resource value: 0x7f0d000b
- public const int bright_foreground_disabled_material_light = 2131558411;
+ // aapt resource value: 0x7F06001F
+ public const int bright_foreground_disabled_material_light = 2131099679;
- // aapt resource value: 0x7f0d000c
- public const int bright_foreground_inverse_material_dark = 2131558412;
+ // aapt resource value: 0x7F060020
+ public const int bright_foreground_inverse_material_dark = 2131099680;
- // aapt resource value: 0x7f0d000d
- public const int bright_foreground_inverse_material_light = 2131558413;
+ // aapt resource value: 0x7F060021
+ public const int bright_foreground_inverse_material_light = 2131099681;
- // aapt resource value: 0x7f0d000e
- public const int bright_foreground_material_dark = 2131558414;
+ // aapt resource value: 0x7F060022
+ public const int bright_foreground_material_dark = 2131099682;
- // aapt resource value: 0x7f0d000f
- public const int bright_foreground_material_light = 2131558415;
+ // aapt resource value: 0x7F060023
+ public const int bright_foreground_material_light = 2131099683;
- // aapt resource value: 0x7f0d0010
- public const int button_material_dark = 2131558416;
+ // aapt resource value: 0x7F060024
+ public const int button_material_dark = 2131099684;
- // aapt resource value: 0x7f0d0011
- public const int button_material_light = 2131558417;
+ // aapt resource value: 0x7F060025
+ public const int button_material_light = 2131099685;
- // aapt resource value: 0x7f0d003c
- public const int design_bottom_navigation_shadow_color = 2131558460;
+ // aapt resource value: 0x7F060026
+ public const int design_bottom_navigation_shadow_color = 2131099686;
- // aapt resource value: 0x7f0d0066
- public const int design_error = 2131558502;
+ // aapt resource value: 0x7F060027
+ public const int design_error = 2131099687;
- // aapt resource value: 0x7f0d003d
- public const int design_fab_shadow_end_color = 2131558461;
+ // aapt resource value: 0x7F060028
+ public const int design_fab_shadow_end_color = 2131099688;
- // aapt resource value: 0x7f0d003e
- public const int design_fab_shadow_mid_color = 2131558462;
+ // aapt resource value: 0x7F060029
+ public const int design_fab_shadow_mid_color = 2131099689;
- // aapt resource value: 0x7f0d003f
- public const int design_fab_shadow_start_color = 2131558463;
+ // aapt resource value: 0x7F06002A
+ public const int design_fab_shadow_start_color = 2131099690;
- // aapt resource value: 0x7f0d0040
- public const int design_fab_stroke_end_inner_color = 2131558464;
+ // aapt resource value: 0x7F06002B
+ public const int design_fab_stroke_end_inner_color = 2131099691;
- // aapt resource value: 0x7f0d0041
- public const int design_fab_stroke_end_outer_color = 2131558465;
+ // aapt resource value: 0x7F06002C
+ public const int design_fab_stroke_end_outer_color = 2131099692;
- // aapt resource value: 0x7f0d0042
- public const int design_fab_stroke_top_inner_color = 2131558466;
+ // aapt resource value: 0x7F06002D
+ public const int design_fab_stroke_top_inner_color = 2131099693;
- // aapt resource value: 0x7f0d0043
- public const int design_fab_stroke_top_outer_color = 2131558467;
+ // aapt resource value: 0x7F06002E
+ public const int design_fab_stroke_top_outer_color = 2131099694;
- // aapt resource value: 0x7f0d0044
- public const int design_snackbar_background_color = 2131558468;
+ // aapt resource value: 0x7F06002F
+ public const int design_snackbar_background_color = 2131099695;
- // aapt resource value: 0x7f0d0067
- public const int design_tint_password_toggle = 2131558503;
+ // aapt resource value: 0x7F060030
+ public const int design_tint_password_toggle = 2131099696;
- // aapt resource value: 0x7f0d0012
- public const int dim_foreground_disabled_material_dark = 2131558418;
+ // aapt resource value: 0x7F060031
+ public const int dim_foreground_disabled_material_dark = 2131099697;
- // aapt resource value: 0x7f0d0013
- public const int dim_foreground_disabled_material_light = 2131558419;
+ // aapt resource value: 0x7F060032
+ public const int dim_foreground_disabled_material_light = 2131099698;
- // aapt resource value: 0x7f0d0014
- public const int dim_foreground_material_dark = 2131558420;
+ // aapt resource value: 0x7F060033
+ public const int dim_foreground_material_dark = 2131099699;
- // aapt resource value: 0x7f0d0015
- public const int dim_foreground_material_light = 2131558421;
+ // aapt resource value: 0x7F060034
+ public const int dim_foreground_material_light = 2131099700;
- // aapt resource value: 0x7f0d0016
- public const int error_color_material = 2131558422;
+ // aapt resource value: 0x7F060035
+ public const int error_color_material = 2131099701;
- // aapt resource value: 0x7f0d0017
- public const int foreground_material_dark = 2131558423;
+ // aapt resource value: 0x7F060036
+ public const int foreground_material_dark = 2131099702;
- // aapt resource value: 0x7f0d0018
- public const int foreground_material_light = 2131558424;
+ // aapt resource value: 0x7F060037
+ public const int foreground_material_light = 2131099703;
- // aapt resource value: 0x7f0d0048
- public const int gd_top_view = 2131558472;
+ // aapt resource value: 0x7F060038
+ public const int gd_top_view = 2131099704;
- // aapt resource value: 0x7f0d0019
- public const int highlighted_text_material_dark = 2131558425;
+ // aapt resource value: 0x7F060039
+ public const int highlighted_text_material_dark = 2131099705;
- // aapt resource value: 0x7f0d001a
- public const int highlighted_text_material_light = 2131558426;
+ // aapt resource value: 0x7F06003A
+ public const int highlighted_text_material_light = 2131099706;
- // aapt resource value: 0x7f0d001b
- public const int material_blue_grey_800 = 2131558427;
+ // aapt resource value: 0x7F06003B
+ public const int material_blue_grey_800 = 2131099707;
- // aapt resource value: 0x7f0d001c
- public const int material_blue_grey_900 = 2131558428;
+ // aapt resource value: 0x7F06003C
+ public const int material_blue_grey_900 = 2131099708;
- // aapt resource value: 0x7f0d001d
- public const int material_blue_grey_950 = 2131558429;
+ // aapt resource value: 0x7F06003D
+ public const int material_blue_grey_950 = 2131099709;
- // aapt resource value: 0x7f0d001e
- public const int material_deep_teal_200 = 2131558430;
+ // aapt resource value: 0x7F06003E
+ public const int material_deep_teal_200 = 2131099710;
- // aapt resource value: 0x7f0d001f
- public const int material_deep_teal_500 = 2131558431;
+ // aapt resource value: 0x7F06003F
+ public const int material_deep_teal_500 = 2131099711;
- // aapt resource value: 0x7f0d0020
- public const int material_grey_100 = 2131558432;
+ // aapt resource value: 0x7F060040
+ public const int material_grey_100 = 2131099712;
- // aapt resource value: 0x7f0d0021
- public const int material_grey_300 = 2131558433;
+ // aapt resource value: 0x7F060041
+ public const int material_grey_300 = 2131099713;
- // aapt resource value: 0x7f0d0022
- public const int material_grey_50 = 2131558434;
+ // aapt resource value: 0x7F060042
+ public const int material_grey_50 = 2131099714;
- // aapt resource value: 0x7f0d0023
- public const int material_grey_600 = 2131558435;
+ // aapt resource value: 0x7F060043
+ public const int material_grey_600 = 2131099715;
- // aapt resource value: 0x7f0d0024
- public const int material_grey_800 = 2131558436;
+ // aapt resource value: 0x7F060044
+ public const int material_grey_800 = 2131099716;
- // aapt resource value: 0x7f0d0025
- public const int material_grey_850 = 2131558437;
+ // aapt resource value: 0x7F060045
+ public const int material_grey_850 = 2131099717;
- // aapt resource value: 0x7f0d0026
- public const int material_grey_900 = 2131558438;
+ // aapt resource value: 0x7F060046
+ public const int material_grey_900 = 2131099718;
- // aapt resource value: 0x7f0d0047
- public const int material_red_500 = 2131558471;
+ // aapt resource value: 0x7F060047
+ public const int material_red_500 = 2131099719;
- // aapt resource value: 0x7f0d0045
- public const int notification_action_color_filter = 2131558469;
+ // aapt resource value: 0x7F060048
+ public const int notification_action_color_filter = 2131099720;
- // aapt resource value: 0x7f0d0046
- public const int notification_icon_bg_color = 2131558470;
+ // aapt resource value: 0x7F060049
+ public const int notification_icon_bg_color = 2131099721;
- // aapt resource value: 0x7f0d003b
- public const int notification_material_background_media_default_color = 2131558459;
+ // aapt resource value: 0x7F06004A
+ public const int notification_material_background_media_default_color = 2131099722;
- // aapt resource value: 0x7f0d0049
- public const int pickerview_bgColor_default = 2131558473;
+ // aapt resource value: 0x7F06004B
+ public const int pickerview_bgColor_default = 2131099723;
- // aapt resource value: 0x7f0d004a
- public const int pickerview_bgColor_overlay = 2131558474;
+ // aapt resource value: 0x7F06004C
+ public const int pickerview_bgColor_overlay = 2131099724;
- // aapt resource value: 0x7f0d004b
- public const int pickerview_bg_topbar = 2131558475;
+ // aapt resource value: 0x7F06004D
+ public const int pickerview_bg_topbar = 2131099725;
- // aapt resource value: 0x7f0d004c
- public const int pickerview_timebtn_nor = 2131558476;
+ // aapt resource value: 0x7F06004E
+ public const int pickerview_timebtn_nor = 2131099726;
- // aapt resource value: 0x7f0d004d
- public const int pickerview_timebtn_pre = 2131558477;
+ // aapt resource value: 0x7F06004F
+ public const int pickerview_timebtn_pre = 2131099727;
- // aapt resource value: 0x7f0d004e
- public const int pickerview_topbar_title = 2131558478;
+ // aapt resource value: 0x7F060050
+ public const int pickerview_topbar_title = 2131099728;
- // aapt resource value: 0x7f0d004f
- public const int pickerview_wheelview_textcolor_center = 2131558479;
+ // aapt resource value: 0x7F060051
+ public const int pickerview_wheelview_textcolor_center = 2131099729;
- // aapt resource value: 0x7f0d0050
- public const int pickerview_wheelview_textcolor_divider = 2131558480;
+ // aapt resource value: 0x7F060052
+ public const int pickerview_wheelview_textcolor_divider = 2131099730;
- // aapt resource value: 0x7f0d0051
- public const int pickerview_wheelview_textcolor_out = 2131558481;
+ // aapt resource value: 0x7F060053
+ public const int pickerview_wheelview_textcolor_out = 2131099731;
- // aapt resource value: 0x7f0d0027
- public const int primary_dark_material_dark = 2131558439;
+ // aapt resource value: 0x7F060054
+ public const int primary_dark_material_dark = 2131099732;
- // aapt resource value: 0x7f0d0028
- public const int primary_dark_material_light = 2131558440;
+ // aapt resource value: 0x7F060055
+ public const int primary_dark_material_light = 2131099733;
- // aapt resource value: 0x7f0d0029
- public const int primary_material_dark = 2131558441;
+ // aapt resource value: 0x7F060056
+ public const int primary_material_dark = 2131099734;
- // aapt resource value: 0x7f0d002a
- public const int primary_material_light = 2131558442;
+ // aapt resource value: 0x7F060057
+ public const int primary_material_light = 2131099735;
- // aapt resource value: 0x7f0d002b
- public const int primary_text_default_material_dark = 2131558443;
+ // aapt resource value: 0x7F060058
+ public const int primary_text_default_material_dark = 2131099736;
- // aapt resource value: 0x7f0d002c
- public const int primary_text_default_material_light = 2131558444;
+ // aapt resource value: 0x7F060059
+ public const int primary_text_default_material_light = 2131099737;
- // aapt resource value: 0x7f0d002d
- public const int primary_text_disabled_material_dark = 2131558445;
+ // aapt resource value: 0x7F06005A
+ public const int primary_text_disabled_material_dark = 2131099738;
- // aapt resource value: 0x7f0d002e
- public const int primary_text_disabled_material_light = 2131558446;
+ // aapt resource value: 0x7F06005B
+ public const int primary_text_disabled_material_light = 2131099739;
- // aapt resource value: 0x7f0d002f
- public const int ripple_material_dark = 2131558447;
+ // aapt resource value: 0x7F06005C
+ public const int ripple_material_dark = 2131099740;
- // aapt resource value: 0x7f0d0030
- public const int ripple_material_light = 2131558448;
+ // aapt resource value: 0x7F06005D
+ public const int ripple_material_light = 2131099741;
- // aapt resource value: 0x7f0d0031
- public const int secondary_text_default_material_dark = 2131558449;
+ // aapt resource value: 0x7F06005E
+ public const int secondary_text_default_material_dark = 2131099742;
- // aapt resource value: 0x7f0d0032
- public const int secondary_text_default_material_light = 2131558450;
+ // aapt resource value: 0x7F06005F
+ public const int secondary_text_default_material_light = 2131099743;
- // aapt resource value: 0x7f0d0033
- public const int secondary_text_disabled_material_dark = 2131558451;
+ // aapt resource value: 0x7F060060
+ public const int secondary_text_disabled_material_dark = 2131099744;
- // aapt resource value: 0x7f0d0034
- public const int secondary_text_disabled_material_light = 2131558452;
+ // aapt resource value: 0x7F060061
+ public const int secondary_text_disabled_material_light = 2131099745;
- // aapt resource value: 0x7f0d0035
- public const int switch_thumb_disabled_material_dark = 2131558453;
+ // aapt resource value: 0x7F060062
+ public const int switch_thumb_disabled_material_dark = 2131099746;
- // aapt resource value: 0x7f0d0036
- public const int switch_thumb_disabled_material_light = 2131558454;
+ // aapt resource value: 0x7F060063
+ public const int switch_thumb_disabled_material_light = 2131099747;
- // aapt resource value: 0x7f0d0068
- public const int switch_thumb_material_dark = 2131558504;
+ // aapt resource value: 0x7F060064
+ public const int switch_thumb_material_dark = 2131099748;
- // aapt resource value: 0x7f0d0069
- public const int switch_thumb_material_light = 2131558505;
+ // aapt resource value: 0x7F060065
+ public const int switch_thumb_material_light = 2131099749;
- // aapt resource value: 0x7f0d0037
- public const int switch_thumb_normal_material_dark = 2131558455;
+ // aapt resource value: 0x7F060066
+ public const int switch_thumb_normal_material_dark = 2131099750;
- // aapt resource value: 0x7f0d0038
- public const int switch_thumb_normal_material_light = 2131558456;
+ // aapt resource value: 0x7F060067
+ public const int switch_thumb_normal_material_light = 2131099751;
- // aapt resource value: 0x7f0d0039
- public const int tooltip_background_dark = 2131558457;
+ // aapt resource value: 0x7F060068
+ public const int tooltip_background_dark = 2131099752;
- // aapt resource value: 0x7f0d003a
- public const int tooltip_background_light = 2131558458;
+ // aapt resource value: 0x7F060069
+ public const int tooltip_background_light = 2131099753;
static Color()
{
@@ -2029,491 +2029,491 @@
public partial class Dimension
{
- // aapt resource value: 0x7f080012
- public const int abc_action_bar_content_inset_material = 2131230738;
+ // aapt resource value: 0x7F070000
+ public const int abc_action_bar_content_inset_material = 2131165184;
- // aapt resource value: 0x7f080013
- public const int abc_action_bar_content_inset_with_nav = 2131230739;
+ // aapt resource value: 0x7F070001
+ public const int abc_action_bar_content_inset_with_nav = 2131165185;
- // aapt resource value: 0x7f080007
- public const int abc_action_bar_default_height_material = 2131230727;
+ // aapt resource value: 0x7F070002
+ public const int abc_action_bar_default_height_material = 2131165186;
- // aapt resource value: 0x7f080014
- public const int abc_action_bar_default_padding_end_material = 2131230740;
+ // aapt resource value: 0x7F070003
+ public const int abc_action_bar_default_padding_end_material = 2131165187;
- // aapt resource value: 0x7f080015
- public const int abc_action_bar_default_padding_start_material = 2131230741;
+ // aapt resource value: 0x7F070004
+ public const int abc_action_bar_default_padding_start_material = 2131165188;
- // aapt resource value: 0x7f080017
- public const int abc_action_bar_elevation_material = 2131230743;
+ // aapt resource value: 0x7F070005
+ public const int abc_action_bar_elevation_material = 2131165189;
- // aapt resource value: 0x7f080018
- public const int abc_action_bar_icon_vertical_padding_material = 2131230744;
+ // aapt resource value: 0x7F070006
+ public const int abc_action_bar_icon_vertical_padding_material = 2131165190;
- // aapt resource value: 0x7f080019
- public const int abc_action_bar_overflow_padding_end_material = 2131230745;
+ // aapt resource value: 0x7F070007
+ public const int abc_action_bar_overflow_padding_end_material = 2131165191;
- // aapt resource value: 0x7f08001a
- public const int abc_action_bar_overflow_padding_start_material = 2131230746;
+ // aapt resource value: 0x7F070008
+ public const int abc_action_bar_overflow_padding_start_material = 2131165192;
- // aapt resource value: 0x7f080008
- public const int abc_action_bar_progress_bar_size = 2131230728;
+ // aapt resource value: 0x7F070009
+ public const int abc_action_bar_progress_bar_size = 2131165193;
- // aapt resource value: 0x7f08001b
- public const int abc_action_bar_stacked_max_height = 2131230747;
+ // aapt resource value: 0x7F07000A
+ public const int abc_action_bar_stacked_max_height = 2131165194;
- // aapt resource value: 0x7f08001c
- public const int abc_action_bar_stacked_tab_max_width = 2131230748;
+ // aapt resource value: 0x7F07000B
+ public const int abc_action_bar_stacked_tab_max_width = 2131165195;
- // aapt resource value: 0x7f08001d
- public const int abc_action_bar_subtitle_bottom_margin_material = 2131230749;
+ // aapt resource value: 0x7F07000C
+ public const int abc_action_bar_subtitle_bottom_margin_material = 2131165196;
- // aapt resource value: 0x7f08001e
- public const int abc_action_bar_subtitle_top_margin_material = 2131230750;
+ // aapt resource value: 0x7F07000D
+ public const int abc_action_bar_subtitle_top_margin_material = 2131165197;
- // aapt resource value: 0x7f08001f
- public const int abc_action_button_min_height_material = 2131230751;
+ // aapt resource value: 0x7F07000E
+ public const int abc_action_button_min_height_material = 2131165198;
- // aapt resource value: 0x7f080020
- public const int abc_action_button_min_width_material = 2131230752;
+ // aapt resource value: 0x7F07000F
+ public const int abc_action_button_min_width_material = 2131165199;
- // aapt resource value: 0x7f080021
- public const int abc_action_button_min_width_overflow_material = 2131230753;
+ // aapt resource value: 0x7F070010
+ public const int abc_action_button_min_width_overflow_material = 2131165200;
- // aapt resource value: 0x7f080006
- public const int abc_alert_dialog_button_bar_height = 2131230726;
+ // aapt resource value: 0x7F070011
+ public const int abc_alert_dialog_button_bar_height = 2131165201;
- // aapt resource value: 0x7f080022
- public const int abc_button_inset_horizontal_material = 2131230754;
+ // aapt resource value: 0x7F070012
+ public const int abc_button_inset_horizontal_material = 2131165202;
- // aapt resource value: 0x7f080023
- public const int abc_button_inset_vertical_material = 2131230755;
+ // aapt resource value: 0x7F070013
+ public const int abc_button_inset_vertical_material = 2131165203;
- // aapt resource value: 0x7f080024
- public const int abc_button_padding_horizontal_material = 2131230756;
+ // aapt resource value: 0x7F070014
+ public const int abc_button_padding_horizontal_material = 2131165204;
- // aapt resource value: 0x7f080025
- public const int abc_button_padding_vertical_material = 2131230757;
+ // aapt resource value: 0x7F070015
+ public const int abc_button_padding_vertical_material = 2131165205;
- // aapt resource value: 0x7f080026
- public const int abc_cascading_menus_min_smallest_width = 2131230758;
+ // aapt resource value: 0x7F070016
+ public const int abc_cascading_menus_min_smallest_width = 2131165206;
- // aapt resource value: 0x7f08000b
- public const int abc_config_prefDialogWidth = 2131230731;
+ // aapt resource value: 0x7F070017
+ public const int abc_config_prefDialogWidth = 2131165207;
- // aapt resource value: 0x7f080027
- public const int abc_control_corner_material = 2131230759;
+ // aapt resource value: 0x7F070018
+ public const int abc_control_corner_material = 2131165208;
- // aapt resource value: 0x7f080028
- public const int abc_control_inset_material = 2131230760;
+ // aapt resource value: 0x7F070019
+ public const int abc_control_inset_material = 2131165209;
- // aapt resource value: 0x7f080029
- public const int abc_control_padding_material = 2131230761;
+ // aapt resource value: 0x7F07001A
+ public const int abc_control_padding_material = 2131165210;
- // aapt resource value: 0x7f08000c
- public const int abc_dialog_fixed_height_major = 2131230732;
+ // aapt resource value: 0x7F07001B
+ public const int abc_dialog_fixed_height_major = 2131165211;
- // aapt resource value: 0x7f08000d
- public const int abc_dialog_fixed_height_minor = 2131230733;
+ // aapt resource value: 0x7F07001C
+ public const int abc_dialog_fixed_height_minor = 2131165212;
- // aapt resource value: 0x7f08000e
- public const int abc_dialog_fixed_width_major = 2131230734;
+ // aapt resource value: 0x7F07001D
+ public const int abc_dialog_fixed_width_major = 2131165213;
- // aapt resource value: 0x7f08000f
- public const int abc_dialog_fixed_width_minor = 2131230735;
+ // aapt resource value: 0x7F07001E
+ public const int abc_dialog_fixed_width_minor = 2131165214;
- // aapt resource value: 0x7f08002a
- public const int abc_dialog_list_padding_bottom_no_buttons = 2131230762;
+ // aapt resource value: 0x7F07001F
+ public const int abc_dialog_list_padding_bottom_no_buttons = 2131165215;
- // aapt resource value: 0x7f08002b
- public const int abc_dialog_list_padding_top_no_title = 2131230763;
+ // aapt resource value: 0x7F070020
+ public const int abc_dialog_list_padding_top_no_title = 2131165216;
- // aapt resource value: 0x7f080010
- public const int abc_dialog_min_width_major = 2131230736;
+ // aapt resource value: 0x7F070021
+ public const int abc_dialog_min_width_major = 2131165217;
- // aapt resource value: 0x7f080011
- public const int abc_dialog_min_width_minor = 2131230737;
+ // aapt resource value: 0x7F070022
+ public const int abc_dialog_min_width_minor = 2131165218;
- // aapt resource value: 0x7f08002c
- public const int abc_dialog_padding_material = 2131230764;
+ // aapt resource value: 0x7F070023
+ public const int abc_dialog_padding_material = 2131165219;
- // aapt resource value: 0x7f08002d
- public const int abc_dialog_padding_top_material = 2131230765;
+ // aapt resource value: 0x7F070024
+ public const int abc_dialog_padding_top_material = 2131165220;
- // aapt resource value: 0x7f08002e
- public const int abc_dialog_title_divider_material = 2131230766;
+ // aapt resource value: 0x7F070025
+ public const int abc_dialog_title_divider_material = 2131165221;
- // aapt resource value: 0x7f08002f
- public const int abc_disabled_alpha_material_dark = 2131230767;
+ // aapt resource value: 0x7F070026
+ public const int abc_disabled_alpha_material_dark = 2131165222;
- // aapt resource value: 0x7f080030
- public const int abc_disabled_alpha_material_light = 2131230768;
+ // aapt resource value: 0x7F070027
+ public const int abc_disabled_alpha_material_light = 2131165223;
- // aapt resource value: 0x7f080031
- public const int abc_dropdownitem_icon_width = 2131230769;
+ // aapt resource value: 0x7F070028
+ public const int abc_dropdownitem_icon_width = 2131165224;
- // aapt resource value: 0x7f080032
- public const int abc_dropdownitem_text_padding_left = 2131230770;
+ // aapt resource value: 0x7F070029
+ public const int abc_dropdownitem_text_padding_left = 2131165225;
- // aapt resource value: 0x7f080033
- public const int abc_dropdownitem_text_padding_right = 2131230771;
+ // aapt resource value: 0x7F07002A
+ public const int abc_dropdownitem_text_padding_right = 2131165226;
- // aapt resource value: 0x7f080034
- public const int abc_edit_text_inset_bottom_material = 2131230772;
+ // aapt resource value: 0x7F07002B
+ public const int abc_edit_text_inset_bottom_material = 2131165227;
- // aapt resource value: 0x7f080035
- public const int abc_edit_text_inset_horizontal_material = 2131230773;
+ // aapt resource value: 0x7F07002C
+ public const int abc_edit_text_inset_horizontal_material = 2131165228;
- // aapt resource value: 0x7f080036
- public const int abc_edit_text_inset_top_material = 2131230774;
+ // aapt resource value: 0x7F07002D
+ public const int abc_edit_text_inset_top_material = 2131165229;
- // aapt resource value: 0x7f080037
- public const int abc_floating_window_z = 2131230775;
+ // aapt resource value: 0x7F07002E
+ public const int abc_floating_window_z = 2131165230;
- // aapt resource value: 0x7f080038
- public const int abc_list_item_padding_horizontal_material = 2131230776;
+ // aapt resource value: 0x7F07002F
+ public const int abc_list_item_padding_horizontal_material = 2131165231;
- // aapt resource value: 0x7f080039
- public const int abc_panel_menu_list_width = 2131230777;
+ // aapt resource value: 0x7F070030
+ public const int abc_panel_menu_list_width = 2131165232;
- // aapt resource value: 0x7f08003a
- public const int abc_progress_bar_height_material = 2131230778;
+ // aapt resource value: 0x7F070031
+ public const int abc_progress_bar_height_material = 2131165233;
- // aapt resource value: 0x7f08003b
- public const int abc_search_view_preferred_height = 2131230779;
+ // aapt resource value: 0x7F070032
+ public const int abc_search_view_preferred_height = 2131165234;
- // aapt resource value: 0x7f08003c
- public const int abc_search_view_preferred_width = 2131230780;
+ // aapt resource value: 0x7F070033
+ public const int abc_search_view_preferred_width = 2131165235;
- // aapt resource value: 0x7f08003d
- public const int abc_seekbar_track_background_height_material = 2131230781;
+ // aapt resource value: 0x7F070034
+ public const int abc_seekbar_track_background_height_material = 2131165236;
- // aapt resource value: 0x7f08003e
- public const int abc_seekbar_track_progress_height_material = 2131230782;
+ // aapt resource value: 0x7F070035
+ public const int abc_seekbar_track_progress_height_material = 2131165237;
- // aapt resource value: 0x7f08003f
- public const int abc_select_dialog_padding_start_material = 2131230783;
+ // aapt resource value: 0x7F070036
+ public const int abc_select_dialog_padding_start_material = 2131165238;
- // aapt resource value: 0x7f080016
- public const int abc_switch_padding = 2131230742;
+ // aapt resource value: 0x7F070037
+ public const int abc_switch_padding = 2131165239;
- // aapt resource value: 0x7f080040
- public const int abc_text_size_body_1_material = 2131230784;
+ // aapt resource value: 0x7F070038
+ public const int abc_text_size_body_1_material = 2131165240;
- // aapt resource value: 0x7f080041
- public const int abc_text_size_body_2_material = 2131230785;
+ // aapt resource value: 0x7F070039
+ public const int abc_text_size_body_2_material = 2131165241;
- // aapt resource value: 0x7f080042
- public const int abc_text_size_button_material = 2131230786;
+ // aapt resource value: 0x7F07003A
+ public const int abc_text_size_button_material = 2131165242;
- // aapt resource value: 0x7f080043
- public const int abc_text_size_caption_material = 2131230787;
+ // aapt resource value: 0x7F07003B
+ public const int abc_text_size_caption_material = 2131165243;
- // aapt resource value: 0x7f080044
- public const int abc_text_size_display_1_material = 2131230788;
+ // aapt resource value: 0x7F07003C
+ public const int abc_text_size_display_1_material = 2131165244;
- // aapt resource value: 0x7f080045
- public const int abc_text_size_display_2_material = 2131230789;
+ // aapt resource value: 0x7F07003D
+ public const int abc_text_size_display_2_material = 2131165245;
- // aapt resource value: 0x7f080046
- public const int abc_text_size_display_3_material = 2131230790;
+ // aapt resource value: 0x7F07003E
+ public const int abc_text_size_display_3_material = 2131165246;
- // aapt resource value: 0x7f080047
- public const int abc_text_size_display_4_material = 2131230791;
+ // aapt resource value: 0x7F07003F
+ public const int abc_text_size_display_4_material = 2131165247;
- // aapt resource value: 0x7f080048
- public const int abc_text_size_headline_material = 2131230792;
+ // aapt resource value: 0x7F070040
+ public const int abc_text_size_headline_material = 2131165248;
- // aapt resource value: 0x7f080049
- public const int abc_text_size_large_material = 2131230793;
+ // aapt resource value: 0x7F070041
+ public const int abc_text_size_large_material = 2131165249;
- // aapt resource value: 0x7f08004a
- public const int abc_text_size_medium_material = 2131230794;
+ // aapt resource value: 0x7F070042
+ public const int abc_text_size_medium_material = 2131165250;
- // aapt resource value: 0x7f08004b
- public const int abc_text_size_menu_header_material = 2131230795;
+ // aapt resource value: 0x7F070043
+ public const int abc_text_size_menu_header_material = 2131165251;
- // aapt resource value: 0x7f08004c
- public const int abc_text_size_menu_material = 2131230796;
+ // aapt resource value: 0x7F070044
+ public const int abc_text_size_menu_material = 2131165252;
- // aapt resource value: 0x7f08004d
- public const int abc_text_size_small_material = 2131230797;
+ // aapt resource value: 0x7F070045
+ public const int abc_text_size_small_material = 2131165253;
- // aapt resource value: 0x7f08004e
- public const int abc_text_size_subhead_material = 2131230798;
+ // aapt resource value: 0x7F070046
+ public const int abc_text_size_subhead_material = 2131165254;
- // aapt resource value: 0x7f080009
- public const int abc_text_size_subtitle_material_toolbar = 2131230729;
+ // aapt resource value: 0x7F070047
+ public const int abc_text_size_subtitle_material_toolbar = 2131165255;
- // aapt resource value: 0x7f08004f
- public const int abc_text_size_title_material = 2131230799;
+ // aapt resource value: 0x7F070048
+ public const int abc_text_size_title_material = 2131165256;
- // aapt resource value: 0x7f08000a
- public const int abc_text_size_title_material_toolbar = 2131230730;
+ // aapt resource value: 0x7F070049
+ public const int abc_text_size_title_material_toolbar = 2131165257;
- // aapt resource value: 0x7f08008b
- public const int compat_button_inset_horizontal_material = 2131230859;
+ // aapt resource value: 0x7F07004A
+ public const int compat_button_inset_horizontal_material = 2131165258;
- // aapt resource value: 0x7f08008c
- public const int compat_button_inset_vertical_material = 2131230860;
+ // aapt resource value: 0x7F07004B
+ public const int compat_button_inset_vertical_material = 2131165259;
- // aapt resource value: 0x7f08008d
- public const int compat_button_padding_horizontal_material = 2131230861;
+ // aapt resource value: 0x7F07004C
+ public const int compat_button_padding_horizontal_material = 2131165260;
- // aapt resource value: 0x7f08008e
- public const int compat_button_padding_vertical_material = 2131230862;
+ // aapt resource value: 0x7F07004D
+ public const int compat_button_padding_vertical_material = 2131165261;
- // aapt resource value: 0x7f08008f
- public const int compat_control_corner_material = 2131230863;
+ // aapt resource value: 0x7F07004E
+ public const int compat_control_corner_material = 2131165262;
- // aapt resource value: 0x7f080069
- public const int design_appbar_elevation = 2131230825;
+ // aapt resource value: 0x7F07004F
+ public const int design_appbar_elevation = 2131165263;
- // aapt resource value: 0x7f08006a
- public const int design_bottom_navigation_active_item_max_width = 2131230826;
+ // aapt resource value: 0x7F070050
+ public const int design_bottom_navigation_active_item_max_width = 2131165264;
- // aapt resource value: 0x7f08006b
- public const int design_bottom_navigation_active_text_size = 2131230827;
+ // aapt resource value: 0x7F070051
+ public const int design_bottom_navigation_active_text_size = 2131165265;
- // aapt resource value: 0x7f08006c
- public const int design_bottom_navigation_elevation = 2131230828;
+ // aapt resource value: 0x7F070052
+ public const int design_bottom_navigation_elevation = 2131165266;
- // aapt resource value: 0x7f08006d
- public const int design_bottom_navigation_height = 2131230829;
+ // aapt resource value: 0x7F070053
+ public const int design_bottom_navigation_height = 2131165267;
- // aapt resource value: 0x7f08006e
- public const int design_bottom_navigation_item_max_width = 2131230830;
+ // aapt resource value: 0x7F070054
+ public const int design_bottom_navigation_item_max_width = 2131165268;
- // aapt resource value: 0x7f08006f
- public const int design_bottom_navigation_item_min_width = 2131230831;
+ // aapt resource value: 0x7F070055
+ public const int design_bottom_navigation_item_min_width = 2131165269;
- // aapt resource value: 0x7f080070
- public const int design_bottom_navigation_margin = 2131230832;
+ // aapt resource value: 0x7F070056
+ public const int design_bottom_navigation_margin = 2131165270;
- // aapt resource value: 0x7f080071
- public const int design_bottom_navigation_shadow_height = 2131230833;
+ // aapt resource value: 0x7F070057
+ public const int design_bottom_navigation_shadow_height = 2131165271;
- // aapt resource value: 0x7f080072
- public const int design_bottom_navigation_text_size = 2131230834;
+ // aapt resource value: 0x7F070058
+ public const int design_bottom_navigation_text_size = 2131165272;
- // aapt resource value: 0x7f080073
- public const int design_bottom_sheet_modal_elevation = 2131230835;
+ // aapt resource value: 0x7F070059
+ public const int design_bottom_sheet_modal_elevation = 2131165273;
- // aapt resource value: 0x7f080074
- public const int design_bottom_sheet_peek_height_min = 2131230836;
+ // aapt resource value: 0x7F07005A
+ public const int design_bottom_sheet_peek_height_min = 2131165274;
- // aapt resource value: 0x7f080075
- public const int design_fab_border_width = 2131230837;
+ // aapt resource value: 0x7F07005B
+ public const int design_fab_border_width = 2131165275;
- // aapt resource value: 0x7f080076
- public const int design_fab_elevation = 2131230838;
+ // aapt resource value: 0x7F07005C
+ public const int design_fab_elevation = 2131165276;
- // aapt resource value: 0x7f080077
- public const int design_fab_image_size = 2131230839;
+ // aapt resource value: 0x7F07005D
+ public const int design_fab_image_size = 2131165277;
- // aapt resource value: 0x7f080078
- public const int design_fab_size_mini = 2131230840;
+ // aapt resource value: 0x7F07005E
+ public const int design_fab_size_mini = 2131165278;
- // aapt resource value: 0x7f080079
- public const int design_fab_size_normal = 2131230841;
+ // aapt resource value: 0x7F07005F
+ public const int design_fab_size_normal = 2131165279;
- // aapt resource value: 0x7f08007a
- public const int design_fab_translation_z_pressed = 2131230842;
+ // aapt resource value: 0x7F070060
+ public const int design_fab_translation_z_pressed = 2131165280;
- // aapt resource value: 0x7f08007b
- public const int design_navigation_elevation = 2131230843;
+ // aapt resource value: 0x7F070061
+ public const int design_navigation_elevation = 2131165281;
- // aapt resource value: 0x7f08007c
- public const int design_navigation_icon_padding = 2131230844;
+ // aapt resource value: 0x7F070062
+ public const int design_navigation_icon_padding = 2131165282;
- // aapt resource value: 0x7f08007d
- public const int design_navigation_icon_size = 2131230845;
+ // aapt resource value: 0x7F070063
+ public const int design_navigation_icon_size = 2131165283;
- // aapt resource value: 0x7f080061
- public const int design_navigation_max_width = 2131230817;
+ // aapt resource value: 0x7F070064
+ public const int design_navigation_max_width = 2131165284;
- // aapt resource value: 0x7f08007e
- public const int design_navigation_padding_bottom = 2131230846;
+ // aapt resource value: 0x7F070065
+ public const int design_navigation_padding_bottom = 2131165285;
- // aapt resource value: 0x7f08007f
- public const int design_navigation_separator_vertical_padding = 2131230847;
+ // aapt resource value: 0x7F070066
+ public const int design_navigation_separator_vertical_padding = 2131165286;
- // aapt resource value: 0x7f080062
- public const int design_snackbar_action_inline_max_width = 2131230818;
+ // aapt resource value: 0x7F070067
+ public const int design_snackbar_action_inline_max_width = 2131165287;
- // aapt resource value: 0x7f080063
- public const int design_snackbar_background_corner_radius = 2131230819;
+ // aapt resource value: 0x7F070068
+ public const int design_snackbar_background_corner_radius = 2131165288;
- // aapt resource value: 0x7f080080
- public const int design_snackbar_elevation = 2131230848;
+ // aapt resource value: 0x7F070069
+ public const int design_snackbar_elevation = 2131165289;
- // aapt resource value: 0x7f080064
- public const int design_snackbar_extra_spacing_horizontal = 2131230820;
+ // aapt resource value: 0x7F07006A
+ public const int design_snackbar_extra_spacing_horizontal = 2131165290;
- // aapt resource value: 0x7f080065
- public const int design_snackbar_max_width = 2131230821;
+ // aapt resource value: 0x7F07006B
+ public const int design_snackbar_max_width = 2131165291;
- // aapt resource value: 0x7f080066
- public const int design_snackbar_min_width = 2131230822;
+ // aapt resource value: 0x7F07006C
+ public const int design_snackbar_min_width = 2131165292;
- // aapt resource value: 0x7f080081
- public const int design_snackbar_padding_horizontal = 2131230849;
+ // aapt resource value: 0x7F07006D
+ public const int design_snackbar_padding_horizontal = 2131165293;
- // aapt resource value: 0x7f080082
- public const int design_snackbar_padding_vertical = 2131230850;
+ // aapt resource value: 0x7F07006E
+ public const int design_snackbar_padding_vertical = 2131165294;
- // aapt resource value: 0x7f080067
- public const int design_snackbar_padding_vertical_2lines = 2131230823;
+ // aapt resource value: 0x7F07006F
+ public const int design_snackbar_padding_vertical_2lines = 2131165295;
- // aapt resource value: 0x7f080083
- public const int design_snackbar_text_size = 2131230851;
+ // aapt resource value: 0x7F070070
+ public const int design_snackbar_text_size = 2131165296;
- // aapt resource value: 0x7f080084
- public const int design_tab_max_width = 2131230852;
+ // aapt resource value: 0x7F070071
+ public const int design_tab_max_width = 2131165297;
- // aapt resource value: 0x7f080068
- public const int design_tab_scrollable_min_width = 2131230824;
+ // aapt resource value: 0x7F070072
+ public const int design_tab_scrollable_min_width = 2131165298;
- // aapt resource value: 0x7f080085
- public const int design_tab_text_size = 2131230853;
+ // aapt resource value: 0x7F070073
+ public const int design_tab_text_size = 2131165299;
- // aapt resource value: 0x7f080086
- public const int design_tab_text_size_2line = 2131230854;
+ // aapt resource value: 0x7F070074
+ public const int design_tab_text_size_2line = 2131165300;
- // aapt resource value: 0x7f080050
- public const int disabled_alpha_material_dark = 2131230800;
+ // aapt resource value: 0x7F070075
+ public const int disabled_alpha_material_dark = 2131165301;
- // aapt resource value: 0x7f080051
- public const int disabled_alpha_material_light = 2131230801;
+ // aapt resource value: 0x7F070076
+ public const int disabled_alpha_material_light = 2131165302;
- // aapt resource value: 0x7f080000
- public const int fastscroll_default_thickness = 2131230720;
+ // aapt resource value: 0x7F070077
+ public const int fastscroll_default_thickness = 2131165303;
- // aapt resource value: 0x7f080001
- public const int fastscroll_margin = 2131230721;
+ // aapt resource value: 0x7F070078
+ public const int fastscroll_margin = 2131165304;
- // aapt resource value: 0x7f080002
- public const int fastscroll_minimum_range = 2131230722;
+ // aapt resource value: 0x7F070079
+ public const int fastscroll_minimum_range = 2131165305;
- // aapt resource value: 0x7f08009c
- public const int fingerprint_icon_size = 2131230876;
+ // aapt resource value: 0x7F07007A
+ public const int fingerprint_icon_size = 2131165306;
- // aapt resource value: 0x7f08009b
- public const int fingerprint_status_layout_margin_vertical = 2131230875;
+ // aapt resource value: 0x7F07007B
+ public const int fingerprint_status_layout_margin_vertical = 2131165307;
- // aapt resource value: 0x7f080052
- public const int highlight_alpha_material_colored = 2131230802;
+ // aapt resource value: 0x7F07007C
+ public const int highlight_alpha_material_colored = 2131165308;
- // aapt resource value: 0x7f080053
- public const int highlight_alpha_material_dark = 2131230803;
+ // aapt resource value: 0x7F07007D
+ public const int highlight_alpha_material_dark = 2131165309;
- // aapt resource value: 0x7f080054
- public const int highlight_alpha_material_light = 2131230804;
+ // aapt resource value: 0x7F07007E
+ public const int highlight_alpha_material_light = 2131165310;
- // aapt resource value: 0x7f080055
- public const int hint_alpha_material_dark = 2131230805;
+ // aapt resource value: 0x7F07007F
+ public const int hint_alpha_material_dark = 2131165311;
- // aapt resource value: 0x7f080056
- public const int hint_alpha_material_light = 2131230806;
+ // aapt resource value: 0x7F070080
+ public const int hint_alpha_material_light = 2131165312;
- // aapt resource value: 0x7f080057
- public const int hint_pressed_alpha_material_dark = 2131230807;
+ // aapt resource value: 0x7F070081
+ public const int hint_pressed_alpha_material_dark = 2131165313;
- // aapt resource value: 0x7f080058
- public const int hint_pressed_alpha_material_light = 2131230808;
+ // aapt resource value: 0x7F070082
+ public const int hint_pressed_alpha_material_light = 2131165314;
- // aapt resource value: 0x7f080003
- public const int item_touch_helper_max_drag_scroll_per_frame = 2131230723;
+ // aapt resource value: 0x7F070083
+ public const int item_touch_helper_max_drag_scroll_per_frame = 2131165315;
- // aapt resource value: 0x7f080004
- public const int item_touch_helper_swipe_escape_max_velocity = 2131230724;
+ // aapt resource value: 0x7F070084
+ public const int item_touch_helper_swipe_escape_max_velocity = 2131165316;
- // aapt resource value: 0x7f080005
- public const int item_touch_helper_swipe_escape_velocity = 2131230725;
+ // aapt resource value: 0x7F070085
+ public const int item_touch_helper_swipe_escape_velocity = 2131165317;
- // aapt resource value: 0x7f080090
- public const int notification_action_icon_size = 2131230864;
+ // aapt resource value: 0x7F070086
+ public const int notification_action_icon_size = 2131165318;
- // aapt resource value: 0x7f080091
- public const int notification_action_text_size = 2131230865;
+ // aapt resource value: 0x7F070087
+ public const int notification_action_text_size = 2131165319;
- // aapt resource value: 0x7f080092
- public const int notification_big_circle_margin = 2131230866;
+ // aapt resource value: 0x7F070088
+ public const int notification_big_circle_margin = 2131165320;
- // aapt resource value: 0x7f080088
- public const int notification_content_margin_start = 2131230856;
+ // aapt resource value: 0x7F070089
+ public const int notification_content_margin_start = 2131165321;
- // aapt resource value: 0x7f080093
- public const int notification_large_icon_height = 2131230867;
+ // aapt resource value: 0x7F07008A
+ public const int notification_large_icon_height = 2131165322;
- // aapt resource value: 0x7f080094
- public const int notification_large_icon_width = 2131230868;
+ // aapt resource value: 0x7F07008B
+ public const int notification_large_icon_width = 2131165323;
- // aapt resource value: 0x7f080089
- public const int notification_main_column_padding_top = 2131230857;
+ // aapt resource value: 0x7F07008C
+ public const int notification_main_column_padding_top = 2131165324;
- // aapt resource value: 0x7f08008a
- public const int notification_media_narrow_margin = 2131230858;
+ // aapt resource value: 0x7F07008D
+ public const int notification_media_narrow_margin = 2131165325;
- // aapt resource value: 0x7f080095
- public const int notification_right_icon_size = 2131230869;
+ // aapt resource value: 0x7F07008E
+ public const int notification_right_icon_size = 2131165326;
- // aapt resource value: 0x7f080087
- public const int notification_right_side_padding_top = 2131230855;
+ // aapt resource value: 0x7F07008F
+ public const int notification_right_side_padding_top = 2131165327;
- // aapt resource value: 0x7f080096
- public const int notification_small_icon_background_padding = 2131230870;
+ // aapt resource value: 0x7F070090
+ public const int notification_small_icon_background_padding = 2131165328;
- // aapt resource value: 0x7f080097
- public const int notification_small_icon_size_as_large = 2131230871;
+ // aapt resource value: 0x7F070091
+ public const int notification_small_icon_size_as_large = 2131165329;
- // aapt resource value: 0x7f080098
- public const int notification_subtext_size = 2131230872;
+ // aapt resource value: 0x7F070092
+ public const int notification_subtext_size = 2131165330;
- // aapt resource value: 0x7f080099
- public const int notification_top_pad = 2131230873;
+ // aapt resource value: 0x7F070093
+ public const int notification_top_pad = 2131165331;
- // aapt resource value: 0x7f08009a
- public const int notification_top_pad_large_text = 2131230874;
+ // aapt resource value: 0x7F070094
+ public const int notification_top_pad_large_text = 2131165332;
- // aapt resource value: 0x7f08009d
- public const int pickerview_textsize = 2131230877;
+ // aapt resource value: 0x7F070095
+ public const int pickerview_textsize = 2131165333;
- // aapt resource value: 0x7f08009e
- public const int pickerview_topbar_btn_textsize = 2131230878;
+ // aapt resource value: 0x7F070096
+ public const int pickerview_topbar_btn_textsize = 2131165334;
- // aapt resource value: 0x7f08009f
- public const int pickerview_topbar_height = 2131230879;
+ // aapt resource value: 0x7F070097
+ public const int pickerview_topbar_height = 2131165335;
- // aapt resource value: 0x7f0800a0
- public const int pickerview_topbar_padding = 2131230880;
+ // aapt resource value: 0x7F070098
+ public const int pickerview_topbar_padding = 2131165336;
- // aapt resource value: 0x7f0800a1
- public const int pickerview_topbar_title_textsize = 2131230881;
+ // aapt resource value: 0x7F070099
+ public const int pickerview_topbar_title_textsize = 2131165337;
- // aapt resource value: 0x7f080059
- public const int tooltip_corner_radius = 2131230809;
+ // aapt resource value: 0x7F07009A
+ public const int tooltip_corner_radius = 2131165338;
- // aapt resource value: 0x7f08005a
- public const int tooltip_horizontal_padding = 2131230810;
+ // aapt resource value: 0x7F07009B
+ public const int tooltip_horizontal_padding = 2131165339;
- // aapt resource value: 0x7f08005b
- public const int tooltip_margin = 2131230811;
+ // aapt resource value: 0x7F07009C
+ public const int tooltip_margin = 2131165340;
- // aapt resource value: 0x7f08005c
- public const int tooltip_precise_anchor_extra_offset = 2131230812;
+ // aapt resource value: 0x7F07009D
+ public const int tooltip_precise_anchor_extra_offset = 2131165341;
- // aapt resource value: 0x7f08005d
- public const int tooltip_precise_anchor_threshold = 2131230813;
+ // aapt resource value: 0x7F07009E
+ public const int tooltip_precise_anchor_threshold = 2131165342;
- // aapt resource value: 0x7f08005e
- public const int tooltip_vertical_padding = 2131230814;
+ // aapt resource value: 0x7F07009F
+ public const int tooltip_vertical_padding = 2131165343;
- // aapt resource value: 0x7f08005f
- public const int tooltip_y_offset_non_touch = 2131230815;
+ // aapt resource value: 0x7F0700A0
+ public const int tooltip_y_offset_non_touch = 2131165344;
- // aapt resource value: 0x7f080060
- public const int tooltip_y_offset_touch = 2131230816;
+ // aapt resource value: 0x7F0700A1
+ public const int tooltip_y_offset_touch = 2131165345;
static Dimension()
{
@@ -2528,461 +2528,443 @@
public partial class Drawable
{
- // aapt resource value: 0x7f020000
- public const int abc_ab_share_pack_mtrl_alpha = 2130837504;
+ // aapt resource value: 0x7F080006
+ public const int abc_ab_share_pack_mtrl_alpha = 2131230726;
- // aapt resource value: 0x7f020001
- public const int abc_action_bar_item_background_material = 2130837505;
+ // aapt resource value: 0x7F080007
+ public const int abc_action_bar_item_background_material = 2131230727;
- // aapt resource value: 0x7f020002
- public const int abc_btn_borderless_material = 2130837506;
+ // aapt resource value: 0x7F080008
+ public const int abc_btn_borderless_material = 2131230728;
- // aapt resource value: 0x7f020003
- public const int abc_btn_check_material = 2130837507;
+ // aapt resource value: 0x7F080009
+ public const int abc_btn_check_material = 2131230729;
- // aapt resource value: 0x7f020004
- public const int abc_btn_check_to_on_mtrl_000 = 2130837508;
+ // aapt resource value: 0x7F08000A
+ public const int abc_btn_check_to_on_mtrl_000 = 2131230730;
- // aapt resource value: 0x7f020005
- public const int abc_btn_check_to_on_mtrl_015 = 2130837509;
+ // aapt resource value: 0x7F08000B
+ public const int abc_btn_check_to_on_mtrl_015 = 2131230731;
- // aapt resource value: 0x7f020006
- public const int abc_btn_colored_material = 2130837510;
+ // aapt resource value: 0x7F08000C
+ public const int abc_btn_colored_material = 2131230732;
- // aapt resource value: 0x7f020007
- public const int abc_btn_default_mtrl_shape = 2130837511;
+ // aapt resource value: 0x7F08000D
+ public const int abc_btn_default_mtrl_shape = 2131230733;
- // aapt resource value: 0x7f020008
- public const int abc_btn_radio_material = 2130837512;
+ // aapt resource value: 0x7F08000E
+ public const int abc_btn_radio_material = 2131230734;
- // aapt resource value: 0x7f020009
- public const int abc_btn_radio_to_on_mtrl_000 = 2130837513;
+ // aapt resource value: 0x7F08000F
+ public const int abc_btn_radio_to_on_mtrl_000 = 2131230735;
- // aapt resource value: 0x7f02000a
- public const int abc_btn_radio_to_on_mtrl_015 = 2130837514;
+ // aapt resource value: 0x7F080010
+ public const int abc_btn_radio_to_on_mtrl_015 = 2131230736;
- // aapt resource value: 0x7f02000b
- public const int abc_btn_switch_to_on_mtrl_00001 = 2130837515;
+ // aapt resource value: 0x7F080011
+ public const int abc_btn_switch_to_on_mtrl_00001 = 2131230737;
- // aapt resource value: 0x7f02000c
- public const int abc_btn_switch_to_on_mtrl_00012 = 2130837516;
+ // aapt resource value: 0x7F080012
+ public const int abc_btn_switch_to_on_mtrl_00012 = 2131230738;
- // aapt resource value: 0x7f02000d
- public const int abc_cab_background_internal_bg = 2130837517;
+ // aapt resource value: 0x7F080013
+ public const int abc_cab_background_internal_bg = 2131230739;
- // aapt resource value: 0x7f02000e
- public const int abc_cab_background_top_material = 2130837518;
+ // aapt resource value: 0x7F080014
+ public const int abc_cab_background_top_material = 2131230740;
- // aapt resource value: 0x7f02000f
- public const int abc_cab_background_top_mtrl_alpha = 2130837519;
+ // aapt resource value: 0x7F080015
+ public const int abc_cab_background_top_mtrl_alpha = 2131230741;
- // aapt resource value: 0x7f020010
- public const int abc_control_background_material = 2130837520;
+ // aapt resource value: 0x7F080016
+ public const int abc_control_background_material = 2131230742;
- // aapt resource value: 0x7f020011
- public const int abc_dialog_material_background = 2130837521;
+ // aapt resource value: 0x7F080017
+ public const int abc_dialog_material_background = 2131230743;
- // aapt resource value: 0x7f020012
- public const int abc_edit_text_material = 2130837522;
+ // aapt resource value: 0x7F080018
+ public const int abc_edit_text_material = 2131230744;
- // aapt resource value: 0x7f020013
- public const int abc_ic_ab_back_material = 2130837523;
+ // aapt resource value: 0x7F080019
+ public const int abc_ic_ab_back_material = 2131230745;
- // aapt resource value: 0x7f020014
- public const int abc_ic_arrow_drop_right_black_24dp = 2130837524;
+ // aapt resource value: 0x7F08001A
+ public const int abc_ic_arrow_drop_right_black_24dp = 2131230746;
- // aapt resource value: 0x7f020015
- public const int abc_ic_clear_material = 2130837525;
+ // aapt resource value: 0x7F08001B
+ public const int abc_ic_clear_material = 2131230747;
- // aapt resource value: 0x7f020016
- public const int abc_ic_commit_search_api_mtrl_alpha = 2130837526;
+ // aapt resource value: 0x7F08001C
+ public const int abc_ic_commit_search_api_mtrl_alpha = 2131230748;
- // aapt resource value: 0x7f020017
- public const int abc_ic_go_search_api_material = 2130837527;
+ // aapt resource value: 0x7F08001D
+ public const int abc_ic_go_search_api_material = 2131230749;
- // aapt resource value: 0x7f020018
- public const int abc_ic_menu_copy_mtrl_am_alpha = 2130837528;
+ // aapt resource value: 0x7F08001E
+ public const int abc_ic_menu_copy_mtrl_am_alpha = 2131230750;
- // aapt resource value: 0x7f020019
- public const int abc_ic_menu_cut_mtrl_alpha = 2130837529;
+ // aapt resource value: 0x7F08001F
+ public const int abc_ic_menu_cut_mtrl_alpha = 2131230751;
- // aapt resource value: 0x7f02001a
- public const int abc_ic_menu_overflow_material = 2130837530;
+ // aapt resource value: 0x7F080020
+ public const int abc_ic_menu_overflow_material = 2131230752;
- // aapt resource value: 0x7f02001b
- public const int abc_ic_menu_paste_mtrl_am_alpha = 2130837531;
+ // aapt resource value: 0x7F080021
+ public const int abc_ic_menu_paste_mtrl_am_alpha = 2131230753;
- // aapt resource value: 0x7f02001c
- public const int abc_ic_menu_selectall_mtrl_alpha = 2130837532;
+ // aapt resource value: 0x7F080022
+ public const int abc_ic_menu_selectall_mtrl_alpha = 2131230754;
- // aapt resource value: 0x7f02001d
- public const int abc_ic_menu_share_mtrl_alpha = 2130837533;
+ // aapt resource value: 0x7F080023
+ public const int abc_ic_menu_share_mtrl_alpha = 2131230755;
- // aapt resource value: 0x7f02001e
- public const int abc_ic_search_api_material = 2130837534;
+ // aapt resource value: 0x7F080024
+ public const int abc_ic_search_api_material = 2131230756;
- // aapt resource value: 0x7f02001f
- public const int abc_ic_star_black_16dp = 2130837535;
+ // aapt resource value: 0x7F080025
+ public const int abc_ic_star_black_16dp = 2131230757;
- // aapt resource value: 0x7f020020
- public const int abc_ic_star_black_36dp = 2130837536;
+ // aapt resource value: 0x7F080026
+ public const int abc_ic_star_black_36dp = 2131230758;
- // aapt resource value: 0x7f020021
- public const int abc_ic_star_black_48dp = 2130837537;
+ // aapt resource value: 0x7F080027
+ public const int abc_ic_star_black_48dp = 2131230759;
- // aapt resource value: 0x7f020022
- public const int abc_ic_star_half_black_16dp = 2130837538;
+ // aapt resource value: 0x7F080028
+ public const int abc_ic_star_half_black_16dp = 2131230760;
- // aapt resource value: 0x7f020023
- public const int abc_ic_star_half_black_36dp = 2130837539;
+ // aapt resource value: 0x7F080029
+ public const int abc_ic_star_half_black_36dp = 2131230761;
- // aapt resource value: 0x7f020024
- public const int abc_ic_star_half_black_48dp = 2130837540;
+ // aapt resource value: 0x7F08002A
+ public const int abc_ic_star_half_black_48dp = 2131230762;
- // aapt resource value: 0x7f020025
- public const int abc_ic_voice_search_api_material = 2130837541;
+ // aapt resource value: 0x7F08002B
+ public const int abc_ic_voice_search_api_material = 2131230763;
- // aapt resource value: 0x7f020026
- public const int abc_item_background_holo_dark = 2130837542;
+ // aapt resource value: 0x7F08002C
+ public const int abc_item_background_holo_dark = 2131230764;
- // aapt resource value: 0x7f020027
- public const int abc_item_background_holo_light = 2130837543;
+ // aapt resource value: 0x7F08002D
+ public const int abc_item_background_holo_light = 2131230765;
- // aapt resource value: 0x7f020028
- public const int abc_list_divider_mtrl_alpha = 2130837544;
+ // aapt resource value: 0x7F08002E
+ public const int abc_list_divider_mtrl_alpha = 2131230766;
- // aapt resource value: 0x7f020029
- public const int abc_list_focused_holo = 2130837545;
+ // aapt resource value: 0x7F08002F
+ public const int abc_list_focused_holo = 2131230767;
- // aapt resource value: 0x7f02002a
- public const int abc_list_longpressed_holo = 2130837546;
+ // aapt resource value: 0x7F080030
+ public const int abc_list_longpressed_holo = 2131230768;
- // aapt resource value: 0x7f02002b
- public const int abc_list_pressed_holo_dark = 2130837547;
+ // aapt resource value: 0x7F080031
+ public const int abc_list_pressed_holo_dark = 2131230769;
- // aapt resource value: 0x7f02002c
- public const int abc_list_pressed_holo_light = 2130837548;
+ // aapt resource value: 0x7F080032
+ public const int abc_list_pressed_holo_light = 2131230770;
- // aapt resource value: 0x7f02002d
- public const int abc_list_selector_background_transition_holo_dark = 2130837549;
+ // aapt resource value: 0x7F080033
+ public const int abc_list_selector_background_transition_holo_dark = 2131230771;
- // aapt resource value: 0x7f02002e
- public const int abc_list_selector_background_transition_holo_light = 2130837550;
+ // aapt resource value: 0x7F080034
+ public const int abc_list_selector_background_transition_holo_light = 2131230772;
- // aapt resource value: 0x7f02002f
- public const int abc_list_selector_disabled_holo_dark = 2130837551;
+ // aapt resource value: 0x7F080035
+ public const int abc_list_selector_disabled_holo_dark = 2131230773;
- // aapt resource value: 0x7f020030
- public const int abc_list_selector_disabled_holo_light = 2130837552;
+ // aapt resource value: 0x7F080036
+ public const int abc_list_selector_disabled_holo_light = 2131230774;
- // aapt resource value: 0x7f020031
- public const int abc_list_selector_holo_dark = 2130837553;
+ // aapt resource value: 0x7F080037
+ public const int abc_list_selector_holo_dark = 2131230775;
- // aapt resource value: 0x7f020032
- public const int abc_list_selector_holo_light = 2130837554;
+ // aapt resource value: 0x7F080038
+ public const int abc_list_selector_holo_light = 2131230776;
- // aapt resource value: 0x7f020033
- public const int abc_menu_hardkey_panel_mtrl_mult = 2130837555;
+ // aapt resource value: 0x7F080039
+ public const int abc_menu_hardkey_panel_mtrl_mult = 2131230777;
- // aapt resource value: 0x7f020034
- public const int abc_popup_background_mtrl_mult = 2130837556;
+ // aapt resource value: 0x7F08003A
+ public const int abc_popup_background_mtrl_mult = 2131230778;
- // aapt resource value: 0x7f020035
- public const int abc_ratingbar_indicator_material = 2130837557;
+ // aapt resource value: 0x7F08003B
+ public const int abc_ratingbar_indicator_material = 2131230779;
- // aapt resource value: 0x7f020036
- public const int abc_ratingbar_material = 2130837558;
+ // aapt resource value: 0x7F08003C
+ public const int abc_ratingbar_material = 2131230780;
- // aapt resource value: 0x7f020037
- public const int abc_ratingbar_small_material = 2130837559;
+ // aapt resource value: 0x7F08003D
+ public const int abc_ratingbar_small_material = 2131230781;
- // aapt resource value: 0x7f020038
- public const int abc_scrubber_control_off_mtrl_alpha = 2130837560;
+ // aapt resource value: 0x7F08003E
+ public const int abc_scrubber_control_off_mtrl_alpha = 2131230782;
- // aapt resource value: 0x7f020039
- public const int abc_scrubber_control_to_pressed_mtrl_000 = 2130837561;
+ // aapt resource value: 0x7F08003F
+ public const int abc_scrubber_control_to_pressed_mtrl_000 = 2131230783;
- // aapt resource value: 0x7f02003a
- public const int abc_scrubber_control_to_pressed_mtrl_005 = 2130837562;
+ // aapt resource value: 0x7F080040
+ public const int abc_scrubber_control_to_pressed_mtrl_005 = 2131230784;
- // aapt resource value: 0x7f02003b
- public const int abc_scrubber_primary_mtrl_alpha = 2130837563;
+ // aapt resource value: 0x7F080041
+ public const int abc_scrubber_primary_mtrl_alpha = 2131230785;
- // aapt resource value: 0x7f02003c
- public const int abc_scrubber_track_mtrl_alpha = 2130837564;
+ // aapt resource value: 0x7F080042
+ public const int abc_scrubber_track_mtrl_alpha = 2131230786;
- // aapt resource value: 0x7f02003d
- public const int abc_seekbar_thumb_material = 2130837565;
+ // aapt resource value: 0x7F080043
+ public const int abc_seekbar_thumb_material = 2131230787;
- // aapt resource value: 0x7f02003e
- public const int abc_seekbar_tick_mark_material = 2130837566;
+ // aapt resource value: 0x7F080044
+ public const int abc_seekbar_tick_mark_material = 2131230788;
- // aapt resource value: 0x7f02003f
- public const int abc_seekbar_track_material = 2130837567;
+ // aapt resource value: 0x7F080045
+ public const int abc_seekbar_track_material = 2131230789;
- // aapt resource value: 0x7f020040
- public const int abc_spinner_mtrl_am_alpha = 2130837568;
+ // aapt resource value: 0x7F080046
+ public const int abc_spinner_mtrl_am_alpha = 2131230790;
- // aapt resource value: 0x7f020041
- public const int abc_spinner_textfield_background_material = 2130837569;
+ // aapt resource value: 0x7F080047
+ public const int abc_spinner_textfield_background_material = 2131230791;
- // aapt resource value: 0x7f020042
- public const int abc_switch_thumb_material = 2130837570;
+ // aapt resource value: 0x7F080048
+ public const int abc_switch_thumb_material = 2131230792;
- // aapt resource value: 0x7f020043
- public const int abc_switch_track_mtrl_alpha = 2130837571;
+ // aapt resource value: 0x7F080049
+ public const int abc_switch_track_mtrl_alpha = 2131230793;
- // aapt resource value: 0x7f020044
- public const int abc_tab_indicator_material = 2130837572;
+ // aapt resource value: 0x7F08004A
+ public const int abc_tab_indicator_material = 2131230794;
- // aapt resource value: 0x7f020045
- public const int abc_tab_indicator_mtrl_alpha = 2130837573;
+ // aapt resource value: 0x7F08004B
+ public const int abc_tab_indicator_mtrl_alpha = 2131230795;
- // aapt resource value: 0x7f020046
- public const int abc_text_cursor_material = 2130837574;
+ // aapt resource value: 0x7F080053
+ public const int abc_textfield_activated_mtrl_alpha = 2131230803;
- // aapt resource value: 0x7f020047
- public const int abc_text_select_handle_left_mtrl_dark = 2130837575;
+ // aapt resource value: 0x7F080054
+ public const int abc_textfield_default_mtrl_alpha = 2131230804;
- // aapt resource value: 0x7f020048
- public const int abc_text_select_handle_left_mtrl_light = 2130837576;
+ // aapt resource value: 0x7F080055
+ public const int abc_textfield_search_activated_mtrl_alpha = 2131230805;
- // aapt resource value: 0x7f020049
- public const int abc_text_select_handle_middle_mtrl_dark = 2130837577;
+ // aapt resource value: 0x7F080056
+ public const int abc_textfield_search_default_mtrl_alpha = 2131230806;
- // aapt resource value: 0x7f02004a
- public const int abc_text_select_handle_middle_mtrl_light = 2130837578;
+ // aapt resource value: 0x7F080057
+ public const int abc_textfield_search_material = 2131230807;
- // aapt resource value: 0x7f02004b
- public const int abc_text_select_handle_right_mtrl_dark = 2130837579;
-
- // aapt resource value: 0x7f02004c
- public const int abc_text_select_handle_right_mtrl_light = 2130837580;
-
- // aapt resource value: 0x7f02004d
- public const int abc_textfield_activated_mtrl_alpha = 2130837581;
-
- // aapt resource value: 0x7f02004e
- public const int abc_textfield_default_mtrl_alpha = 2130837582;
-
- // aapt resource value: 0x7f02004f
- public const int abc_textfield_search_activated_mtrl_alpha = 2130837583;
-
- // aapt resource value: 0x7f020050
- public const int abc_textfield_search_default_mtrl_alpha = 2130837584;
-
- // aapt resource value: 0x7f020051
- public const int abc_textfield_search_material = 2130837585;
+ // aapt resource value: 0x7F08004C
+ public const int abc_text_cursor_material = 2131230796;
- // aapt resource value: 0x7f020052
- public const int abc_vector_test = 2130837586;
+ // aapt resource value: 0x7F08004D
+ public const int abc_text_select_handle_left_mtrl_dark = 2131230797;
- // aapt resource value: 0x7f020053
- public const int avd_hide_password = 2130837587;
+ // aapt resource value: 0x7F08004E
+ public const int abc_text_select_handle_left_mtrl_light = 2131230798;
- // aapt resource value: 0x7f020092
- public const int avd_hide_password_1 = 2130837650;
+ // aapt resource value: 0x7F08004F
+ public const int abc_text_select_handle_middle_mtrl_dark = 2131230799;
- // aapt resource value: 0x7f020093
- public const int avd_hide_password_2 = 2130837651;
+ // aapt resource value: 0x7F080050
+ public const int abc_text_select_handle_middle_mtrl_light = 2131230800;
- // aapt resource value: 0x7f020094
- public const int avd_hide_password_3 = 2130837652;
+ // aapt resource value: 0x7F080051
+ public const int abc_text_select_handle_right_mtrl_dark = 2131230801;
- // aapt resource value: 0x7f020054
- public const int avd_show_password = 2130837588;
+ // aapt resource value: 0x7F080052
+ public const int abc_text_select_handle_right_mtrl_light = 2131230802;
- // aapt resource value: 0x7f020095
- public const int avd_show_password_1 = 2130837653;
+ // aapt resource value: 0x7F080058
+ public const int abc_vector_test = 2131230808;
- // aapt resource value: 0x7f020096
- public const int avd_show_password_2 = 2130837654;
+ // aapt resource value: 0x7F080059
+ public const int avd_hide_password = 2131230809;
- // aapt resource value: 0x7f020097
- public const int avd_show_password_3 = 2130837655;
+ // aapt resource value: 0x7F08005A
+ public const int avd_show_password = 2131230810;
- // aapt resource value: 0x7f020055
- public const int design_bottom_navigation_item_background = 2130837589;
+ // aapt resource value: 0x7F08005B
+ public const int design_bottom_navigation_item_background = 2131230811;
- // aapt resource value: 0x7f020056
- public const int design_fab_background = 2130837590;
+ // aapt resource value: 0x7F08005C
+ public const int design_fab_background = 2131230812;
- // aapt resource value: 0x7f020057
- public const int design_ic_visibility = 2130837591;
+ // aapt resource value: 0x7F08005D
+ public const int design_ic_visibility = 2131230813;
- // aapt resource value: 0x7f020058
- public const int design_ic_visibility_off = 2130837592;
+ // aapt resource value: 0x7F08005E
+ public const int design_ic_visibility_off = 2131230814;
- // aapt resource value: 0x7f020059
- public const int design_password_eye = 2130837593;
+ // aapt resource value: 0x7F08005F
+ public const int design_password_eye = 2131230815;
- // aapt resource value: 0x7f02005a
- public const int design_snackbar_background = 2130837594;
+ // aapt resource value: 0x7F080060
+ public const int design_snackbar_background = 2131230816;
- // aapt resource value: 0x7f02005b
- public const int fingerprint_draw_off = 2130837595;
+ // aapt resource value: 0x7F080061
+ public const int fingerprint_draw_off = 2131230817;
- // aapt resource value: 0x7f02005c
- public const int fingerprint_draw_off_animation = 2130837596;
+ // aapt resource value: 0x7F080062
+ public const int fingerprint_draw_off_animation = 2131230818;
- // aapt resource value: 0x7f02005d
- public const int fingerprint_draw_on = 2130837597;
+ // aapt resource value: 0x7F080063
+ public const int fingerprint_draw_on = 2131230819;
- // aapt resource value: 0x7f02005e
- public const int fingerprint_draw_on_animation = 2130837598;
+ // aapt resource value: 0x7F080064
+ public const int fingerprint_draw_on_animation = 2131230820;
- // aapt resource value: 0x7f02005f
- public const int fingerprint_error = 2130837599;
+ // aapt resource value: 0x7F080065
+ public const int fingerprint_error = 2131230821;
- // aapt resource value: 0x7f020060
- public const int fingerprint_error_off = 2130837600;
+ // aapt resource value: 0x7F080066
+ public const int fingerprint_error_off = 2131230822;
- // aapt resource value: 0x7f020061
- public const int fingerprint_error_off_animation = 2130837601;
+ // aapt resource value: 0x7F080067
+ public const int fingerprint_error_off_animation = 2131230823;
- // aapt resource value: 0x7f020062
- public const int fingerprint_error_on = 2130837602;
+ // aapt resource value: 0x7F080068
+ public const int fingerprint_error_on = 2131230824;
- // aapt resource value: 0x7f020063
- public const int fingerprint_error_on_animation = 2130837603;
+ // aapt resource value: 0x7F080069
+ public const int fingerprint_error_on_animation = 2131230825;
- // aapt resource value: 0x7f020064
- public const int fingerprint_error_state_to_fp = 2130837604;
+ // aapt resource value: 0x7F08006A
+ public const int fingerprint_error_state_to_fp = 2131230826;
- // aapt resource value: 0x7f020065
- public const int fingerprint_error_state_to_fp_animation = 2130837605;
+ // aapt resource value: 0x7F08006B
+ public const int fingerprint_error_state_to_fp_animation = 2131230827;
- // aapt resource value: 0x7f020066
- public const int fingerprint_fingerprint = 2130837606;
+ // aapt resource value: 0x7F08006C
+ public const int fingerprint_fingerprint = 2131230828;
- // aapt resource value: 0x7f020067
- public const int fingerprint_fp_to_error_state = 2130837607;
+ // aapt resource value: 0x7F08006D
+ public const int fingerprint_fp_to_error_state = 2131230829;
- // aapt resource value: 0x7f020068
- public const int fingerprint_fp_to_error_state_animation = 2130837608;
+ // aapt resource value: 0x7F08006E
+ public const int fingerprint_fp_to_error_state_animation = 2131230830;
- // aapt resource value: 0x7f020069
- public const int gd_btn_shape_app_b = 2130837609;
+ // aapt resource value: 0x7F08006F
+ public const int gd_btn_shape_app_b = 2131230831;
- // aapt resource value: 0x7f02006a
- public const int gd_btn_shape_app_g = 2130837610;
+ // aapt resource value: 0x7F080070
+ public const int gd_btn_shape_app_g = 2131230832;
- // aapt resource value: 0x7f02006b
- public const int gd_btn_shape_app_w = 2130837611;
+ // aapt resource value: 0x7F080071
+ public const int gd_btn_shape_app_w = 2131230833;
- // aapt resource value: 0x7f02006c
- public const int gd_btn_shape_shadow_w = 2130837612;
+ // aapt resource value: 0x7F080072
+ public const int gd_btn_shape_shadow_w = 2131230834;
- // aapt resource value: 0x7f02006d
- public const int gd_click_effect_select = 2130837613;
+ // aapt resource value: 0x7F080073
+ public const int gd_click_effect_select = 2131230835;
- // aapt resource value: 0x7f02006e
- public const int ic_gdmap_add = 2130837614;
+ // aapt resource value: 0x7F080086
+ public const int Icon = 2131230854;
- // aapt resource value: 0x7f02006f
- public const int ic_gdmap_back = 2130837615;
+ // aapt resource value: 0x7F080074
+ public const int ic_gdmap_add = 2131230836;
- // aapt resource value: 0x7f020070
- public const int ic_gdmap_delete = 2130837616;
+ // aapt resource value: 0x7F080075
+ public const int ic_gdmap_back = 2131230837;
- // aapt resource value: 0x7f020071
- public const int ic_gdmap_home = 2130837617;
+ // aapt resource value: 0x7F080076
+ public const int ic_gdmap_delete = 2131230838;
- // aapt resource value: 0x7f020072
- public const int ic_gdmap_mylocation = 2130837618;
+ // aapt resource value: 0x7F080077
+ public const int ic_gdmap_home = 2131230839;
- // aapt resource value: 0x7f020073
- public const int ic_gdmap_now = 2130837619;
+ // aapt resource value: 0x7F080078
+ public const int ic_gdmap_mylocation = 2131230840;
- // aapt resource value: 0x7f020074
- public const int ic_gdmap_search = 2130837620;
+ // aapt resource value: 0x7F080079
+ public const int ic_gdmap_now = 2131230841;
- // aapt resource value: 0x7f020075
- public const int ic_gdmap_zoom_out = 2130837621;
+ // aapt resource value: 0x7F08007A
+ public const int ic_gdmap_search = 2131230842;
- // aapt resource value: 0x7f020076
- public const int ic_gps_point = 2130837622;
+ // aapt resource value: 0x7F08007B
+ public const int ic_gdmap_zoom_out = 2131230843;
- // aapt resource value: 0x7f020077
- public const int ic_wd_arc_scale_bg = 2130837623;
+ // aapt resource value: 0x7F08007C
+ public const int ic_gps_point = 2131230844;
- // aapt resource value: 0x7f020078
- public const int ic_wd_curtain_bg_top = 2130837624;
+ // aapt resource value: 0x7F08007D
+ public const int ic_wd_arc_scale_bg = 2131230845;
- // aapt resource value: 0x7f020079
- public const int ic_wd_curtain_h_bg = 2130837625;
+ // aapt resource value: 0x7F08007E
+ public const int ic_wd_curtain_bg_top = 2131230846;
- // aapt resource value: 0x7f02007a
- public const int ic_wd_curtain_h_open = 2130837626;
+ // aapt resource value: 0x7F08007F
+ public const int ic_wd_curtain_h_bg = 2131230847;
- // aapt resource value: 0x7f02007b
- public const int ic_wd_curtain_h_progress = 2130837627;
+ // aapt resource value: 0x7F080080
+ public const int ic_wd_curtain_h_open = 2131230848;
- // aapt resource value: 0x7f02007c
- public const int ic_wd_curtain_h_top = 2130837628;
+ // aapt resource value: 0x7F080081
+ public const int ic_wd_curtain_h_progress = 2131230849;
- // aapt resource value: 0x7f02007d
- public const int ic_wd_curtain_open = 2130837629;
+ // aapt resource value: 0x7F080082
+ public const int ic_wd_curtain_h_top = 2131230850;
- // aapt resource value: 0x7f02007e
- public const int ic_wd_curtain_roll_bg = 2130837630;
+ // aapt resource value: 0x7F080083
+ public const int ic_wd_curtain_open = 2131230851;
- // aapt resource value: 0x7f02007f
- public const int ic_wd_curtain_roll_progress = 2130837631;
+ // aapt resource value: 0x7F080084
+ public const int ic_wd_curtain_roll_bg = 2131230852;
- // aapt resource value: 0x7f020080
- public const int Icon = 2130837632;
+ // aapt resource value: 0x7F080085
+ public const int ic_wd_curtain_roll_progress = 2131230853;
- // aapt resource value: 0x7f020081
- public const int Loading = 2130837633;
+ // aapt resource value: 0x7F080087
+ public const int Loading = 2131230855;
- // aapt resource value: 0x7f020082
- public const int navigation_empty_icon = 2130837634;
+ // aapt resource value: 0x7F080088
+ public const int navigation_empty_icon = 2131230856;
- // aapt resource value: 0x7f020083
- public const int notification_action_background = 2130837635;
+ // aapt resource value: 0x7F080089
+ public const int notification_action_background = 2131230857;
- // aapt resource value: 0x7f020084
- public const int notification_bg = 2130837636;
+ // aapt resource value: 0x7F08008A
+ public const int notification_bg = 2131230858;
- // aapt resource value: 0x7f020085
- public const int notification_bg_low = 2130837637;
+ // aapt resource value: 0x7F08008B
+ public const int notification_bg_low = 2131230859;
- // aapt resource value: 0x7f020086
- public const int notification_bg_low_normal = 2130837638;
+ // aapt resource value: 0x7F08008C
+ public const int notification_bg_low_normal = 2131230860;
- // aapt resource value: 0x7f020087
- public const int notification_bg_low_pressed = 2130837639;
+ // aapt resource value: 0x7F08008D
+ public const int notification_bg_low_pressed = 2131230861;
- // aapt resource value: 0x7f020088
- public const int notification_bg_normal = 2130837640;
+ // aapt resource value: 0x7F08008E
+ public const int notification_bg_normal = 2131230862;
- // aapt resource value: 0x7f020089
- public const int notification_bg_normal_pressed = 2130837641;
+ // aapt resource value: 0x7F08008F
+ public const int notification_bg_normal_pressed = 2131230863;
- // aapt resource value: 0x7f02008a
- public const int notification_icon_background = 2130837642;
+ // aapt resource value: 0x7F080090
+ public const int notification_icon_background = 2131230864;
- // aapt resource value: 0x7f020090
- public const int notification_template_icon_bg = 2130837648;
+ // aapt resource value: 0x7F080091
+ public const int notification_template_icon_bg = 2131230865;
- // aapt resource value: 0x7f020091
- public const int notification_template_icon_low_bg = 2130837649;
+ // aapt resource value: 0x7F080092
+ public const int notification_template_icon_low_bg = 2131230866;
- // aapt resource value: 0x7f02008b
- public const int notification_tile_bg = 2130837643;
+ // aapt resource value: 0x7F080093
+ public const int notification_tile_bg = 2131230867;
- // aapt resource value: 0x7f02008c
- public const int notify_panel_notification_icon_bg = 2130837644;
+ // aapt resource value: 0x7F080094
+ public const int notify_panel_notification_icon_bg = 2131230868;
- // aapt resource value: 0x7f02008d
- public const int selector_pickerview_btn = 2130837645;
+ // aapt resource value: 0x7F080095
+ public const int selector_pickerview_btn = 2131230869;
- // aapt resource value: 0x7f02008e
- public const int tooltip_frame_dark = 2130837646;
+ // aapt resource value: 0x7F080096
+ public const int tooltip_frame_dark = 2131230870;
- // aapt resource value: 0x7f02008f
- public const int tooltip_frame_light = 2130837647;
+ // aapt resource value: 0x7F080097
+ public const int tooltip_frame_light = 2131230871;
static Drawable()
{
@@ -2997,665 +2979,665 @@
public partial class Id
{
- // aapt resource value: 0x7f090027
- public const int ALT = 2131296295;
+ // aapt resource value: 0x7F09000E
+ public const int action0 = 2131296270;
- // aapt resource value: 0x7f090028
- public const int CTRL = 2131296296;
+ // aapt resource value: 0x7F090020
+ public const int actions = 2131296288;
- // aapt resource value: 0x7f090054
- public const int FILL = 2131296340;
+ // aapt resource value: 0x7F09000F
+ public const int action_bar = 2131296271;
- // aapt resource value: 0x7f090055
- public const int FILL_STROKE = 2131296341;
+ // aapt resource value: 0x7F090010
+ public const int action_bar_activity_content = 2131296272;
- // aapt resource value: 0x7f090029
- public const int FUNCTION = 2131296297;
+ // aapt resource value: 0x7F090011
+ public const int action_bar_container = 2131296273;
- // aapt resource value: 0x7f09004f
- public const int FixedBehind = 2131296335;
+ // aapt resource value: 0x7F090012
+ public const int action_bar_root = 2131296274;
- // aapt resource value: 0x7f090050
- public const int FixedFront = 2131296336;
+ // aapt resource value: 0x7F090013
+ public const int action_bar_spinner = 2131296275;
- // aapt resource value: 0x7f09002a
- public const int META = 2131296298;
+ // aapt resource value: 0x7F090014
+ public const int action_bar_subtitle = 2131296276;
- // aapt resource value: 0x7f090051
- public const int MatchLayout = 2131296337;
+ // aapt resource value: 0x7F090015
+ public const int action_bar_title = 2131296277;
- // aapt resource value: 0x7f09002b
- public const int SHIFT = 2131296299;
+ // aapt resource value: 0x7F090016
+ public const int action_container = 2131296278;
- // aapt resource value: 0x7f090056
- public const int STROKE = 2131296342;
+ // aapt resource value: 0x7F090017
+ public const int action_context_bar = 2131296279;
- // aapt resource value: 0x7f09002c
- public const int SYM = 2131296300;
+ // aapt resource value: 0x7F090018
+ public const int action_divider = 2131296280;
- // aapt resource value: 0x7f090052
- public const int Scale = 2131296338;
+ // aapt resource value: 0x7F090019
+ public const int action_image = 2131296281;
- // aapt resource value: 0x7f090053
- public const int Translate = 2131296339;
+ // aapt resource value: 0x7F09001A
+ public const int action_menu_divider = 2131296282;
- // aapt resource value: 0x7f0900c0
- public const int action0 = 2131296448;
+ // aapt resource value: 0x7F09001B
+ public const int action_menu_presenter = 2131296283;
- // aapt resource value: 0x7f090079
- public const int action_bar = 2131296377;
+ // aapt resource value: 0x7F09001C
+ public const int action_mode_bar = 2131296284;
- // aapt resource value: 0x7f090001
- public const int action_bar_activity_content = 2131296257;
+ // aapt resource value: 0x7F09001D
+ public const int action_mode_bar_stub = 2131296285;
- // aapt resource value: 0x7f090078
- public const int action_bar_container = 2131296376;
+ // aapt resource value: 0x7F09001E
+ public const int action_mode_close_button = 2131296286;
- // aapt resource value: 0x7f090074
- public const int action_bar_root = 2131296372;
+ // aapt resource value: 0x7F09001F
+ public const int action_text = 2131296287;
- // aapt resource value: 0x7f090002
- public const int action_bar_spinner = 2131296258;
+ // aapt resource value: 0x7F090021
+ public const int activity_chooser_view_content = 2131296289;
- // aapt resource value: 0x7f090058
- public const int action_bar_subtitle = 2131296344;
+ // aapt resource value: 0x7F090022
+ public const int add = 2131296290;
- // aapt resource value: 0x7f090057
- public const int action_bar_title = 2131296343;
+ // aapt resource value: 0x7F090023
+ public const int alertTitle = 2131296291;
- // aapt resource value: 0x7f0900bd
- public const int action_container = 2131296445;
+ // aapt resource value: 0x7F090024
+ public const int all = 2131296292;
- // aapt resource value: 0x7f09007a
- public const int action_context_bar = 2131296378;
+ // aapt resource value: 0x7F090000
+ public const int ALT = 2131296256;
- // aapt resource value: 0x7f0900c4
- public const int action_divider = 2131296452;
+ // aapt resource value: 0x7F090025
+ public const int always = 2131296293;
- // aapt resource value: 0x7f0900be
- public const int action_image = 2131296446;
+ // aapt resource value: 0x7F090026
+ public const int async = 2131296294;
- // aapt resource value: 0x7f090003
- public const int action_menu_divider = 2131296259;
+ // aapt resource value: 0x7F090027
+ public const int auto = 2131296295;
- // aapt resource value: 0x7f090004
- public const int action_menu_presenter = 2131296260;
+ // aapt resource value: 0x7F090028
+ public const int beginning = 2131296296;
- // aapt resource value: 0x7f090076
- public const int action_mode_bar = 2131296374;
+ // aapt resource value: 0x7F090029
+ public const int blocking = 2131296297;
- // aapt resource value: 0x7f090075
- public const int action_mode_bar_stub = 2131296373;
+ // aapt resource value: 0x7F09002A
+ public const int bottom = 2131296298;
- // aapt resource value: 0x7f090059
- public const int action_mode_close_button = 2131296345;
+ // aapt resource value: 0x7F09002B
+ public const int btnCancel = 2131296299;
- // aapt resource value: 0x7f0900bf
- public const int action_text = 2131296447;
+ // aapt resource value: 0x7F09002C
+ public const int btnSubmit = 2131296300;
- // aapt resource value: 0x7f0900cd
- public const int actions = 2131296461;
+ // aapt resource value: 0x7F09002D
+ public const int buttonPanel = 2131296301;
- // aapt resource value: 0x7f09005a
- public const int activity_chooser_view_content = 2131296346;
+ // aapt resource value: 0x7F09002E
+ public const int cancel_action = 2131296302;
- // aapt resource value: 0x7f090021
- public const int add = 2131296289;
+ // aapt resource value: 0x7F09002F
+ public const int center = 2131296303;
- // aapt resource value: 0x7f09006d
- public const int alertTitle = 2131296365;
+ // aapt resource value: 0x7F090030
+ public const int center_horizontal = 2131296304;
- // aapt resource value: 0x7f090047
- public const int all = 2131296327;
+ // aapt resource value: 0x7F090031
+ public const int center_vertical = 2131296305;
- // aapt resource value: 0x7f09002d
- public const int always = 2131296301;
+ // aapt resource value: 0x7F090032
+ public const int checkbox = 2131296306;
- // aapt resource value: 0x7f09004b
- public const int async = 2131296331;
+ // aapt resource value: 0x7F090033
+ public const int chronometer = 2131296307;
- // aapt resource value: 0x7f090039
- public const int auto = 2131296313;
+ // aapt resource value: 0x7F090034
+ public const int clip_horizontal = 2131296308;
- // aapt resource value: 0x7f090024
- public const int beginning = 2131296292;
+ // aapt resource value: 0x7F090035
+ public const int clip_vertical = 2131296309;
- // aapt resource value: 0x7f09004c
- public const int blocking = 2131296332;
+ // aapt resource value: 0x7F090036
+ public const int collapseActionView = 2131296310;
- // aapt resource value: 0x7f090032
- public const int bottom = 2131296306;
+ // aapt resource value: 0x7F090037
+ public const int container = 2131296311;
- // aapt resource value: 0x7f0900a8
- public const int btnCancel = 2131296424;
+ // aapt resource value: 0x7F090038
+ public const int contentFrame = 2131296312;
- // aapt resource value: 0x7f0900aa
- public const int btnSubmit = 2131296426;
+ // aapt resource value: 0x7F090039
+ public const int contentPanel = 2131296313;
- // aapt resource value: 0x7f090060
- public const int buttonPanel = 2131296352;
+ // aapt resource value: 0x7F09003A
+ public const int content_container = 2131296314;
- // aapt resource value: 0x7f0900c1
- public const int cancel_action = 2131296449;
+ // aapt resource value: 0x7F09003B
+ public const int coordinator = 2131296315;
- // aapt resource value: 0x7f09003a
- public const int center = 2131296314;
+ // aapt resource value: 0x7F090001
+ public const int CTRL = 2131296257;
- // aapt resource value: 0x7f09003b
- public const int center_horizontal = 2131296315;
+ // aapt resource value: 0x7F09003C
+ public const int custom = 2131296316;
- // aapt resource value: 0x7f09003c
- public const int center_vertical = 2131296316;
+ // aapt resource value: 0x7F09003D
+ public const int customPanel = 2131296317;
- // aapt resource value: 0x7f090070
- public const int checkbox = 2131296368;
+ // aapt resource value: 0x7F09003E
+ public const int day = 2131296318;
- // aapt resource value: 0x7f0900c9
- public const int chronometer = 2131296457;
+ // aapt resource value: 0x7F09003F
+ public const int decor_content_parent = 2131296319;
- // aapt resource value: 0x7f090043
- public const int clip_horizontal = 2131296323;
+ // aapt resource value: 0x7F090040
+ public const int default_activity_button = 2131296320;
- // aapt resource value: 0x7f090044
- public const int clip_vertical = 2131296324;
+ // aapt resource value: 0x7F090041
+ public const int description = 2131296321;
- // aapt resource value: 0x7f09002e
- public const int collapseActionView = 2131296302;
+ // aapt resource value: 0x7F090042
+ public const int design_bottom_sheet = 2131296322;
- // aapt resource value: 0x7f09008e
- public const int container = 2131296398;
+ // aapt resource value: 0x7F090043
+ public const int design_menu_item_action_area = 2131296323;
- // aapt resource value: 0x7f0900d9
- public const int contentFrame = 2131296473;
+ // aapt resource value: 0x7F090044
+ public const int design_menu_item_action_area_stub = 2131296324;
- // aapt resource value: 0x7f090063
- public const int contentPanel = 2131296355;
+ // aapt resource value: 0x7F090045
+ public const int design_menu_item_text = 2131296325;
- // aapt resource value: 0x7f0900ac
- public const int content_container = 2131296428;
+ // aapt resource value: 0x7F090046
+ public const int design_navigation_view = 2131296326;
- // aapt resource value: 0x7f09008f
- public const int coordinator = 2131296399;
+ // aapt resource value: 0x7F090047
+ public const int disableHome = 2131296327;
- // aapt resource value: 0x7f09006a
- public const int custom = 2131296362;
+ // aapt resource value: 0x7F090048
+ public const int edit_query = 2131296328;
- // aapt resource value: 0x7f090069
- public const int customPanel = 2131296361;
+ // aapt resource value: 0x7F090049
+ public const int end = 2131296329;
- // aapt resource value: 0x7f0900b8
- public const int day = 2131296440;
+ // aapt resource value: 0x7F09004A
+ public const int end_padder = 2131296330;
- // aapt resource value: 0x7f090077
- public const int decor_content_parent = 2131296375;
+ // aapt resource value: 0x7F09004B
+ public const int enterAlways = 2131296331;
- // aapt resource value: 0x7f09005d
- public const int default_activity_button = 2131296349;
+ // aapt resource value: 0x7F09004C
+ public const int enterAlwaysCollapsed = 2131296332;
- // aapt resource value: 0x7f090089
- public const int description = 2131296393;
+ // aapt resource value: 0x7F09004D
+ public const int exitUntilCollapsed = 2131296333;
- // aapt resource value: 0x7f090091
- public const int design_bottom_sheet = 2131296401;
+ // aapt resource value: 0x7F09004F
+ public const int expanded_menu = 2131296335;
- // aapt resource value: 0x7f090098
- public const int design_menu_item_action_area = 2131296408;
+ // aapt resource value: 0x7F09004E
+ public const int expand_activities_button = 2131296334;
- // aapt resource value: 0x7f090097
- public const int design_menu_item_action_area_stub = 2131296407;
+ // aapt resource value: 0x7F090050
+ public const int fill = 2131296336;
- // aapt resource value: 0x7f090096
- public const int design_menu_item_text = 2131296406;
+ // aapt resource value: 0x7F090002
+ public const int FILL = 2131296258;
- // aapt resource value: 0x7f090095
- public const int design_navigation_view = 2131296405;
+ // aapt resource value: 0x7F090051
+ public const int fill_horizontal = 2131296337;
- // aapt resource value: 0x7f090015
- public const int disableHome = 2131296277;
+ // aapt resource value: 0x7F090003
+ public const int FILL_STROKE = 2131296259;
- // aapt resource value: 0x7f09007b
- public const int edit_query = 2131296379;
+ // aapt resource value: 0x7F090052
+ public const int fill_vertical = 2131296338;
- // aapt resource value: 0x7f090025
- public const int end = 2131296293;
+ // aapt resource value: 0x7F090053
+ public const int fingerprint_icon = 2131296339;
- // aapt resource value: 0x7f0900cf
- public const int end_padder = 2131296463;
+ // aapt resource value: 0x7F090054
+ public const int @fixed = 2131296340;
- // aapt resource value: 0x7f090034
- public const int enterAlways = 2131296308;
+ // aapt resource value: 0x7F090005
+ public const int FixedBehind = 2131296261;
- // aapt resource value: 0x7f090035
- public const int enterAlwaysCollapsed = 2131296309;
+ // aapt resource value: 0x7F090006
+ public const int FixedFront = 2131296262;
- // aapt resource value: 0x7f090036
- public const int exitUntilCollapsed = 2131296310;
+ // aapt resource value: 0x7F090055
+ public const int forever = 2131296341;
- // aapt resource value: 0x7f09005b
- public const int expand_activities_button = 2131296347;
+ // aapt resource value: 0x7F090004
+ public const int FUNCTION = 2131296260;
- // aapt resource value: 0x7f09006f
- public const int expanded_menu = 2131296367;
+ // aapt resource value: 0x7F090056
+ public const int gd_btn_back = 2131296342;
- // aapt resource value: 0x7f090045
- public const int fill = 2131296325;
+ // aapt resource value: 0x7F090057
+ public const int gd_btn_myLocation = 2131296343;
- // aapt resource value: 0x7f090046
- public const int fill_horizontal = 2131296326;
+ // aapt resource value: 0x7F090058
+ public const int gd_btn_save = 2131296344;
- // aapt resource value: 0x7f09003d
- public const int fill_vertical = 2131296317;
+ // aapt resource value: 0x7F090059
+ public const int gd_img_search_delete = 2131296345;
- // aapt resource value: 0x7f09008a
- public const int fingerprint_icon = 2131296394;
+ // aapt resource value: 0x7F09005A
+ public const int gd_ll_myhome = 2131296346;
- // aapt resource value: 0x7f090049
- public const int @fixed = 2131296329;
+ // aapt resource value: 0x7F09005B
+ public const int gd_ll_search = 2131296347;
- // aapt resource value: 0x7f09004d
- public const int forever = 2131296333;
+ // aapt resource value: 0x7F09005C
+ public const int gd_mapView = 2131296348;
- // aapt resource value: 0x7f09009d
- public const int gd_btn_back = 2131296413;
+ // aapt resource value: 0x7F09005D
+ public const int gd_rl_topview = 2131296349;
- // aapt resource value: 0x7f0900a6
- public const int gd_btn_myLocation = 2131296422;
+ // aapt resource value: 0x7F09005E
+ public const int gd_tv_activity_title = 2131296350;
- // aapt resource value: 0x7f0900a5
- public const int gd_btn_save = 2131296421;
+ // aapt resource value: 0x7F09005F
+ public const int gd_tv_radius = 2131296351;
- // aapt resource value: 0x7f0900a2
- public const int gd_img_search_delete = 2131296418;
+ // aapt resource value: 0x7F090060
+ public const int gd_tv_search_title = 2131296352;
- // aapt resource value: 0x7f0900a4
- public const int gd_ll_myhome = 2131296420;
+ // aapt resource value: 0x7F090061
+ public const int hdl_gallery_rootView = 2131296353;
- // aapt resource value: 0x7f0900a0
- public const int gd_ll_search = 2131296416;
+ // aapt resource value: 0x7F090062
+ public const int hdl_gallery_viewPager = 2131296354;
- // aapt resource value: 0x7f09009f
- public const int gd_mapView = 2131296415;
+ // aapt resource value: 0x7F090063
+ public const int hdl_options1 = 2131296355;
- // aapt resource value: 0x7f09009c
- public const int gd_rl_topview = 2131296412;
+ // aapt resource value: 0x7F090064
+ public const int hdl_options2 = 2131296356;
- // aapt resource value: 0x7f09009e
- public const int gd_tv_activity_title = 2131296414;
+ // aapt resource value: 0x7F090065
+ public const int hdl_options3 = 2131296357;
- // aapt resource value: 0x7f0900a3
- public const int gd_tv_radius = 2131296419;
+ // aapt resource value: 0x7F090066
+ public const int hdl_pickerview_ll = 2131296358;
- // aapt resource value: 0x7f0900a1
- public const int gd_tv_search_title = 2131296417;
+ // aapt resource value: 0x7F090067
+ public const int home = 2131296359;
- // aapt resource value: 0x7f09009a
- public const int hdl_gallery_rootView = 2131296410;
+ // aapt resource value: 0x7F090068
+ public const int homeAsUp = 2131296360;
- // aapt resource value: 0x7f09009b
- public const int hdl_gallery_viewPager = 2131296411;
+ // aapt resource value: 0x7F090069
+ public const int hour = 2131296361;
- // aapt resource value: 0x7f0900ae
- public const int hdl_options1 = 2131296430;
+ // aapt resource value: 0x7F09006A
+ public const int icon = 2131296362;
- // aapt resource value: 0x7f0900af
- public const int hdl_options2 = 2131296431;
-
- // aapt resource value: 0x7f0900b0
- public const int hdl_options3 = 2131296432;
+ // aapt resource value: 0x7F09006B
+ public const int icon_group = 2131296363;
- // aapt resource value: 0x7f0900ad
- public const int hdl_pickerview_ll = 2131296429;
+ // aapt resource value: 0x7F09006C
+ public const int ifRoom = 2131296364;
- // aapt resource value: 0x7f090005
- public const int home = 2131296261;
+ // aapt resource value: 0x7F09006D
+ public const int image = 2131296365;
- // aapt resource value: 0x7f090016
- public const int homeAsUp = 2131296278;
+ // aapt resource value: 0x7F09006E
+ public const int info = 2131296366;
- // aapt resource value: 0x7f0900b9
- public const int hour = 2131296441;
+ // aapt resource value: 0x7F09006F
+ public const int italic = 2131296367;
- // aapt resource value: 0x7f09005f
- public const int icon = 2131296351;
+ // aapt resource value: 0x7F090070
+ public const int item_touch_helper_previous_elevation = 2131296368;
- // aapt resource value: 0x7f0900ce
- public const int icon_group = 2131296462;
+ // aapt resource value: 0x7F090071
+ public const int largeLabel = 2131296369;
- // aapt resource value: 0x7f09002f
- public const int ifRoom = 2131296303;
+ // aapt resource value: 0x7F090072
+ public const int left = 2131296370;
- // aapt resource value: 0x7f09005c
- public const int image = 2131296348;
+ // aapt resource value: 0x7F090073
+ public const int line1 = 2131296371;
- // aapt resource value: 0x7f0900ca
- public const int info = 2131296458;
+ // aapt resource value: 0x7F090074
+ public const int line3 = 2131296372;
- // aapt resource value: 0x7f09004e
- public const int italic = 2131296334;
+ // aapt resource value: 0x7F090075
+ public const int listMode = 2131296373;
- // aapt resource value: 0x7f090000
- public const int item_touch_helper_previous_elevation = 2131296256;
+ // aapt resource value: 0x7F090076
+ public const int list_item = 2131296374;
- // aapt resource value: 0x7f09008d
- public const int largeLabel = 2131296397;
+ // aapt resource value: 0x7F090077
+ public const int masked = 2131296375;
- // aapt resource value: 0x7f09003e
- public const int left = 2131296318;
+ // aapt resource value: 0x7F090008
+ public const int MatchLayout = 2131296264;
- // aapt resource value: 0x7f09000d
- public const int line1 = 2131296269;
+ // aapt resource value: 0x7F090078
+ public const int media_actions = 2131296376;
- // aapt resource value: 0x7f09000e
- public const int line3 = 2131296270;
+ // aapt resource value: 0x7F090079
+ public const int message = 2131296377;
- // aapt resource value: 0x7f090012
- public const int listMode = 2131296274;
+ // aapt resource value: 0x7F090007
+ public const int META = 2131296263;
- // aapt resource value: 0x7f09005e
- public const int list_item = 2131296350;
+ // aapt resource value: 0x7F09007A
+ public const int middle = 2131296378;
- // aapt resource value: 0x7f0900db
- public const int masked = 2131296475;
+ // aapt resource value: 0x7F09007B
+ public const int min = 2131296379;
- // aapt resource value: 0x7f0900c3
- public const int media_actions = 2131296451;
+ // aapt resource value: 0x7F09007C
+ public const int mini = 2131296380;
- // aapt resource value: 0x7f0900d5
- public const int message = 2131296469;
+ // aapt resource value: 0x7F09007D
+ public const int month = 2131296381;
- // aapt resource value: 0x7f090026
- public const int middle = 2131296294;
+ // aapt resource value: 0x7F09007E
+ public const int multiply = 2131296382;
- // aapt resource value: 0x7f0900ba
- public const int min = 2131296442;
+ // aapt resource value: 0x7F09007F
+ public const int myButton = 2131296383;
- // aapt resource value: 0x7f090048
- public const int mini = 2131296328;
+ // aapt resource value: 0x7F090080
+ public const int navigation_header_container = 2131296384;
- // aapt resource value: 0x7f0900b7
- public const int month = 2131296439;
+ // aapt resource value: 0x7F090081
+ public const int never = 2131296385;
- // aapt resource value: 0x7f09001c
- public const int multiply = 2131296284;
+ // aapt resource value: 0x7F090082
+ public const int none = 2131296386;
- // aapt resource value: 0x7f0900bc
- public const int myButton = 2131296444;
+ // aapt resource value: 0x7F090083
+ public const int normal = 2131296387;
- // aapt resource value: 0x7f090094
- public const int navigation_header_container = 2131296404;
+ // aapt resource value: 0x7F090084
+ public const int notification_background = 2131296388;
- // aapt resource value: 0x7f090030
- public const int never = 2131296304;
+ // aapt resource value: 0x7F090085
+ public const int notification_main_column = 2131296389;
- // aapt resource value: 0x7f090017
- public const int none = 2131296279;
+ // aapt resource value: 0x7F090086
+ public const int notification_main_column_container = 2131296390;
- // aapt resource value: 0x7f090013
- public const int normal = 2131296275;
+ // aapt resource value: 0x7F090087
+ public const int options1 = 2131296391;
- // aapt resource value: 0x7f0900cc
- public const int notification_background = 2131296460;
+ // aapt resource value: 0x7F090088
+ public const int options2 = 2131296392;
- // aapt resource value: 0x7f0900c6
- public const int notification_main_column = 2131296454;
+ // aapt resource value: 0x7F090089
+ public const int options3 = 2131296393;
- // aapt resource value: 0x7f0900c5
- public const int notification_main_column_container = 2131296453;
+ // aapt resource value: 0x7F09008A
+ public const int optionspicker = 2131296394;
- // aapt resource value: 0x7f0900b2
- public const int options1 = 2131296434;
+ // aapt resource value: 0x7F09008B
+ public const int outmost_container = 2131296395;
- // aapt resource value: 0x7f0900b3
- public const int options2 = 2131296435;
+ // aapt resource value: 0x7F09008C
+ public const int parallax = 2131296396;
- // aapt resource value: 0x7f0900b4
- public const int options3 = 2131296436;
+ // aapt resource value: 0x7F09008D
+ public const int parentPanel = 2131296397;
- // aapt resource value: 0x7f0900b1
- public const int optionspicker = 2131296433;
+ // aapt resource value: 0x7F09008E
+ public const int pin = 2131296398;
- // aapt resource value: 0x7f0900ab
- public const int outmost_container = 2131296427;
+ // aapt resource value: 0x7F09008F
+ public const int progress_circular = 2131296399;
- // aapt resource value: 0x7f090041
- public const int parallax = 2131296321;
+ // aapt resource value: 0x7F090090
+ public const int progress_horizontal = 2131296400;
- // aapt resource value: 0x7f090062
- public const int parentPanel = 2131296354;
+ // aapt resource value: 0x7F090091
+ public const int radio = 2131296401;
- // aapt resource value: 0x7f090042
- public const int pin = 2131296322;
+ // aapt resource value: 0x7F090092
+ public const int right = 2131296402;
- // aapt resource value: 0x7f090006
- public const int progress_circular = 2131296262;
+ // aapt resource value: 0x7F090093
+ public const int right_icon = 2131296403;
- // aapt resource value: 0x7f090007
- public const int progress_horizontal = 2131296263;
+ // aapt resource value: 0x7F090094
+ public const int right_side = 2131296404;
- // aapt resource value: 0x7f090072
- public const int radio = 2131296370;
+ // aapt resource value: 0x7F090095
+ public const int rv_topbar = 2131296405;
- // aapt resource value: 0x7f09003f
- public const int right = 2131296319;
+ // aapt resource value: 0x7F09000C
+ public const int Scale = 2131296268;
- // aapt resource value: 0x7f0900cb
- public const int right_icon = 2131296459;
+ // aapt resource value: 0x7F090096
+ public const int screen = 2131296406;
- // aapt resource value: 0x7f0900c7
- public const int right_side = 2131296455;
+ // aapt resource value: 0x7F090097
+ public const int scroll = 2131296407;
- // aapt resource value: 0x7f0900a7
- public const int rv_topbar = 2131296423;
+ // aapt resource value: 0x7F09009B
+ public const int scrollable = 2131296411;
- // aapt resource value: 0x7f09001d
- public const int screen = 2131296285;
+ // aapt resource value: 0x7F090098
+ public const int scrollIndicatorDown = 2131296408;
- // aapt resource value: 0x7f090037
- public const int scroll = 2131296311;
+ // aapt resource value: 0x7F090099
+ public const int scrollIndicatorUp = 2131296409;
- // aapt resource value: 0x7f090068
- public const int scrollIndicatorDown = 2131296360;
+ // aapt resource value: 0x7F09009A
+ public const int scrollView = 2131296410;
- // aapt resource value: 0x7f090064
- public const int scrollIndicatorUp = 2131296356;
+ // aapt resource value: 0x7F09009C
+ public const int search_badge = 2131296412;
- // aapt resource value: 0x7f090065
- public const int scrollView = 2131296357;
+ // aapt resource value: 0x7F09009D
+ public const int search_bar = 2131296413;
- // aapt resource value: 0x7f09004a
- public const int scrollable = 2131296330;
+ // aapt resource value: 0x7F09009E
+ public const int search_button = 2131296414;
- // aapt resource value: 0x7f09007d
- public const int search_badge = 2131296381;
+ // aapt resource value: 0x7F09009F
+ public const int search_close_btn = 2131296415;
- // aapt resource value: 0x7f09007c
- public const int search_bar = 2131296380;
+ // aapt resource value: 0x7F0900A0
+ public const int search_edit_frame = 2131296416;
- // aapt resource value: 0x7f09007e
- public const int search_button = 2131296382;
+ // aapt resource value: 0x7F0900A1
+ public const int search_go_btn = 2131296417;
- // aapt resource value: 0x7f090083
- public const int search_close_btn = 2131296387;
+ // aapt resource value: 0x7F0900A2
+ public const int search_mag_icon = 2131296418;
- // aapt resource value: 0x7f09007f
- public const int search_edit_frame = 2131296383;
+ // aapt resource value: 0x7F0900A3
+ public const int search_plate = 2131296419;
- // aapt resource value: 0x7f090085
- public const int search_go_btn = 2131296389;
+ // aapt resource value: 0x7F0900A4
+ public const int search_src_text = 2131296420;
- // aapt resource value: 0x7f090080
- public const int search_mag_icon = 2131296384;
+ // aapt resource value: 0x7F0900A5
+ public const int search_voice_btn = 2131296421;
- // aapt resource value: 0x7f090081
- public const int search_plate = 2131296385;
+ // aapt resource value: 0x7F0900A6
+ public const int second = 2131296422;
- // aapt resource value: 0x7f090082
- public const int search_src_text = 2131296386;
+ // aapt resource value: 0x7F0900A7
+ public const int select_dialog_listview = 2131296423;
- // aapt resource value: 0x7f090086
- public const int search_voice_btn = 2131296390;
+ // aapt resource value: 0x7F090009
+ public const int SHIFT = 2131296265;
- // aapt resource value: 0x7f0900bb
- public const int second = 2131296443;
+ // aapt resource value: 0x7F0900A8
+ public const int shortcut = 2131296424;
- // aapt resource value: 0x7f090087
- public const int select_dialog_listview = 2131296391;
+ // aapt resource value: 0x7F0900A9
+ public const int showCustom = 2131296425;
- // aapt resource value: 0x7f090071
- public const int shortcut = 2131296369;
+ // aapt resource value: 0x7F0900AA
+ public const int showHome = 2131296426;
- // aapt resource value: 0x7f090018
- public const int showCustom = 2131296280;
+ // aapt resource value: 0x7F0900AB
+ public const int showTitle = 2131296427;
- // aapt resource value: 0x7f090019
- public const int showHome = 2131296281;
+ // aapt resource value: 0x7F0900AC
+ public const int smallLabel = 2131296428;
- // aapt resource value: 0x7f09001a
- public const int showTitle = 2131296282;
+ // aapt resource value: 0x7F0900AD
+ public const int snackbar_action = 2131296429;
- // aapt resource value: 0x7f09008c
- public const int smallLabel = 2131296396;
+ // aapt resource value: 0x7F0900AE
+ public const int snackbar_text = 2131296430;
- // aapt resource value: 0x7f090093
- public const int snackbar_action = 2131296403;
+ // aapt resource value: 0x7F0900AF
+ public const int snap = 2131296431;
- // aapt resource value: 0x7f090092
- public const int snackbar_text = 2131296402;
+ // aapt resource value: 0x7F0900B0
+ public const int spacer = 2131296432;
- // aapt resource value: 0x7f090038
- public const int snap = 2131296312;
+ // aapt resource value: 0x7F0900B1
+ public const int split_action_bar = 2131296433;
- // aapt resource value: 0x7f090061
- public const int spacer = 2131296353;
+ // aapt resource value: 0x7F0900B2
+ public const int src_atop = 2131296434;
- // aapt resource value: 0x7f090008
- public const int split_action_bar = 2131296264;
+ // aapt resource value: 0x7F0900B3
+ public const int src_in = 2131296435;
- // aapt resource value: 0x7f09001e
- public const int src_atop = 2131296286;
+ // aapt resource value: 0x7F0900B4
+ public const int src_over = 2131296436;
- // aapt resource value: 0x7f09001f
- public const int src_in = 2131296287;
+ // aapt resource value: 0x7F0900B5
+ public const int srl_classics_arrow = 2131296437;
- // aapt resource value: 0x7f090020
- public const int src_over = 2131296288;
+ // aapt resource value: 0x7F0900B6
+ public const int srl_classics_center = 2131296438;
- // aapt resource value: 0x7f0900d0
- public const int srl_classics_arrow = 2131296464;
+ // aapt resource value: 0x7F0900B7
+ public const int srl_classics_progress = 2131296439;
- // aapt resource value: 0x7f0900d3
- public const int srl_classics_center = 2131296467;
+ // aapt resource value: 0x7F0900B8
+ public const int srl_classics_title = 2131296440;
- // aapt resource value: 0x7f0900d2
- public const int srl_classics_progress = 2131296466;
+ // aapt resource value: 0x7F0900B9
+ public const int srl_classics_update = 2131296441;
- // aapt resource value: 0x7f0900d1
- public const int srl_classics_title = 2131296465;
+ // aapt resource value: 0x7F0900BA
+ public const int start = 2131296442;
- // aapt resource value: 0x7f0900d4
- public const int srl_classics_update = 2131296468;
+ // aapt resource value: 0x7F0900BB
+ public const int status = 2131296443;
- // aapt resource value: 0x7f090040
- public const int start = 2131296320;
+ // aapt resource value: 0x7F0900BC
+ public const int status_bar_latest_event_content = 2131296444;
- // aapt resource value: 0x7f09008b
- public const int status = 2131296395;
+ // aapt resource value: 0x7F09000A
+ public const int STROKE = 2131296266;
- // aapt resource value: 0x7f0900c2
- public const int status_bar_latest_event_content = 2131296450;
+ // aapt resource value: 0x7F0900BD
+ public const int submenuarrow = 2131296445;
- // aapt resource value: 0x7f090073
- public const int submenuarrow = 2131296371;
+ // aapt resource value: 0x7F0900BE
+ public const int submit_area = 2131296446;
- // aapt resource value: 0x7f090084
- public const int submit_area = 2131296388;
+ // aapt resource value: 0x7F0900BF
+ public const int subtitle = 2131296447;
- // aapt resource value: 0x7f090088
- public const int subtitle = 2131296392;
+ // aapt resource value: 0x7F09000B
+ public const int SYM = 2131296267;
- // aapt resource value: 0x7f090014
- public const int tabMode = 2131296276;
+ // aapt resource value: 0x7F0900C0
+ public const int tabMode = 2131296448;
- // aapt resource value: 0x7f09000f
- public const int text = 2131296271;
+ // aapt resource value: 0x7F0900C1
+ public const int text = 2131296449;
- // aapt resource value: 0x7f090010
- public const int text2 = 2131296272;
+ // aapt resource value: 0x7F0900C2
+ public const int text2 = 2131296450;
- // aapt resource value: 0x7f090067
- public const int textSpacerNoButtons = 2131296359;
+ // aapt resource value: 0x7F0900C6
+ public const int textinput_counter = 2131296454;
- // aapt resource value: 0x7f090066
- public const int textSpacerNoTitle = 2131296358;
+ // aapt resource value: 0x7F0900C7
+ public const int textinput_error = 2131296455;
- // aapt resource value: 0x7f090099
- public const int text_input_password_toggle = 2131296409;
+ // aapt resource value: 0x7F0900C3
+ public const int textSpacerNoButtons = 2131296451;
- // aapt resource value: 0x7f09000a
- public const int textinput_counter = 2131296266;
+ // aapt resource value: 0x7F0900C4
+ public const int textSpacerNoTitle = 2131296452;
- // aapt resource value: 0x7f09000b
- public const int textinput_error = 2131296267;
+ // aapt resource value: 0x7F0900C5
+ public const int text_input_password_toggle = 2131296453;
- // aapt resource value: 0x7f0900c8
+ // aapt resource value: 0x7F0900C8
public const int time = 2131296456;
- // aapt resource value: 0x7f0900b5
- public const int timepicker = 2131296437;
+ // aapt resource value: 0x7F0900C9
+ public const int timepicker = 2131296457;
- // aapt resource value: 0x7f090011
- public const int title = 2131296273;
+ // aapt resource value: 0x7F0900CA
+ public const int title = 2131296458;
- // aapt resource value: 0x7f09006e
- public const int titleDividerNoCustom = 2131296366;
+ // aapt resource value: 0x7F0900CB
+ public const int titleDividerNoCustom = 2131296459;
- // aapt resource value: 0x7f09006c
- public const int title_template = 2131296364;
+ // aapt resource value: 0x7F0900CC
+ public const int title_template = 2131296460;
- // aapt resource value: 0x7f090033
- public const int top = 2131296307;
+ // aapt resource value: 0x7F0900CD
+ public const int top = 2131296461;
- // aapt resource value: 0x7f09006b
- public const int topPanel = 2131296363;
+ // aapt resource value: 0x7F0900CE
+ public const int topPanel = 2131296462;
- // aapt resource value: 0x7f090090
- public const int touch_outside = 2131296400;
+ // aapt resource value: 0x7F0900CF
+ public const int touch_outside = 2131296463;
- // aapt resource value: 0x7f0900a9
- public const int tvTitle = 2131296425;
+ // aapt resource value: 0x7F09000D
+ public const int Translate = 2131296269;
- // aapt resource value: 0x7f0900d7
- public const int tv_zxing_back = 2131296471;
+ // aapt resource value: 0x7F0900D0
+ public const int tvTitle = 2131296464;
- // aapt resource value: 0x7f0900d8
- public const int tv_zxing_flash = 2131296472;
+ // aapt resource value: 0x7F0900D1
+ public const int tv_zxing_back = 2131296465;
- // aapt resource value: 0x7f0900d6
- public const int tv_zxing_scan = 2131296470;
+ // aapt resource value: 0x7F0900D2
+ public const int tv_zxing_flash = 2131296466;
- // aapt resource value: 0x7f090022
- public const int uniform = 2131296290;
+ // aapt resource value: 0x7F0900D3
+ public const int tv_zxing_scan = 2131296467;
- // aapt resource value: 0x7f090009
- public const int up = 2131296265;
+ // aapt resource value: 0x7F0900D4
+ public const int uniform = 2131296468;
- // aapt resource value: 0x7f09001b
- public const int useLogo = 2131296283;
+ // aapt resource value: 0x7F0900D5
+ public const int up = 2131296469;
- // aapt resource value: 0x7f09000c
- public const int view_offset_helper = 2131296268;
+ // aapt resource value: 0x7F0900D6
+ public const int useLogo = 2131296470;
- // aapt resource value: 0x7f0900da
- public const int visible = 2131296474;
+ // aapt resource value: 0x7F0900D7
+ public const int view_offset_helper = 2131296471;
- // aapt resource value: 0x7f090031
- public const int withText = 2131296305;
+ // aapt resource value: 0x7F0900D8
+ public const int visible = 2131296472;
- // aapt resource value: 0x7f090023
- public const int wrap_content = 2131296291;
+ // aapt resource value: 0x7F0900D9
+ public const int withText = 2131296473;
- // aapt resource value: 0x7f0900b6
- public const int year = 2131296438;
+ // aapt resource value: 0x7F0900DA
+ public const int wrap_content = 2131296474;
+
+ // aapt resource value: 0x7F0900DB
+ public const int year = 2131296475;
static Id()
{
@@ -3670,38 +3652,38 @@
public partial class Integer
{
- // aapt resource value: 0x7f0e0000
- public const int abc_config_activityDefaultDur = 2131623936;
+ // aapt resource value: 0x7F0A0000
+ public const int abc_config_activityDefaultDur = 2131361792;
- // aapt resource value: 0x7f0e0001
- public const int abc_config_activityShortDur = 2131623937;
+ // aapt resource value: 0x7F0A0001
+ public const int abc_config_activityShortDur = 2131361793;
- // aapt resource value: 0x7f0e000a
- public const int animation_default_duration = 2131623946;
+ // aapt resource value: 0x7F0A0002
+ public const int animation_default_duration = 2131361794;
- // aapt resource value: 0x7f0e0005
- public const int app_bar_elevation_anim_duration = 2131623941;
+ // aapt resource value: 0x7F0A0003
+ public const int app_bar_elevation_anim_duration = 2131361795;
- // aapt resource value: 0x7f0e0006
- public const int bottom_sheet_slide_duration = 2131623942;
+ // aapt resource value: 0x7F0A0004
+ public const int bottom_sheet_slide_duration = 2131361796;
- // aapt resource value: 0x7f0e0002
- public const int cancel_button_image_alpha = 2131623938;
+ // aapt resource value: 0x7F0A0005
+ public const int cancel_button_image_alpha = 2131361797;
- // aapt resource value: 0x7f0e0003
- public const int config_tooltipAnimTime = 2131623939;
+ // aapt resource value: 0x7F0A0006
+ public const int config_tooltipAnimTime = 2131361798;
- // aapt resource value: 0x7f0e0004
- public const int design_snackbar_text_max_lines = 2131623940;
+ // aapt resource value: 0x7F0A0007
+ public const int design_snackbar_text_max_lines = 2131361799;
- // aapt resource value: 0x7f0e0007
- public const int hide_password_duration = 2131623943;
+ // aapt resource value: 0x7F0A0008
+ public const int hide_password_duration = 2131361800;
- // aapt resource value: 0x7f0e0008
- public const int show_password_duration = 2131623944;
+ // aapt resource value: 0x7F0A0009
+ public const int show_password_duration = 2131361801;
- // aapt resource value: 0x7f0e0009
- public const int status_bar_notification_info_maxnum = 2131623945;
+ // aapt resource value: 0x7F0A000A
+ public const int status_bar_notification_info_maxnum = 2131361802;
static Integer()
{
@@ -3716,236 +3698,236 @@
public partial class Layout
{
- // aapt resource value: 0x7f040000
- public const int abc_action_bar_title_item = 2130968576;
+ // aapt resource value: 0x7F0B0000
+ public const int abc_action_bar_title_item = 2131427328;
- // aapt resource value: 0x7f040001
- public const int abc_action_bar_up_container = 2130968577;
+ // aapt resource value: 0x7F0B0001
+ public const int abc_action_bar_up_container = 2131427329;
- // aapt resource value: 0x7f040002
- public const int abc_action_bar_view_list_nav_layout = 2130968578;
+ // aapt resource value: 0x7F0B0002
+ public const int abc_action_bar_view_list_nav_layout = 2131427330;
- // aapt resource value: 0x7f040003
- public const int abc_action_menu_item_layout = 2130968579;
+ // aapt resource value: 0x7F0B0003
+ public const int abc_action_menu_item_layout = 2131427331;
- // aapt resource value: 0x7f040004
- public const int abc_action_menu_layout = 2130968580;
+ // aapt resource value: 0x7F0B0004
+ public const int abc_action_menu_layout = 2131427332;
- // aapt resource value: 0x7f040005
- public const int abc_action_mode_bar = 2130968581;
+ // aapt resource value: 0x7F0B0005
+ public const int abc_action_mode_bar = 2131427333;
- // aapt resource value: 0x7f040006
- public const int abc_action_mode_close_item_material = 2130968582;
+ // aapt resource value: 0x7F0B0006
+ public const int abc_action_mode_close_item_material = 2131427334;
- // aapt resource value: 0x7f040007
- public const int abc_activity_chooser_view = 2130968583;
+ // aapt resource value: 0x7F0B0007
+ public const int abc_activity_chooser_view = 2131427335;
- // aapt resource value: 0x7f040008
- public const int abc_activity_chooser_view_list_item = 2130968584;
+ // aapt resource value: 0x7F0B0008
+ public const int abc_activity_chooser_view_list_item = 2131427336;
- // aapt resource value: 0x7f040009
- public const int abc_alert_dialog_button_bar_material = 2130968585;
+ // aapt resource value: 0x7F0B0009
+ public const int abc_alert_dialog_button_bar_material = 2131427337;
- // aapt resource value: 0x7f04000a
- public const int abc_alert_dialog_material = 2130968586;
+ // aapt resource value: 0x7F0B000A
+ public const int abc_alert_dialog_material = 2131427338;
- // aapt resource value: 0x7f04000b
- public const int abc_alert_dialog_title_material = 2130968587;
+ // aapt resource value: 0x7F0B000B
+ public const int abc_alert_dialog_title_material = 2131427339;
- // aapt resource value: 0x7f04000c
- public const int abc_dialog_title_material = 2130968588;
+ // aapt resource value: 0x7F0B000C
+ public const int abc_dialog_title_material = 2131427340;
- // aapt resource value: 0x7f04000d
- public const int abc_expanded_menu_layout = 2130968589;
+ // aapt resource value: 0x7F0B000D
+ public const int abc_expanded_menu_layout = 2131427341;
- // aapt resource value: 0x7f04000e
- public const int abc_list_menu_item_checkbox = 2130968590;
+ // aapt resource value: 0x7F0B000E
+ public const int abc_list_menu_item_checkbox = 2131427342;
- // aapt resource value: 0x7f04000f
- public const int abc_list_menu_item_icon = 2130968591;
+ // aapt resource value: 0x7F0B000F
+ public const int abc_list_menu_item_icon = 2131427343;
- // aapt resource value: 0x7f040010
- public const int abc_list_menu_item_layout = 2130968592;
+ // aapt resource value: 0x7F0B0010
+ public const int abc_list_menu_item_layout = 2131427344;
- // aapt resource value: 0x7f040011
- public const int abc_list_menu_item_radio = 2130968593;
+ // aapt resource value: 0x7F0B0011
+ public const int abc_list_menu_item_radio = 2131427345;
- // aapt resource value: 0x7f040012
- public const int abc_popup_menu_header_item_layout = 2130968594;
+ // aapt resource value: 0x7F0B0012
+ public const int abc_popup_menu_header_item_layout = 2131427346;
- // aapt resource value: 0x7f040013
- public const int abc_popup_menu_item_layout = 2130968595;
+ // aapt resource value: 0x7F0B0013
+ public const int abc_popup_menu_item_layout = 2131427347;
- // aapt resource value: 0x7f040014
- public const int abc_screen_content_include = 2130968596;
+ // aapt resource value: 0x7F0B0014
+ public const int abc_screen_content_include = 2131427348;
- // aapt resource value: 0x7f040015
- public const int abc_screen_simple = 2130968597;
+ // aapt resource value: 0x7F0B0015
+ public const int abc_screen_simple = 2131427349;
- // aapt resource value: 0x7f040016
- public const int abc_screen_simple_overlay_action_mode = 2130968598;
+ // aapt resource value: 0x7F0B0016
+ public const int abc_screen_simple_overlay_action_mode = 2131427350;
- // aapt resource value: 0x7f040017
- public const int abc_screen_toolbar = 2130968599;
+ // aapt resource value: 0x7F0B0017
+ public const int abc_screen_toolbar = 2131427351;
- // aapt resource value: 0x7f040018
- public const int abc_search_dropdown_item_icons_2line = 2130968600;
+ // aapt resource value: 0x7F0B0018
+ public const int abc_search_dropdown_item_icons_2line = 2131427352;
- // aapt resource value: 0x7f040019
- public const int abc_search_view = 2130968601;
+ // aapt resource value: 0x7F0B0019
+ public const int abc_search_view = 2131427353;
- // aapt resource value: 0x7f04001a
- public const int abc_select_dialog_material = 2130968602;
+ // aapt resource value: 0x7F0B001A
+ public const int abc_select_dialog_material = 2131427354;
- // aapt resource value: 0x7f04001b
- public const int biometric_prompt_dialog_content = 2130968603;
+ // aapt resource value: 0x7F0B001B
+ public const int biometric_prompt_dialog_content = 2131427355;
- // aapt resource value: 0x7f04001c
- public const int design_bottom_navigation_item = 2130968604;
+ // aapt resource value: 0x7F0B001C
+ public const int design_bottom_navigation_item = 2131427356;
- // aapt resource value: 0x7f04001d
- public const int design_bottom_sheet_dialog = 2130968605;
+ // aapt resource value: 0x7F0B001D
+ public const int design_bottom_sheet_dialog = 2131427357;
- // aapt resource value: 0x7f04001e
- public const int design_layout_snackbar = 2130968606;
+ // aapt resource value: 0x7F0B001E
+ public const int design_layout_snackbar = 2131427358;
- // aapt resource value: 0x7f04001f
- public const int design_layout_snackbar_include = 2130968607;
+ // aapt resource value: 0x7F0B001F
+ public const int design_layout_snackbar_include = 2131427359;
- // aapt resource value: 0x7f040020
- public const int design_layout_tab_icon = 2130968608;
+ // aapt resource value: 0x7F0B0020
+ public const int design_layout_tab_icon = 2131427360;
- // aapt resource value: 0x7f040021
- public const int design_layout_tab_text = 2130968609;
+ // aapt resource value: 0x7F0B0021
+ public const int design_layout_tab_text = 2131427361;
- // aapt resource value: 0x7f040022
- public const int design_menu_item_action_area = 2130968610;
+ // aapt resource value: 0x7F0B0022
+ public const int design_menu_item_action_area = 2131427362;
- // aapt resource value: 0x7f040023
- public const int design_navigation_item = 2130968611;
+ // aapt resource value: 0x7F0B0023
+ public const int design_navigation_item = 2131427363;
- // aapt resource value: 0x7f040024
- public const int design_navigation_item_header = 2130968612;
+ // aapt resource value: 0x7F0B0024
+ public const int design_navigation_item_header = 2131427364;
- // aapt resource value: 0x7f040025
- public const int design_navigation_item_separator = 2130968613;
+ // aapt resource value: 0x7F0B0025
+ public const int design_navigation_item_separator = 2131427365;
- // aapt resource value: 0x7f040026
- public const int design_navigation_item_subheader = 2130968614;
+ // aapt resource value: 0x7F0B0026
+ public const int design_navigation_item_subheader = 2131427366;
- // aapt resource value: 0x7f040027
- public const int design_navigation_menu = 2130968615;
+ // aapt resource value: 0x7F0B0027
+ public const int design_navigation_menu = 2131427367;
- // aapt resource value: 0x7f040028
- public const int design_navigation_menu_item = 2130968616;
+ // aapt resource value: 0x7F0B0028
+ public const int design_navigation_menu_item = 2131427368;
- // aapt resource value: 0x7f040029
- public const int design_text_input_password_icon = 2130968617;
+ // aapt resource value: 0x7F0B0029
+ public const int design_text_input_password_icon = 2131427369;
- // aapt resource value: 0x7f04002a
- public const int hdl_gallery_banner_view_layout = 2130968618;
+ // aapt resource value: 0x7F0B002A
+ public const int hdl_gallery_banner_view_layout = 2131427370;
- // aapt resource value: 0x7f04002b
- public const int hdl_widget_activity_crop_image = 2130968619;
+ // aapt resource value: 0x7F0B002B
+ public const int hdl_widget_activity_crop_image = 2131427371;
- // aapt resource value: 0x7f04002c
- public const int hdl_widget_activity_geofence_round = 2130968620;
+ // aapt resource value: 0x7F0B002C
+ public const int hdl_widget_activity_geofence_round = 2131427372;
- // aapt resource value: 0x7f04002d
- public const int hdl_widget_air_button = 2130968621;
+ // aapt resource value: 0x7F0B002D
+ public const int hdl_widget_air_button = 2131427373;
- // aapt resource value: 0x7f04002e
- public const int hdl_widget_include_pickerview_topbar = 2130968622;
+ // aapt resource value: 0x7F0B002E
+ public const int hdl_widget_include_pickerview_topbar = 2131427374;
- // aapt resource value: 0x7f04002f
- public const int hdl_widget_layout_basepickerview = 2130968623;
+ // aapt resource value: 0x7F0B002F
+ public const int hdl_widget_layout_basepickerview = 2131427375;
- // aapt resource value: 0x7f040030
- public const int hdl_widget_pickerview = 2130968624;
+ // aapt resource value: 0x7F0B0030
+ public const int hdl_widget_pickerview = 2131427376;
- // aapt resource value: 0x7f040031
- public const int hdl_widget_pickerview_options = 2130968625;
+ // aapt resource value: 0x7F0B0031
+ public const int hdl_widget_pickerview_options = 2131427377;
- // aapt resource value: 0x7f040032
- public const int hdl_widget_pickerview_time = 2130968626;
+ // aapt resource value: 0x7F0B0032
+ public const int hdl_widget_pickerview_time = 2131427378;
- // aapt resource value: 0x7f040033
- public const int Main = 2130968627;
+ // aapt resource value: 0x7F0B0033
+ public const int Main = 2131427379;
- // aapt resource value: 0x7f040034
- public const int notification_action = 2130968628;
+ // aapt resource value: 0x7F0B0034
+ public const int notification_action = 2131427380;
- // aapt resource value: 0x7f040035
- public const int notification_action_tombstone = 2130968629;
+ // aapt resource value: 0x7F0B0035
+ public const int notification_action_tombstone = 2131427381;
- // aapt resource value: 0x7f040036
- public const int notification_media_action = 2130968630;
+ // aapt resource value: 0x7F0B0036
+ public const int notification_media_action = 2131427382;
- // aapt resource value: 0x7f040037
- public const int notification_media_cancel_action = 2130968631;
+ // aapt resource value: 0x7F0B0037
+ public const int notification_media_cancel_action = 2131427383;
- // aapt resource value: 0x7f040038
- public const int notification_template_big_media = 2130968632;
+ // aapt resource value: 0x7F0B0038
+ public const int notification_template_big_media = 2131427384;
- // aapt resource value: 0x7f040039
- public const int notification_template_big_media_custom = 2130968633;
+ // aapt resource value: 0x7F0B0039
+ public const int notification_template_big_media_custom = 2131427385;
- // aapt resource value: 0x7f04003a
- public const int notification_template_big_media_narrow = 2130968634;
+ // aapt resource value: 0x7F0B003A
+ public const int notification_template_big_media_narrow = 2131427386;
- // aapt resource value: 0x7f04003b
- public const int notification_template_big_media_narrow_custom = 2130968635;
+ // aapt resource value: 0x7F0B003B
+ public const int notification_template_big_media_narrow_custom = 2131427387;
- // aapt resource value: 0x7f04003c
- public const int notification_template_custom_big = 2130968636;
+ // aapt resource value: 0x7F0B003C
+ public const int notification_template_custom_big = 2131427388;
- // aapt resource value: 0x7f04003d
- public const int notification_template_icon_group = 2130968637;
+ // aapt resource value: 0x7F0B003D
+ public const int notification_template_icon_group = 2131427389;
- // aapt resource value: 0x7f04003e
- public const int notification_template_lines_media = 2130968638;
+ // aapt resource value: 0x7F0B003E
+ public const int notification_template_lines_media = 2131427390;
- // aapt resource value: 0x7f04003f
- public const int notification_template_media = 2130968639;
+ // aapt resource value: 0x7F0B003F
+ public const int notification_template_media = 2131427391;
- // aapt resource value: 0x7f040040
- public const int notification_template_media_custom = 2130968640;
+ // aapt resource value: 0x7F0B0040
+ public const int notification_template_media_custom = 2131427392;
- // aapt resource value: 0x7f040041
- public const int notification_template_part_chronometer = 2130968641;
+ // aapt resource value: 0x7F0B0041
+ public const int notification_template_part_chronometer = 2131427393;
- // aapt resource value: 0x7f040042
- public const int notification_template_part_time = 2130968642;
+ // aapt resource value: 0x7F0B0042
+ public const int notification_template_part_time = 2131427394;
- // aapt resource value: 0x7f040043
- public const int select_dialog_item_material = 2130968643;
+ // aapt resource value: 0x7F0B0043
+ public const int select_dialog_item_material = 2131427395;
- // aapt resource value: 0x7f040044
- public const int select_dialog_multichoice_material = 2130968644;
+ // aapt resource value: 0x7F0B0044
+ public const int select_dialog_multichoice_material = 2131427396;
- // aapt resource value: 0x7f040045
- public const int select_dialog_singlechoice_material = 2130968645;
+ // aapt resource value: 0x7F0B0045
+ public const int select_dialog_singlechoice_material = 2131427397;
- // aapt resource value: 0x7f040046
- public const int srl_classics_footer = 2130968646;
+ // aapt resource value: 0x7F0B0046
+ public const int srl_classics_footer = 2131427398;
- // aapt resource value: 0x7f040047
- public const int srl_classics_header = 2130968647;
+ // aapt resource value: 0x7F0B0047
+ public const int srl_classics_header = 2131427399;
- // aapt resource value: 0x7f040048
- public const int support_simple_spinner_dropdown_item = 2130968648;
+ // aapt resource value: 0x7F0B0048
+ public const int support_simple_spinner_dropdown_item = 2131427400;
- // aapt resource value: 0x7f040049
- public const int tooltip = 2130968649;
+ // aapt resource value: 0x7F0B0049
+ public const int tooltip = 2131427401;
- // aapt resource value: 0x7f04004a
- public const int zxing_layout = 2130968650;
+ // aapt resource value: 0x7F0B004B
+ public const int zxingscanneractivitylayout = 2131427403;
- // aapt resource value: 0x7f04004b
- public const int zxingscanneractivitylayout = 2130968651;
+ // aapt resource value: 0x7F0B004C
+ public const int zxingscannerfragmentlayout = 2131427404;
- // aapt resource value: 0x7f04004c
- public const int zxingscannerfragmentlayout = 2130968652;
+ // aapt resource value: 0x7F0B004A
+ public const int zxing_layout = 2131427402;
static Layout()
{
@@ -3960,8 +3942,8 @@
public partial class Mipmap
{
- // aapt resource value: 0x7f030000
- public const int Icon = 2130903040;
+ // aapt resource value: 0x7F0C0000
+ public const int Icon = 2131492864;
static Mipmap()
{
@@ -3976,242 +3958,242 @@
public partial class String
{
- // aapt resource value: 0x7f0a0000
- public const int abc_action_bar_home_description = 2131361792;
+ // aapt resource value: 0x7F0D0000
+ public const int abc_action_bar_home_description = 2131558400;
- // aapt resource value: 0x7f0a0001
- public const int abc_action_bar_home_description_format = 2131361793;
+ // aapt resource value: 0x7F0D0001
+ public const int abc_action_bar_home_description_format = 2131558401;
- // aapt resource value: 0x7f0a0002
- public const int abc_action_bar_home_subtitle_description_format = 2131361794;
+ // aapt resource value: 0x7F0D0002
+ public const int abc_action_bar_home_subtitle_description_format = 2131558402;
- // aapt resource value: 0x7f0a0003
- public const int abc_action_bar_up_description = 2131361795;
+ // aapt resource value: 0x7F0D0003
+ public const int abc_action_bar_up_description = 2131558403;
- // aapt resource value: 0x7f0a0004
- public const int abc_action_menu_overflow_description = 2131361796;
+ // aapt resource value: 0x7F0D0004
+ public const int abc_action_menu_overflow_description = 2131558404;
- // aapt resource value: 0x7f0a0005
- public const int abc_action_mode_done = 2131361797;
+ // aapt resource value: 0x7F0D0005
+ public const int abc_action_mode_done = 2131558405;
- // aapt resource value: 0x7f0a0006
- public const int abc_activity_chooser_view_see_all = 2131361798;
+ // aapt resource value: 0x7F0D0007
+ public const int abc_activitychooserview_choose_application = 2131558407;
- // aapt resource value: 0x7f0a0007
- public const int abc_activitychooserview_choose_application = 2131361799;
+ // aapt resource value: 0x7F0D0006
+ public const int abc_activity_chooser_view_see_all = 2131558406;
- // aapt resource value: 0x7f0a0008
- public const int abc_capital_off = 2131361800;
+ // aapt resource value: 0x7F0D0008
+ public const int abc_capital_off = 2131558408;
- // aapt resource value: 0x7f0a0009
- public const int abc_capital_on = 2131361801;
+ // aapt resource value: 0x7F0D0009
+ public const int abc_capital_on = 2131558409;
- // aapt resource value: 0x7f0a0015
- public const int abc_font_family_body_1_material = 2131361813;
+ // aapt resource value: 0x7F0D000A
+ public const int abc_font_family_body_1_material = 2131558410;
- // aapt resource value: 0x7f0a0016
- public const int abc_font_family_body_2_material = 2131361814;
+ // aapt resource value: 0x7F0D000B
+ public const int abc_font_family_body_2_material = 2131558411;
- // aapt resource value: 0x7f0a0017
- public const int abc_font_family_button_material = 2131361815;
+ // aapt resource value: 0x7F0D000C
+ public const int abc_font_family_button_material = 2131558412;
- // aapt resource value: 0x7f0a0018
- public const int abc_font_family_caption_material = 2131361816;
+ // aapt resource value: 0x7F0D000D
+ public const int abc_font_family_caption_material = 2131558413;
- // aapt resource value: 0x7f0a0019
- public const int abc_font_family_display_1_material = 2131361817;
+ // aapt resource value: 0x7F0D000E
+ public const int abc_font_family_display_1_material = 2131558414;
- // aapt resource value: 0x7f0a001a
- public const int abc_font_family_display_2_material = 2131361818;
+ // aapt resource value: 0x7F0D000F
+ public const int abc_font_family_display_2_material = 2131558415;
- // aapt resource value: 0x7f0a001b
- public const int abc_font_family_display_3_material = 2131361819;
+ // aapt resource value: 0x7F0D0010
+ public const int abc_font_family_display_3_material = 2131558416;
- // aapt resource value: 0x7f0a001c
- public const int abc_font_family_display_4_material = 2131361820;
+ // aapt resource value: 0x7F0D0011
+ public const int abc_font_family_display_4_material = 2131558417;
- // aapt resource value: 0x7f0a001d
- public const int abc_font_family_headline_material = 2131361821;
+ // aapt resource value: 0x7F0D0012
+ public const int abc_font_family_headline_material = 2131558418;
- // aapt resource value: 0x7f0a001e
- public const int abc_font_family_menu_material = 2131361822;
+ // aapt resource value: 0x7F0D0013
+ public const int abc_font_family_menu_material = 2131558419;
- // aapt resource value: 0x7f0a001f
- public const int abc_font_family_subhead_material = 2131361823;
+ // aapt resource value: 0x7F0D0014
+ public const int abc_font_family_subhead_material = 2131558420;
- // aapt resource value: 0x7f0a0020
- public const int abc_font_family_title_material = 2131361824;
+ // aapt resource value: 0x7F0D0015
+ public const int abc_font_family_title_material = 2131558421;
- // aapt resource value: 0x7f0a000a
- public const int abc_search_hint = 2131361802;
+ // aapt resource value: 0x7F0D0017
+ public const int abc_searchview_description_clear = 2131558423;
- // aapt resource value: 0x7f0a000b
- public const int abc_searchview_description_clear = 2131361803;
+ // aapt resource value: 0x7F0D0018
+ public const int abc_searchview_description_query = 2131558424;
- // aapt resource value: 0x7f0a000c
- public const int abc_searchview_description_query = 2131361804;
+ // aapt resource value: 0x7F0D0019
+ public const int abc_searchview_description_search = 2131558425;
- // aapt resource value: 0x7f0a000d
- public const int abc_searchview_description_search = 2131361805;
+ // aapt resource value: 0x7F0D001A
+ public const int abc_searchview_description_submit = 2131558426;
- // aapt resource value: 0x7f0a000e
- public const int abc_searchview_description_submit = 2131361806;
+ // aapt resource value: 0x7F0D001B
+ public const int abc_searchview_description_voice = 2131558427;
- // aapt resource value: 0x7f0a000f
- public const int abc_searchview_description_voice = 2131361807;
+ // aapt resource value: 0x7F0D0016
+ public const int abc_search_hint = 2131558422;
- // aapt resource value: 0x7f0a0010
- public const int abc_shareactionprovider_share_with = 2131361808;
+ // aapt resource value: 0x7F0D001C
+ public const int abc_shareactionprovider_share_with = 2131558428;
- // aapt resource value: 0x7f0a0011
- public const int abc_shareactionprovider_share_with_application = 2131361809;
+ // aapt resource value: 0x7F0D001D
+ public const int abc_shareactionprovider_share_with_application = 2131558429;
- // aapt resource value: 0x7f0a0012
- public const int abc_toolbar_collapse_description = 2131361810;
+ // aapt resource value: 0x7F0D001E
+ public const int abc_toolbar_collapse_description = 2131558430;
- // aapt resource value: 0x7f0a003c
- public const int app_name = 2131361852;
+ // aapt resource value: 0x7F0D0020
+ public const int appbar_scrolling_view_behavior = 2131558432;
- // aapt resource value: 0x7f0a0021
- public const int appbar_scrolling_view_behavior = 2131361825;
+ // aapt resource value: 0x7F0D001F
+ public const int app_name = 2131558431;
- // aapt resource value: 0x7f0a0022
- public const int bottom_sheet_behavior = 2131361826;
+ // aapt resource value: 0x7F0D0021
+ public const int bottom_sheet_behavior = 2131558433;
- // aapt resource value: 0x7f0a0023
- public const int character_counter_pattern = 2131361827;
+ // aapt resource value: 0x7F0D0022
+ public const int character_counter_pattern = 2131558434;
- // aapt resource value: 0x7f0a003d
- public const int gd_activity_title = 2131361853;
+ // aapt resource value: 0x7F0D0023
+ public const int gd_activity_title = 2131558435;
- // aapt resource value: 0x7f0a003e
- public const int gd_cancel = 2131361854;
+ // aapt resource value: 0x7F0D0024
+ public const int gd_cancel = 2131558436;
- // aapt resource value: 0x7f0a003f
- public const int gd_myhome = 2131361855;
+ // aapt resource value: 0x7F0D0025
+ public const int gd_myhome = 2131558437;
- // aapt resource value: 0x7f0a0040
- public const int gd_notifyMsg = 2131361856;
+ // aapt resource value: 0x7F0D0026
+ public const int gd_notifyMsg = 2131558438;
- // aapt resource value: 0x7f0a0041
- public const int gd_notifyTitle = 2131361857;
+ // aapt resource value: 0x7F0D0027
+ public const int gd_notifyTitle = 2131558439;
- // aapt resource value: 0x7f0a0042
- public const int gd_save = 2131361858;
+ // aapt resource value: 0x7F0D0028
+ public const int gd_save = 2131558440;
- // aapt resource value: 0x7f0a0043
- public const int gd_search_tip = 2131361859;
+ // aapt resource value: 0x7F0D0029
+ public const int gd_search_tip = 2131558441;
- // aapt resource value: 0x7f0a0044
- public const int gd_select_distance = 2131361860;
+ // aapt resource value: 0x7F0D002A
+ public const int gd_select_distance = 2131558442;
- // aapt resource value: 0x7f0a0045
- public const int gd_setting = 2131361861;
+ // aapt resource value: 0x7F0D002B
+ public const int gd_setting = 2131558443;
- // aapt resource value: 0x7f0a004e
- public const int hello = 2131361870;
+ // aapt resource value: 0x7F0D002C
+ public const int hello = 2131558444;
- // aapt resource value: 0x7f0a0029
- public const int not_recognized_fingerprint_hint = 2131361833;
+ // aapt resource value: 0x7F0D002D
+ public const int not_recognized_fingerprint_hint = 2131558445;
- // aapt resource value: 0x7f0a0024
- public const int password_toggle_content_description = 2131361828;
+ // aapt resource value: 0x7F0D002E
+ public const int password_toggle_content_description = 2131558446;
- // aapt resource value: 0x7f0a0025
- public const int path_password_eye = 2131361829;
+ // aapt resource value: 0x7F0D002F
+ public const int path_password_eye = 2131558447;
- // aapt resource value: 0x7f0a0026
- public const int path_password_eye_mask_strike_through = 2131361830;
+ // aapt resource value: 0x7F0D0030
+ public const int path_password_eye_mask_strike_through = 2131558448;
- // aapt resource value: 0x7f0a0027
- public const int path_password_eye_mask_visible = 2131361831;
+ // aapt resource value: 0x7F0D0031
+ public const int path_password_eye_mask_visible = 2131558449;
- // aapt resource value: 0x7f0a0028
- public const int path_password_strike_through = 2131361832;
+ // aapt resource value: 0x7F0D0032
+ public const int path_password_strike_through = 2131558450;
- // aapt resource value: 0x7f0a0046
- public const int pickerview_cancel = 2131361862;
+ // aapt resource value: 0x7F0D0033
+ public const int pickerview_cancel = 2131558451;
- // aapt resource value: 0x7f0a0047
- public const int pickerview_day = 2131361863;
+ // aapt resource value: 0x7F0D0034
+ public const int pickerview_day = 2131558452;
- // aapt resource value: 0x7f0a0048
- public const int pickerview_hours = 2131361864;
+ // aapt resource value: 0x7F0D0035
+ public const int pickerview_hours = 2131558453;
- // aapt resource value: 0x7f0a0049
- public const int pickerview_minutes = 2131361865;
+ // aapt resource value: 0x7F0D0036
+ public const int pickerview_minutes = 2131558454;
- // aapt resource value: 0x7f0a004a
- public const int pickerview_month = 2131361866;
+ // aapt resource value: 0x7F0D0037
+ public const int pickerview_month = 2131558455;
- // aapt resource value: 0x7f0a004b
- public const int pickerview_seconds = 2131361867;
+ // aapt resource value: 0x7F0D0038
+ public const int pickerview_seconds = 2131558456;
- // aapt resource value: 0x7f0a004c
- public const int pickerview_submit = 2131361868;
+ // aapt resource value: 0x7F0D0039
+ public const int pickerview_submit = 2131558457;
- // aapt resource value: 0x7f0a004d
- public const int pickerview_year = 2131361869;
+ // aapt resource value: 0x7F0D003A
+ public const int pickerview_year = 2131558458;
- // aapt resource value: 0x7f0a0013
- public const int search_menu_title = 2131361811;
+ // aapt resource value: 0x7F0D003B
+ public const int search_menu_title = 2131558459;
- // aapt resource value: 0x7f0a002b
- public const int srl_component_falsify = 2131361835;
+ // aapt resource value: 0x7F0D003C
+ public const int srl_component_falsify = 2131558460;
- // aapt resource value: 0x7f0a002c
- public const int srl_content_empty = 2131361836;
+ // aapt resource value: 0x7F0D003D
+ public const int srl_content_empty = 2131558461;
- // aapt resource value: 0x7f0a002d
- public const int srl_footer_failed = 2131361837;
+ // aapt resource value: 0x7F0D003E
+ public const int srl_footer_failed = 2131558462;
- // aapt resource value: 0x7f0a002e
- public const int srl_footer_finish = 2131361838;
+ // aapt resource value: 0x7F0D003F
+ public const int srl_footer_finish = 2131558463;
- // aapt resource value: 0x7f0a002f
- public const int srl_footer_loading = 2131361839;
+ // aapt resource value: 0x7F0D0040
+ public const int srl_footer_loading = 2131558464;
- // aapt resource value: 0x7f0a0030
- public const int srl_footer_nothing = 2131361840;
+ // aapt resource value: 0x7F0D0041
+ public const int srl_footer_nothing = 2131558465;
- // aapt resource value: 0x7f0a0031
- public const int srl_footer_pulling = 2131361841;
+ // aapt resource value: 0x7F0D0042
+ public const int srl_footer_pulling = 2131558466;
- // aapt resource value: 0x7f0a0032
- public const int srl_footer_refreshing = 2131361842;
+ // aapt resource value: 0x7F0D0043
+ public const int srl_footer_refreshing = 2131558467;
- // aapt resource value: 0x7f0a0033
- public const int srl_footer_release = 2131361843;
+ // aapt resource value: 0x7F0D0044
+ public const int srl_footer_release = 2131558468;
- // aapt resource value: 0x7f0a0034
- public const int srl_header_failed = 2131361844;
+ // aapt resource value: 0x7F0D0045
+ public const int srl_header_failed = 2131558469;
- // aapt resource value: 0x7f0a0035
- public const int srl_header_finish = 2131361845;
+ // aapt resource value: 0x7F0D0046
+ public const int srl_header_finish = 2131558470;
- // aapt resource value: 0x7f0a0036
- public const int srl_header_loading = 2131361846;
+ // aapt resource value: 0x7F0D0047
+ public const int srl_header_loading = 2131558471;
- // aapt resource value: 0x7f0a0037
- public const int srl_header_pulling = 2131361847;
+ // aapt resource value: 0x7F0D0048
+ public const int srl_header_pulling = 2131558472;
- // aapt resource value: 0x7f0a0038
- public const int srl_header_refreshing = 2131361848;
+ // aapt resource value: 0x7F0D0049
+ public const int srl_header_refreshing = 2131558473;
- // aapt resource value: 0x7f0a0039
- public const int srl_header_release = 2131361849;
+ // aapt resource value: 0x7F0D004A
+ public const int srl_header_release = 2131558474;
- // aapt resource value: 0x7f0a003a
- public const int srl_header_secondary = 2131361850;
+ // aapt resource value: 0x7F0D004B
+ public const int srl_header_secondary = 2131558475;
- // aapt resource value: 0x7f0a003b
- public const int srl_header_update = 2131361851;
+ // aapt resource value: 0x7F0D004C
+ public const int srl_header_update = 2131558476;
- // aapt resource value: 0x7f0a0014
- public const int status_bar_notification_info_overflow = 2131361812;
+ // aapt resource value: 0x7F0D004D
+ public const int status_bar_notification_info_overflow = 2131558477;
- // aapt resource value: 0x7f0a002a
- public const int touch_fingerprint_sensor_hint = 2131361834;
+ // aapt resource value: 0x7F0D004E
+ public const int touch_fingerprint_sensor_hint = 2131558478;
static String()
{
@@ -4226,1205 +4208,1205 @@
public partial class Style
{
- // aapt resource value: 0x7f0b009d
- public const int AlertDialog_AppCompat = 2131427485;
+ // aapt resource value: 0x7F0E0000
+ public const int AlertDialog_AppCompat = 2131623936;
- // aapt resource value: 0x7f0b009e
- public const int AlertDialog_AppCompat_Light = 2131427486;
+ // aapt resource value: 0x7F0E0001
+ public const int AlertDialog_AppCompat_Light = 2131623937;
- // aapt resource value: 0x7f0b009f
- public const int Animation_AppCompat_Dialog = 2131427487;
+ // aapt resource value: 0x7F0E0002
+ public const int Animation_AppCompat_Dialog = 2131623938;
- // aapt resource value: 0x7f0b00a0
- public const int Animation_AppCompat_DropDownUp = 2131427488;
+ // aapt resource value: 0x7F0E0003
+ public const int Animation_AppCompat_DropDownUp = 2131623939;
- // aapt resource value: 0x7f0b00a1
- public const int Animation_AppCompat_Tooltip = 2131427489;
+ // aapt resource value: 0x7F0E0004
+ public const int Animation_AppCompat_Tooltip = 2131623940;
- // aapt resource value: 0x7f0b0169
- public const int Animation_Design_BottomSheetDialog = 2131427689;
+ // aapt resource value: 0x7F0E0005
+ public const int Animation_Design_BottomSheetDialog = 2131623941;
- // aapt resource value: 0x7f0b00a2
- public const int Base_AlertDialog_AppCompat = 2131427490;
+ // aapt resource value: 0x7F0E0006
+ public const int Base_AlertDialog_AppCompat = 2131623942;
- // aapt resource value: 0x7f0b00a3
- public const int Base_AlertDialog_AppCompat_Light = 2131427491;
+ // aapt resource value: 0x7F0E0007
+ public const int Base_AlertDialog_AppCompat_Light = 2131623943;
- // aapt resource value: 0x7f0b00a4
- public const int Base_Animation_AppCompat_Dialog = 2131427492;
+ // aapt resource value: 0x7F0E0008
+ public const int Base_Animation_AppCompat_Dialog = 2131623944;
- // aapt resource value: 0x7f0b00a5
- public const int Base_Animation_AppCompat_DropDownUp = 2131427493;
+ // aapt resource value: 0x7F0E0009
+ public const int Base_Animation_AppCompat_DropDownUp = 2131623945;
- // aapt resource value: 0x7f0b00a6
- public const int Base_Animation_AppCompat_Tooltip = 2131427494;
+ // aapt resource value: 0x7F0E000A
+ public const int Base_Animation_AppCompat_Tooltip = 2131623946;
- // aapt resource value: 0x7f0b00a7
- public const int Base_DialogWindowTitle_AppCompat = 2131427495;
+ // aapt resource value: 0x7F0E000C
+ public const int Base_DialogWindowTitleBackground_AppCompat = 2131623948;
- // aapt resource value: 0x7f0b00a8
- public const int Base_DialogWindowTitleBackground_AppCompat = 2131427496;
+ // aapt resource value: 0x7F0E000B
+ public const int Base_DialogWindowTitle_AppCompat = 2131623947;
- // aapt resource value: 0x7f0b0039
- public const int Base_TextAppearance_AppCompat = 2131427385;
+ // aapt resource value: 0x7F0E000D
+ public const int Base_TextAppearance_AppCompat = 2131623949;
- // aapt resource value: 0x7f0b003a
- public const int Base_TextAppearance_AppCompat_Body1 = 2131427386;
+ // aapt resource value: 0x7F0E000E
+ public const int Base_TextAppearance_AppCompat_Body1 = 2131623950;
- // aapt resource value: 0x7f0b003b
- public const int Base_TextAppearance_AppCompat_Body2 = 2131427387;
+ // aapt resource value: 0x7F0E000F
+ public const int Base_TextAppearance_AppCompat_Body2 = 2131623951;
- // aapt resource value: 0x7f0b0027
- public const int Base_TextAppearance_AppCompat_Button = 2131427367;
+ // aapt resource value: 0x7F0E0010
+ public const int Base_TextAppearance_AppCompat_Button = 2131623952;
- // aapt resource value: 0x7f0b003c
- public const int Base_TextAppearance_AppCompat_Caption = 2131427388;
+ // aapt resource value: 0x7F0E0011
+ public const int Base_TextAppearance_AppCompat_Caption = 2131623953;
- // aapt resource value: 0x7f0b003d
- public const int Base_TextAppearance_AppCompat_Display1 = 2131427389;
+ // aapt resource value: 0x7F0E0012
+ public const int Base_TextAppearance_AppCompat_Display1 = 2131623954;
- // aapt resource value: 0x7f0b003e
- public const int Base_TextAppearance_AppCompat_Display2 = 2131427390;
+ // aapt resource value: 0x7F0E0013
+ public const int Base_TextAppearance_AppCompat_Display2 = 2131623955;
- // aapt resource value: 0x7f0b003f
- public const int Base_TextAppearance_AppCompat_Display3 = 2131427391;
+ // aapt resource value: 0x7F0E0014
+ public const int Base_TextAppearance_AppCompat_Display3 = 2131623956;
- // aapt resource value: 0x7f0b0040
- public const int Base_TextAppearance_AppCompat_Display4 = 2131427392;
+ // aapt resource value: 0x7F0E0015
+ public const int Base_TextAppearance_AppCompat_Display4 = 2131623957;
- // aapt resource value: 0x7f0b0041
- public const int Base_TextAppearance_AppCompat_Headline = 2131427393;
+ // aapt resource value: 0x7F0E0016
+ public const int Base_TextAppearance_AppCompat_Headline = 2131623958;
- // aapt resource value: 0x7f0b000b
- public const int Base_TextAppearance_AppCompat_Inverse = 2131427339;
+ // aapt resource value: 0x7F0E0017
+ public const int Base_TextAppearance_AppCompat_Inverse = 2131623959;
- // aapt resource value: 0x7f0b0042
- public const int Base_TextAppearance_AppCompat_Large = 2131427394;
+ // aapt resource value: 0x7F0E0018
+ public const int Base_TextAppearance_AppCompat_Large = 2131623960;
- // aapt resource value: 0x7f0b000c
- public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131427340;
+ // aapt resource value: 0x7F0E0019
+ public const int Base_TextAppearance_AppCompat_Large_Inverse = 2131623961;
- // aapt resource value: 0x7f0b0043
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427395;
+ // aapt resource value: 0x7F0E001A
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131623962;
- // aapt resource value: 0x7f0b0044
- public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427396;
+ // aapt resource value: 0x7F0E001B
+ public const int Base_TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131623963;
- // aapt resource value: 0x7f0b0045
- public const int Base_TextAppearance_AppCompat_Medium = 2131427397;
+ // aapt resource value: 0x7F0E001C
+ public const int Base_TextAppearance_AppCompat_Medium = 2131623964;
- // aapt resource value: 0x7f0b000d
- public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131427341;
+ // aapt resource value: 0x7F0E001D
+ public const int Base_TextAppearance_AppCompat_Medium_Inverse = 2131623965;
- // aapt resource value: 0x7f0b0046
- public const int Base_TextAppearance_AppCompat_Menu = 2131427398;
+ // aapt resource value: 0x7F0E001E
+ public const int Base_TextAppearance_AppCompat_Menu = 2131623966;
- // aapt resource value: 0x7f0b00a9
- public const int Base_TextAppearance_AppCompat_SearchResult = 2131427497;
+ // aapt resource value: 0x7F0E001F
+ public const int Base_TextAppearance_AppCompat_SearchResult = 2131623967;
- // aapt resource value: 0x7f0b0047
- public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131427399;
+ // aapt resource value: 0x7F0E0020
+ public const int Base_TextAppearance_AppCompat_SearchResult_Subtitle = 2131623968;
- // aapt resource value: 0x7f0b0048
- public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131427400;
+ // aapt resource value: 0x7F0E0021
+ public const int Base_TextAppearance_AppCompat_SearchResult_Title = 2131623969;
- // aapt resource value: 0x7f0b0049
- public const int Base_TextAppearance_AppCompat_Small = 2131427401;
+ // aapt resource value: 0x7F0E0022
+ public const int Base_TextAppearance_AppCompat_Small = 2131623970;
- // aapt resource value: 0x7f0b000e
- public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131427342;
+ // aapt resource value: 0x7F0E0023
+ public const int Base_TextAppearance_AppCompat_Small_Inverse = 2131623971;
- // aapt resource value: 0x7f0b004a
- public const int Base_TextAppearance_AppCompat_Subhead = 2131427402;
+ // aapt resource value: 0x7F0E0024
+ public const int Base_TextAppearance_AppCompat_Subhead = 2131623972;
- // aapt resource value: 0x7f0b000f
- public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131427343;
+ // aapt resource value: 0x7F0E0025
+ public const int Base_TextAppearance_AppCompat_Subhead_Inverse = 2131623973;
- // aapt resource value: 0x7f0b004b
- public const int Base_TextAppearance_AppCompat_Title = 2131427403;
+ // aapt resource value: 0x7F0E0026
+ public const int Base_TextAppearance_AppCompat_Title = 2131623974;
- // aapt resource value: 0x7f0b0010
- public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131427344;
+ // aapt resource value: 0x7F0E0027
+ public const int Base_TextAppearance_AppCompat_Title_Inverse = 2131623975;
- // aapt resource value: 0x7f0b00aa
- public const int Base_TextAppearance_AppCompat_Tooltip = 2131427498;
+ // aapt resource value: 0x7F0E0028
+ public const int Base_TextAppearance_AppCompat_Tooltip = 2131623976;
- // aapt resource value: 0x7f0b008e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427470;
+ // aapt resource value: 0x7F0E0029
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131623977;
- // aapt resource value: 0x7f0b004c
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427404;
+ // aapt resource value: 0x7F0E002A
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131623978;
- // aapt resource value: 0x7f0b004d
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427405;
+ // aapt resource value: 0x7F0E002B
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131623979;
- // aapt resource value: 0x7f0b004e
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427406;
+ // aapt resource value: 0x7F0E002C
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title = 2131623980;
- // aapt resource value: 0x7f0b004f
- public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427407;
+ // aapt resource value: 0x7F0E002D
+ public const int Base_TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131623981;
- // aapt resource value: 0x7f0b0050
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427408;
+ // aapt resource value: 0x7F0E002E
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131623982;
- // aapt resource value: 0x7f0b0051
- public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427409;
+ // aapt resource value: 0x7F0E002F
+ public const int Base_TextAppearance_AppCompat_Widget_ActionMode_Title = 2131623983;
- // aapt resource value: 0x7f0b0052
- public const int Base_TextAppearance_AppCompat_Widget_Button = 2131427410;
+ // aapt resource value: 0x7F0E0030
+ public const int Base_TextAppearance_AppCompat_Widget_Button = 2131623984;
- // aapt resource value: 0x7f0b0095
- public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427477;
+ // aapt resource value: 0x7F0E0031
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131623985;
- // aapt resource value: 0x7f0b0096
- public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131427478;
+ // aapt resource value: 0x7F0E0032
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Colored = 2131623986;
- // aapt resource value: 0x7f0b008f
- public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131427471;
+ // aapt resource value: 0x7F0E0033
+ public const int Base_TextAppearance_AppCompat_Widget_Button_Inverse = 2131623987;
- // aapt resource value: 0x7f0b00ab
- public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131427499;
+ // aapt resource value: 0x7F0E0034
+ public const int Base_TextAppearance_AppCompat_Widget_DropDownItem = 2131623988;
- // aapt resource value: 0x7f0b0053
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427411;
+ // aapt resource value: 0x7F0E0035
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131623989;
- // aapt resource value: 0x7f0b0054
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427412;
+ // aapt resource value: 0x7F0E0036
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131623990;
- // aapt resource value: 0x7f0b0055
- public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427413;
+ // aapt resource value: 0x7F0E0037
+ public const int Base_TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131623991;
- // aapt resource value: 0x7f0b0056
- public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131427414;
+ // aapt resource value: 0x7F0E0038
+ public const int Base_TextAppearance_AppCompat_Widget_Switch = 2131623992;
- // aapt resource value: 0x7f0b0057
- public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427415;
+ // aapt resource value: 0x7F0E0039
+ public const int Base_TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131623993;
- // aapt resource value: 0x7f0b00ac
- public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427500;
+ // aapt resource value: 0x7F0E003A
+ public const int Base_TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131623994;
- // aapt resource value: 0x7f0b0058
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427416;
+ // aapt resource value: 0x7F0E003B
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131623995;
- // aapt resource value: 0x7f0b0059
- public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427417;
+ // aapt resource value: 0x7F0E003C
+ public const int Base_TextAppearance_Widget_AppCompat_Toolbar_Title = 2131623996;
- // aapt resource value: 0x7f0b005a
- public const int Base_Theme_AppCompat = 2131427418;
+ // aapt resource value: 0x7F0E004B
+ public const int Base_ThemeOverlay_AppCompat = 2131624011;
- // aapt resource value: 0x7f0b00ad
- public const int Base_Theme_AppCompat_CompactMenu = 2131427501;
+ // aapt resource value: 0x7F0E004C
+ public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131624012;
- // aapt resource value: 0x7f0b0011
- public const int Base_Theme_AppCompat_Dialog = 2131427345;
+ // aapt resource value: 0x7F0E004D
+ public const int Base_ThemeOverlay_AppCompat_Dark = 2131624013;
- // aapt resource value: 0x7f0b0012
- public const int Base_Theme_AppCompat_Dialog_Alert = 2131427346;
+ // aapt resource value: 0x7F0E004E
+ public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131624014;
- // aapt resource value: 0x7f0b00ae
- public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131427502;
+ // aapt resource value: 0x7F0E004F
+ public const int Base_ThemeOverlay_AppCompat_Dialog = 2131624015;
- // aapt resource value: 0x7f0b0013
- public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131427347;
+ // aapt resource value: 0x7F0E0050
+ public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131624016;
- // aapt resource value: 0x7f0b0001
- public const int Base_Theme_AppCompat_DialogWhenLarge = 2131427329;
+ // aapt resource value: 0x7F0E0051
+ public const int Base_ThemeOverlay_AppCompat_Light = 2131624017;
- // aapt resource value: 0x7f0b005b
- public const int Base_Theme_AppCompat_Light = 2131427419;
+ // aapt resource value: 0x7F0E003D
+ public const int Base_Theme_AppCompat = 2131623997;
- // aapt resource value: 0x7f0b00af
- public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131427503;
+ // aapt resource value: 0x7F0E003E
+ public const int Base_Theme_AppCompat_CompactMenu = 2131623998;
- // aapt resource value: 0x7f0b0014
- public const int Base_Theme_AppCompat_Light_Dialog = 2131427348;
+ // aapt resource value: 0x7F0E003F
+ public const int Base_Theme_AppCompat_Dialog = 2131623999;
- // aapt resource value: 0x7f0b0015
- public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131427349;
+ // aapt resource value: 0x7F0E0043
+ public const int Base_Theme_AppCompat_DialogWhenLarge = 2131624003;
- // aapt resource value: 0x7f0b00b0
- public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131427504;
+ // aapt resource value: 0x7F0E0040
+ public const int Base_Theme_AppCompat_Dialog_Alert = 2131624000;
- // aapt resource value: 0x7f0b0016
- public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131427350;
+ // aapt resource value: 0x7F0E0041
+ public const int Base_Theme_AppCompat_Dialog_FixedSize = 2131624001;
- // aapt resource value: 0x7f0b0002
- public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131427330;
+ // aapt resource value: 0x7F0E0042
+ public const int Base_Theme_AppCompat_Dialog_MinWidth = 2131624002;
- // aapt resource value: 0x7f0b00b1
- public const int Base_ThemeOverlay_AppCompat = 2131427505;
+ // aapt resource value: 0x7F0E0044
+ public const int Base_Theme_AppCompat_Light = 2131624004;
- // aapt resource value: 0x7f0b00b2
- public const int Base_ThemeOverlay_AppCompat_ActionBar = 2131427506;
+ // aapt resource value: 0x7F0E0045
+ public const int Base_Theme_AppCompat_Light_DarkActionBar = 2131624005;
- // aapt resource value: 0x7f0b00b3
- public const int Base_ThemeOverlay_AppCompat_Dark = 2131427507;
+ // aapt resource value: 0x7F0E0046
+ public const int Base_Theme_AppCompat_Light_Dialog = 2131624006;
- // aapt resource value: 0x7f0b00b4
- public const int Base_ThemeOverlay_AppCompat_Dark_ActionBar = 2131427508;
+ // aapt resource value: 0x7F0E004A
+ public const int Base_Theme_AppCompat_Light_DialogWhenLarge = 2131624010;
- // aapt resource value: 0x7f0b0017
- public const int Base_ThemeOverlay_AppCompat_Dialog = 2131427351;
+ // aapt resource value: 0x7F0E0047
+ public const int Base_Theme_AppCompat_Light_Dialog_Alert = 2131624007;
- // aapt resource value: 0x7f0b0018
- public const int Base_ThemeOverlay_AppCompat_Dialog_Alert = 2131427352;
+ // aapt resource value: 0x7F0E0048
+ public const int Base_Theme_AppCompat_Light_Dialog_FixedSize = 2131624008;
- // aapt resource value: 0x7f0b00b5
- public const int Base_ThemeOverlay_AppCompat_Light = 2131427509;
+ // aapt resource value: 0x7F0E0049
+ public const int Base_Theme_AppCompat_Light_Dialog_MinWidth = 2131624009;
- // aapt resource value: 0x7f0b0019
- public const int Base_V11_Theme_AppCompat_Dialog = 2131427353;
+ // aapt resource value: 0x7F0E0054
+ public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131624020;
- // aapt resource value: 0x7f0b001a
- public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131427354;
+ // aapt resource value: 0x7F0E0052
+ public const int Base_V11_Theme_AppCompat_Dialog = 2131624018;
- // aapt resource value: 0x7f0b001b
- public const int Base_V11_ThemeOverlay_AppCompat_Dialog = 2131427355;
+ // aapt resource value: 0x7F0E0053
+ public const int Base_V11_Theme_AppCompat_Light_Dialog = 2131624019;
- // aapt resource value: 0x7f0b0023
- public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131427363;
+ // aapt resource value: 0x7F0E0055
+ public const int Base_V12_Widget_AppCompat_AutoCompleteTextView = 2131624021;
- // aapt resource value: 0x7f0b0024
- public const int Base_V12_Widget_AppCompat_EditText = 2131427364;
+ // aapt resource value: 0x7F0E0056
+ public const int Base_V12_Widget_AppCompat_EditText = 2131624022;
- // aapt resource value: 0x7f0b016a
- public const int Base_V14_Widget_Design_AppBarLayout = 2131427690;
+ // aapt resource value: 0x7F0E0057
+ public const int Base_V14_Widget_Design_AppBarLayout = 2131624023;
- // aapt resource value: 0x7f0b005c
- public const int Base_V21_Theme_AppCompat = 2131427420;
+ // aapt resource value: 0x7F0E005C
+ public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131624028;
- // aapt resource value: 0x7f0b005d
- public const int Base_V21_Theme_AppCompat_Dialog = 2131427421;
+ // aapt resource value: 0x7F0E0058
+ public const int Base_V21_Theme_AppCompat = 2131624024;
- // aapt resource value: 0x7f0b005e
- public const int Base_V21_Theme_AppCompat_Light = 2131427422;
+ // aapt resource value: 0x7F0E0059
+ public const int Base_V21_Theme_AppCompat_Dialog = 2131624025;
- // aapt resource value: 0x7f0b005f
- public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131427423;
+ // aapt resource value: 0x7F0E005A
+ public const int Base_V21_Theme_AppCompat_Light = 2131624026;
- // aapt resource value: 0x7f0b0060
- public const int Base_V21_ThemeOverlay_AppCompat_Dialog = 2131427424;
+ // aapt resource value: 0x7F0E005B
+ public const int Base_V21_Theme_AppCompat_Light_Dialog = 2131624027;
- // aapt resource value: 0x7f0b0166
- public const int Base_V21_Widget_Design_AppBarLayout = 2131427686;
+ // aapt resource value: 0x7F0E005D
+ public const int Base_V21_Widget_Design_AppBarLayout = 2131624029;
- // aapt resource value: 0x7f0b008c
- public const int Base_V22_Theme_AppCompat = 2131427468;
+ // aapt resource value: 0x7F0E005E
+ public const int Base_V22_Theme_AppCompat = 2131624030;
- // aapt resource value: 0x7f0b008d
- public const int Base_V22_Theme_AppCompat_Light = 2131427469;
+ // aapt resource value: 0x7F0E005F
+ public const int Base_V22_Theme_AppCompat_Light = 2131624031;
- // aapt resource value: 0x7f0b0090
- public const int Base_V23_Theme_AppCompat = 2131427472;
+ // aapt resource value: 0x7F0E0060
+ public const int Base_V23_Theme_AppCompat = 2131624032;
- // aapt resource value: 0x7f0b0091
- public const int Base_V23_Theme_AppCompat_Light = 2131427473;
+ // aapt resource value: 0x7F0E0061
+ public const int Base_V23_Theme_AppCompat_Light = 2131624033;
- // aapt resource value: 0x7f0b0099
- public const int Base_V26_Theme_AppCompat = 2131427481;
+ // aapt resource value: 0x7F0E0062
+ public const int Base_V26_Theme_AppCompat = 2131624034;
- // aapt resource value: 0x7f0b009a
- public const int Base_V26_Theme_AppCompat_Light = 2131427482;
+ // aapt resource value: 0x7F0E0063
+ public const int Base_V26_Theme_AppCompat_Light = 2131624035;
- // aapt resource value: 0x7f0b009b
- public const int Base_V26_Widget_AppCompat_Toolbar = 2131427483;
+ // aapt resource value: 0x7F0E0064
+ public const int Base_V26_Widget_AppCompat_Toolbar = 2131624036;
- // aapt resource value: 0x7f0b0168
- public const int Base_V26_Widget_Design_AppBarLayout = 2131427688;
+ // aapt resource value: 0x7F0E0065
+ public const int Base_V26_Widget_Design_AppBarLayout = 2131624037;
- // aapt resource value: 0x7f0b00b6
- public const int Base_V7_Theme_AppCompat = 2131427510;
+ // aapt resource value: 0x7F0E006A
+ public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131624042;
- // aapt resource value: 0x7f0b00b7
- public const int Base_V7_Theme_AppCompat_Dialog = 2131427511;
+ // aapt resource value: 0x7F0E0066
+ public const int Base_V7_Theme_AppCompat = 2131624038;
- // aapt resource value: 0x7f0b00b8
- public const int Base_V7_Theme_AppCompat_Light = 2131427512;
+ // aapt resource value: 0x7F0E0067
+ public const int Base_V7_Theme_AppCompat_Dialog = 2131624039;
- // aapt resource value: 0x7f0b00b9
- public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131427513;
+ // aapt resource value: 0x7F0E0068
+ public const int Base_V7_Theme_AppCompat_Light = 2131624040;
- // aapt resource value: 0x7f0b00ba
- public const int Base_V7_ThemeOverlay_AppCompat_Dialog = 2131427514;
+ // aapt resource value: 0x7F0E0069
+ public const int Base_V7_Theme_AppCompat_Light_Dialog = 2131624041;
- // aapt resource value: 0x7f0b00bb
- public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131427515;
+ // aapt resource value: 0x7F0E006B
+ public const int Base_V7_Widget_AppCompat_AutoCompleteTextView = 2131624043;
- // aapt resource value: 0x7f0b00bc
- public const int Base_V7_Widget_AppCompat_EditText = 2131427516;
+ // aapt resource value: 0x7F0E006C
+ public const int Base_V7_Widget_AppCompat_EditText = 2131624044;
- // aapt resource value: 0x7f0b00bd
- public const int Base_V7_Widget_AppCompat_Toolbar = 2131427517;
+ // aapt resource value: 0x7F0E006D
+ public const int Base_V7_Widget_AppCompat_Toolbar = 2131624045;
- // aapt resource value: 0x7f0b00be
- public const int Base_Widget_AppCompat_ActionBar = 2131427518;
+ // aapt resource value: 0x7F0E006E
+ public const int Base_Widget_AppCompat_ActionBar = 2131624046;
- // aapt resource value: 0x7f0b00bf
- public const int Base_Widget_AppCompat_ActionBar_Solid = 2131427519;
+ // aapt resource value: 0x7F0E006F
+ public const int Base_Widget_AppCompat_ActionBar_Solid = 2131624047;
- // aapt resource value: 0x7f0b00c0
- public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131427520;
+ // aapt resource value: 0x7F0E0070
+ public const int Base_Widget_AppCompat_ActionBar_TabBar = 2131624048;
- // aapt resource value: 0x7f0b0061
- public const int Base_Widget_AppCompat_ActionBar_TabText = 2131427425;
+ // aapt resource value: 0x7F0E0071
+ public const int Base_Widget_AppCompat_ActionBar_TabText = 2131624049;
- // aapt resource value: 0x7f0b0062
- public const int Base_Widget_AppCompat_ActionBar_TabView = 2131427426;
+ // aapt resource value: 0x7F0E0072
+ public const int Base_Widget_AppCompat_ActionBar_TabView = 2131624050;
- // aapt resource value: 0x7f0b0063
- public const int Base_Widget_AppCompat_ActionButton = 2131427427;
+ // aapt resource value: 0x7F0E0073
+ public const int Base_Widget_AppCompat_ActionButton = 2131624051;
- // aapt resource value: 0x7f0b0064
- public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131427428;
+ // aapt resource value: 0x7F0E0074
+ public const int Base_Widget_AppCompat_ActionButton_CloseMode = 2131624052;
- // aapt resource value: 0x7f0b0065
- public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131427429;
+ // aapt resource value: 0x7F0E0075
+ public const int Base_Widget_AppCompat_ActionButton_Overflow = 2131624053;
- // aapt resource value: 0x7f0b00c1
- public const int Base_Widget_AppCompat_ActionMode = 2131427521;
+ // aapt resource value: 0x7F0E0076
+ public const int Base_Widget_AppCompat_ActionMode = 2131624054;
- // aapt resource value: 0x7f0b00c2
- public const int Base_Widget_AppCompat_ActivityChooserView = 2131427522;
+ // aapt resource value: 0x7F0E0077
+ public const int Base_Widget_AppCompat_ActivityChooserView = 2131624055;
- // aapt resource value: 0x7f0b0025
- public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131427365;
+ // aapt resource value: 0x7F0E0078
+ public const int Base_Widget_AppCompat_AutoCompleteTextView = 2131624056;
- // aapt resource value: 0x7f0b0066
- public const int Base_Widget_AppCompat_Button = 2131427430;
+ // aapt resource value: 0x7F0E0079
+ public const int Base_Widget_AppCompat_Button = 2131624057;
- // aapt resource value: 0x7f0b0067
- public const int Base_Widget_AppCompat_Button_Borderless = 2131427431;
+ // aapt resource value: 0x7F0E007F
+ public const int Base_Widget_AppCompat_ButtonBar = 2131624063;
- // aapt resource value: 0x7f0b0068
- public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131427432;
+ // aapt resource value: 0x7F0E0080
+ public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131624064;
- // aapt resource value: 0x7f0b00c3
- public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427523;
+ // aapt resource value: 0x7F0E007A
+ public const int Base_Widget_AppCompat_Button_Borderless = 2131624058;
- // aapt resource value: 0x7f0b0092
- public const int Base_Widget_AppCompat_Button_Colored = 2131427474;
+ // aapt resource value: 0x7F0E007B
+ public const int Base_Widget_AppCompat_Button_Borderless_Colored = 2131624059;
- // aapt resource value: 0x7f0b0069
- public const int Base_Widget_AppCompat_Button_Small = 2131427433;
+ // aapt resource value: 0x7F0E007C
+ public const int Base_Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624060;
- // aapt resource value: 0x7f0b006a
- public const int Base_Widget_AppCompat_ButtonBar = 2131427434;
+ // aapt resource value: 0x7F0E007D
+ public const int Base_Widget_AppCompat_Button_Colored = 2131624061;
- // aapt resource value: 0x7f0b00c4
- public const int Base_Widget_AppCompat_ButtonBar_AlertDialog = 2131427524;
+ // aapt resource value: 0x7F0E007E
+ public const int Base_Widget_AppCompat_Button_Small = 2131624062;
- // aapt resource value: 0x7f0b006b
- public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131427435;
+ // aapt resource value: 0x7F0E0081
+ public const int Base_Widget_AppCompat_CompoundButton_CheckBox = 2131624065;
- // aapt resource value: 0x7f0b006c
- public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131427436;
+ // aapt resource value: 0x7F0E0082
+ public const int Base_Widget_AppCompat_CompoundButton_RadioButton = 2131624066;
- // aapt resource value: 0x7f0b00c5
- public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131427525;
+ // aapt resource value: 0x7F0E0083
+ public const int Base_Widget_AppCompat_CompoundButton_Switch = 2131624067;
- // aapt resource value: 0x7f0b0000
- public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131427328;
+ // aapt resource value: 0x7F0E0084
+ public const int Base_Widget_AppCompat_DrawerArrowToggle = 2131624068;
- // aapt resource value: 0x7f0b00c6
- public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131427526;
+ // aapt resource value: 0x7F0E0085
+ public const int Base_Widget_AppCompat_DrawerArrowToggle_Common = 2131624069;
- // aapt resource value: 0x7f0b006d
- public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131427437;
+ // aapt resource value: 0x7F0E0086
+ public const int Base_Widget_AppCompat_DropDownItem_Spinner = 2131624070;
- // aapt resource value: 0x7f0b0026
- public const int Base_Widget_AppCompat_EditText = 2131427366;
+ // aapt resource value: 0x7F0E0087
+ public const int Base_Widget_AppCompat_EditText = 2131624071;
- // aapt resource value: 0x7f0b006e
- public const int Base_Widget_AppCompat_ImageButton = 2131427438;
+ // aapt resource value: 0x7F0E0088
+ public const int Base_Widget_AppCompat_ImageButton = 2131624072;
- // aapt resource value: 0x7f0b00c7
- public const int Base_Widget_AppCompat_Light_ActionBar = 2131427527;
+ // aapt resource value: 0x7F0E0089
+ public const int Base_Widget_AppCompat_Light_ActionBar = 2131624073;
- // aapt resource value: 0x7f0b00c8
- public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131427528;
+ // aapt resource value: 0x7F0E008A
+ public const int Base_Widget_AppCompat_Light_ActionBar_Solid = 2131624074;
- // aapt resource value: 0x7f0b00c9
- public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131427529;
+ // aapt resource value: 0x7F0E008B
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabBar = 2131624075;
- // aapt resource value: 0x7f0b006f
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131427439;
+ // aapt resource value: 0x7F0E008C
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText = 2131624076;
- // aapt resource value: 0x7f0b0070
- public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427440;
+ // aapt resource value: 0x7F0E008D
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624077;
- // aapt resource value: 0x7f0b0071
- public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131427441;
+ // aapt resource value: 0x7F0E008E
+ public const int Base_Widget_AppCompat_Light_ActionBar_TabView = 2131624078;
- // aapt resource value: 0x7f0b0072
- public const int Base_Widget_AppCompat_Light_PopupMenu = 2131427442;
+ // aapt resource value: 0x7F0E008F
+ public const int Base_Widget_AppCompat_Light_PopupMenu = 2131624079;
- // aapt resource value: 0x7f0b0073
- public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131427443;
+ // aapt resource value: 0x7F0E0090
+ public const int Base_Widget_AppCompat_Light_PopupMenu_Overflow = 2131624080;
- // aapt resource value: 0x7f0b00ca
- public const int Base_Widget_AppCompat_ListMenuView = 2131427530;
+ // aapt resource value: 0x7F0E0091
+ public const int Base_Widget_AppCompat_ListMenuView = 2131624081;
- // aapt resource value: 0x7f0b0074
- public const int Base_Widget_AppCompat_ListPopupWindow = 2131427444;
+ // aapt resource value: 0x7F0E0092
+ public const int Base_Widget_AppCompat_ListPopupWindow = 2131624082;
- // aapt resource value: 0x7f0b0075
- public const int Base_Widget_AppCompat_ListView = 2131427445;
+ // aapt resource value: 0x7F0E0093
+ public const int Base_Widget_AppCompat_ListView = 2131624083;
- // aapt resource value: 0x7f0b0076
- public const int Base_Widget_AppCompat_ListView_DropDown = 2131427446;
+ // aapt resource value: 0x7F0E0094
+ public const int Base_Widget_AppCompat_ListView_DropDown = 2131624084;
- // aapt resource value: 0x7f0b0077
- public const int Base_Widget_AppCompat_ListView_Menu = 2131427447;
+ // aapt resource value: 0x7F0E0095
+ public const int Base_Widget_AppCompat_ListView_Menu = 2131624085;
- // aapt resource value: 0x7f0b0078
- public const int Base_Widget_AppCompat_PopupMenu = 2131427448;
+ // aapt resource value: 0x7F0E0096
+ public const int Base_Widget_AppCompat_PopupMenu = 2131624086;
- // aapt resource value: 0x7f0b0079
- public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131427449;
+ // aapt resource value: 0x7F0E0097
+ public const int Base_Widget_AppCompat_PopupMenu_Overflow = 2131624087;
- // aapt resource value: 0x7f0b00cb
- public const int Base_Widget_AppCompat_PopupWindow = 2131427531;
+ // aapt resource value: 0x7F0E0098
+ public const int Base_Widget_AppCompat_PopupWindow = 2131624088;
- // aapt resource value: 0x7f0b001c
- public const int Base_Widget_AppCompat_ProgressBar = 2131427356;
+ // aapt resource value: 0x7F0E0099
+ public const int Base_Widget_AppCompat_ProgressBar = 2131624089;
- // aapt resource value: 0x7f0b001d
- public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131427357;
+ // aapt resource value: 0x7F0E009A
+ public const int Base_Widget_AppCompat_ProgressBar_Horizontal = 2131624090;
- // aapt resource value: 0x7f0b007a
- public const int Base_Widget_AppCompat_RatingBar = 2131427450;
+ // aapt resource value: 0x7F0E009B
+ public const int Base_Widget_AppCompat_RatingBar = 2131624091;
- // aapt resource value: 0x7f0b0093
- public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131427475;
+ // aapt resource value: 0x7F0E009C
+ public const int Base_Widget_AppCompat_RatingBar_Indicator = 2131624092;
- // aapt resource value: 0x7f0b0094
- public const int Base_Widget_AppCompat_RatingBar_Small = 2131427476;
+ // aapt resource value: 0x7F0E009D
+ public const int Base_Widget_AppCompat_RatingBar_Small = 2131624093;
- // aapt resource value: 0x7f0b00cc
- public const int Base_Widget_AppCompat_SearchView = 2131427532;
+ // aapt resource value: 0x7F0E009E
+ public const int Base_Widget_AppCompat_SearchView = 2131624094;
- // aapt resource value: 0x7f0b00cd
- public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131427533;
+ // aapt resource value: 0x7F0E009F
+ public const int Base_Widget_AppCompat_SearchView_ActionBar = 2131624095;
- // aapt resource value: 0x7f0b007b
- public const int Base_Widget_AppCompat_SeekBar = 2131427451;
+ // aapt resource value: 0x7F0E00A0
+ public const int Base_Widget_AppCompat_SeekBar = 2131624096;
- // aapt resource value: 0x7f0b00ce
- public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131427534;
+ // aapt resource value: 0x7F0E00A1
+ public const int Base_Widget_AppCompat_SeekBar_Discrete = 2131624097;
- // aapt resource value: 0x7f0b007c
- public const int Base_Widget_AppCompat_Spinner = 2131427452;
+ // aapt resource value: 0x7F0E00A2
+ public const int Base_Widget_AppCompat_Spinner = 2131624098;
- // aapt resource value: 0x7f0b0003
- public const int Base_Widget_AppCompat_Spinner_Underlined = 2131427331;
+ // aapt resource value: 0x7F0E00A3
+ public const int Base_Widget_AppCompat_Spinner_Underlined = 2131624099;
- // aapt resource value: 0x7f0b007d
- public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131427453;
+ // aapt resource value: 0x7F0E00A4
+ public const int Base_Widget_AppCompat_TextView_SpinnerItem = 2131624100;
- // aapt resource value: 0x7f0b009c
- public const int Base_Widget_AppCompat_Toolbar = 2131427484;
+ // aapt resource value: 0x7F0E00A5
+ public const int Base_Widget_AppCompat_Toolbar = 2131624101;
- // aapt resource value: 0x7f0b007e
- public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131427454;
+ // aapt resource value: 0x7F0E00A6
+ public const int Base_Widget_AppCompat_Toolbar_Button_Navigation = 2131624102;
- // aapt resource value: 0x7f0b0167
- public const int Base_Widget_Design_AppBarLayout = 2131427687;
+ // aapt resource value: 0x7F0E00A7
+ public const int Base_Widget_Design_AppBarLayout = 2131624103;
- // aapt resource value: 0x7f0b016b
- public const int Base_Widget_Design_TabLayout = 2131427691;
+ // aapt resource value: 0x7F0E00A8
+ public const int Base_Widget_Design_TabLayout = 2131624104;
- // aapt resource value: 0x7f0b018a
- public const int BottomSheetDialogAnimation = 2131427722;
+ // aapt resource value: 0x7F0E00A9
+ public const int BottomSheetDialogAnimation = 2131624105;
- // aapt resource value: 0x7f0b018f
- public const int MyTheme = 2131427727;
+ // aapt resource value: 0x7F0E018D
+ public const int custom_dialog2 = 2131624333;
- // aapt resource value: 0x7f0b001e
- public const int Platform_AppCompat = 2131427358;
+ // aapt resource value: 0x7F0E00AA
+ public const int MyTheme = 2131624106;
- // aapt resource value: 0x7f0b001f
- public const int Platform_AppCompat_Light = 2131427359;
+ // aapt resource value: 0x7F0E018E
+ public const int picker_view_scale_anim = 2131624334;
- // aapt resource value: 0x7f0b007f
- public const int Platform_ThemeOverlay_AppCompat = 2131427455;
+ // aapt resource value: 0x7F0E018F
+ public const int picker_view_slide_anim = 2131624335;
- // aapt resource value: 0x7f0b0080
- public const int Platform_ThemeOverlay_AppCompat_Dark = 2131427456;
+ // aapt resource value: 0x7F0E00AB
+ public const int Platform_AppCompat = 2131624107;
- // aapt resource value: 0x7f0b0081
- public const int Platform_ThemeOverlay_AppCompat_Light = 2131427457;
+ // aapt resource value: 0x7F0E00AC
+ public const int Platform_AppCompat_Light = 2131624108;
- // aapt resource value: 0x7f0b0020
- public const int Platform_V11_AppCompat = 2131427360;
+ // aapt resource value: 0x7F0E00AD
+ public const int Platform_ThemeOverlay_AppCompat = 2131624109;
- // aapt resource value: 0x7f0b0021
- public const int Platform_V11_AppCompat_Light = 2131427361;
+ // aapt resource value: 0x7F0E00AE
+ public const int Platform_ThemeOverlay_AppCompat_Dark = 2131624110;
- // aapt resource value: 0x7f0b0028
- public const int Platform_V14_AppCompat = 2131427368;
+ // aapt resource value: 0x7F0E00AF
+ public const int Platform_ThemeOverlay_AppCompat_Light = 2131624111;
- // aapt resource value: 0x7f0b0029
- public const int Platform_V14_AppCompat_Light = 2131427369;
+ // aapt resource value: 0x7F0E00B0
+ public const int Platform_V11_AppCompat = 2131624112;
- // aapt resource value: 0x7f0b0082
- public const int Platform_V21_AppCompat = 2131427458;
+ // aapt resource value: 0x7F0E00B1
+ public const int Platform_V11_AppCompat_Light = 2131624113;
- // aapt resource value: 0x7f0b0083
- public const int Platform_V21_AppCompat_Light = 2131427459;
+ // aapt resource value: 0x7F0E00B2
+ public const int Platform_V14_AppCompat = 2131624114;
- // aapt resource value: 0x7f0b0097
- public const int Platform_V25_AppCompat = 2131427479;
+ // aapt resource value: 0x7F0E00B3
+ public const int Platform_V14_AppCompat_Light = 2131624115;
- // aapt resource value: 0x7f0b0098
- public const int Platform_V25_AppCompat_Light = 2131427480;
+ // aapt resource value: 0x7F0E00B4
+ public const int Platform_V21_AppCompat = 2131624116;
- // aapt resource value: 0x7f0b0022
- public const int Platform_Widget_AppCompat_Spinner = 2131427362;
+ // aapt resource value: 0x7F0E00B5
+ public const int Platform_V21_AppCompat_Light = 2131624117;
- // aapt resource value: 0x7f0b002b
- public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131427371;
+ // aapt resource value: 0x7F0E00B6
+ public const int Platform_V25_AppCompat = 2131624118;
- // aapt resource value: 0x7f0b002c
- public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131427372;
+ // aapt resource value: 0x7F0E00B7
+ public const int Platform_V25_AppCompat_Light = 2131624119;
- // aapt resource value: 0x7f0b002d
- public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131427373;
+ // aapt resource value: 0x7F0E00B8
+ public const int Platform_Widget_AppCompat_Spinner = 2131624120;
- // aapt resource value: 0x7f0b002e
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131427374;
+ // aapt resource value: 0x7F0E00B9
+ public const int RtlOverlay_DialogWindowTitle_AppCompat = 2131624121;
- // aapt resource value: 0x7f0b002f
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131427375;
+ // aapt resource value: 0x7F0E00BA
+ public const int RtlOverlay_Widget_AppCompat_ActionBar_TitleItem = 2131624122;
- // aapt resource value: 0x7f0b0030
- public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131427376;
+ // aapt resource value: 0x7F0E00BB
+ public const int RtlOverlay_Widget_AppCompat_DialogTitle_Icon = 2131624123;
- // aapt resource value: 0x7f0b0031
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131427377;
+ // aapt resource value: 0x7F0E00BC
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem = 2131624124;
- // aapt resource value: 0x7f0b0032
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131427378;
+ // aapt resource value: 0x7F0E00BD
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_InternalGroup = 2131624125;
- // aapt resource value: 0x7f0b0033
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131427379;
+ // aapt resource value: 0x7F0E00BE
+ public const int RtlOverlay_Widget_AppCompat_PopupMenuItem_Text = 2131624126;
- // aapt resource value: 0x7f0b0034
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131427380;
+ // aapt resource value: 0x7F0E00C4
+ public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131624132;
- // aapt resource value: 0x7f0b0035
- public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131427381;
+ // aapt resource value: 0x7F0E00BF
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown = 2131624127;
- // aapt resource value: 0x7f0b0036
- public const int RtlOverlay_Widget_AppCompat_SearchView_MagIcon = 2131427382;
+ // aapt resource value: 0x7F0E00C0
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon1 = 2131624128;
- // aapt resource value: 0x7f0b0037
- public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131427383;
+ // aapt resource value: 0x7F0E00C1
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Icon2 = 2131624129;
- // aapt resource value: 0x7f0b0038
- public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131427384;
+ // aapt resource value: 0x7F0E00C2
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Query = 2131624130;
- // aapt resource value: 0x7f0b00cf
- public const int TextAppearance_AppCompat = 2131427535;
+ // aapt resource value: 0x7F0E00C3
+ public const int RtlOverlay_Widget_AppCompat_Search_DropDown_Text = 2131624131;
- // aapt resource value: 0x7f0b00d0
- public const int TextAppearance_AppCompat_Body1 = 2131427536;
+ // aapt resource value: 0x7F0E00C5
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton = 2131624133;
- // aapt resource value: 0x7f0b00d1
- public const int TextAppearance_AppCompat_Body2 = 2131427537;
+ // aapt resource value: 0x7F0E00C6
+ public const int RtlUnderlay_Widget_AppCompat_ActionButton_Overflow = 2131624134;
- // aapt resource value: 0x7f0b00d2
- public const int TextAppearance_AppCompat_Button = 2131427538;
+ // aapt resource value: 0x7F0E00C7
+ public const int TextAppearance_AppCompat = 2131624135;
- // aapt resource value: 0x7f0b00d3
- public const int TextAppearance_AppCompat_Caption = 2131427539;
+ // aapt resource value: 0x7F0E00C8
+ public const int TextAppearance_AppCompat_Body1 = 2131624136;
- // aapt resource value: 0x7f0b00d4
- public const int TextAppearance_AppCompat_Display1 = 2131427540;
+ // aapt resource value: 0x7F0E00C9
+ public const int TextAppearance_AppCompat_Body2 = 2131624137;
- // aapt resource value: 0x7f0b00d5
- public const int TextAppearance_AppCompat_Display2 = 2131427541;
+ // aapt resource value: 0x7F0E00CA
+ public const int TextAppearance_AppCompat_Button = 2131624138;
- // aapt resource value: 0x7f0b00d6
- public const int TextAppearance_AppCompat_Display3 = 2131427542;
+ // aapt resource value: 0x7F0E00CB
+ public const int TextAppearance_AppCompat_Caption = 2131624139;
- // aapt resource value: 0x7f0b00d7
- public const int TextAppearance_AppCompat_Display4 = 2131427543;
+ // aapt resource value: 0x7F0E00CC
+ public const int TextAppearance_AppCompat_Display1 = 2131624140;
- // aapt resource value: 0x7f0b00d8
- public const int TextAppearance_AppCompat_Headline = 2131427544;
+ // aapt resource value: 0x7F0E00CD
+ public const int TextAppearance_AppCompat_Display2 = 2131624141;
- // aapt resource value: 0x7f0b00d9
- public const int TextAppearance_AppCompat_Inverse = 2131427545;
+ // aapt resource value: 0x7F0E00CE
+ public const int TextAppearance_AppCompat_Display3 = 2131624142;
- // aapt resource value: 0x7f0b00da
- public const int TextAppearance_AppCompat_Large = 2131427546;
+ // aapt resource value: 0x7F0E00CF
+ public const int TextAppearance_AppCompat_Display4 = 2131624143;
- // aapt resource value: 0x7f0b00db
- public const int TextAppearance_AppCompat_Large_Inverse = 2131427547;
+ // aapt resource value: 0x7F0E00D0
+ public const int TextAppearance_AppCompat_Headline = 2131624144;
- // aapt resource value: 0x7f0b00dc
- public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131427548;
+ // aapt resource value: 0x7F0E00D1
+ public const int TextAppearance_AppCompat_Inverse = 2131624145;
- // aapt resource value: 0x7f0b00dd
- public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131427549;
+ // aapt resource value: 0x7F0E00D2
+ public const int TextAppearance_AppCompat_Large = 2131624146;
- // aapt resource value: 0x7f0b00de
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131427550;
+ // aapt resource value: 0x7F0E00D3
+ public const int TextAppearance_AppCompat_Large_Inverse = 2131624147;
- // aapt resource value: 0x7f0b00df
- public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131427551;
+ // aapt resource value: 0x7F0E00D4
+ public const int TextAppearance_AppCompat_Light_SearchResult_Subtitle = 2131624148;
- // aapt resource value: 0x7f0b00e0
- public const int TextAppearance_AppCompat_Medium = 2131427552;
+ // aapt resource value: 0x7F0E00D5
+ public const int TextAppearance_AppCompat_Light_SearchResult_Title = 2131624149;
- // aapt resource value: 0x7f0b00e1
- public const int TextAppearance_AppCompat_Medium_Inverse = 2131427553;
+ // aapt resource value: 0x7F0E00D6
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Large = 2131624150;
- // aapt resource value: 0x7f0b00e2
- public const int TextAppearance_AppCompat_Menu = 2131427554;
+ // aapt resource value: 0x7F0E00D7
+ public const int TextAppearance_AppCompat_Light_Widget_PopupMenu_Small = 2131624151;
- // aapt resource value: 0x7f0b0084
- public const int TextAppearance_AppCompat_Notification = 2131427460;
+ // aapt resource value: 0x7F0E00D8
+ public const int TextAppearance_AppCompat_Medium = 2131624152;
- // aapt resource value: 0x7f0b0085
- public const int TextAppearance_AppCompat_Notification_Info = 2131427461;
+ // aapt resource value: 0x7F0E00D9
+ public const int TextAppearance_AppCompat_Medium_Inverse = 2131624153;
- // aapt resource value: 0x7f0b0086
- public const int TextAppearance_AppCompat_Notification_Info_Media = 2131427462;
+ // aapt resource value: 0x7F0E00DA
+ public const int TextAppearance_AppCompat_Menu = 2131624154;
- // aapt resource value: 0x7f0b00e3
- public const int TextAppearance_AppCompat_Notification_Line2 = 2131427555;
+ // aapt resource value: 0x7F0E00DB
+ public const int TextAppearance_AppCompat_Notification = 2131624155;
- // aapt resource value: 0x7f0b00e4
- public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131427556;
+ // aapt resource value: 0x7F0E00DC
+ public const int TextAppearance_AppCompat_Notification_Info = 2131624156;
- // aapt resource value: 0x7f0b0087
- public const int TextAppearance_AppCompat_Notification_Media = 2131427463;
+ // aapt resource value: 0x7F0E00DD
+ public const int TextAppearance_AppCompat_Notification_Info_Media = 2131624157;
- // aapt resource value: 0x7f0b0088
- public const int TextAppearance_AppCompat_Notification_Time = 2131427464;
+ // aapt resource value: 0x7F0E00DE
+ public const int TextAppearance_AppCompat_Notification_Line2 = 2131624158;
- // aapt resource value: 0x7f0b0089
- public const int TextAppearance_AppCompat_Notification_Time_Media = 2131427465;
+ // aapt resource value: 0x7F0E00DF
+ public const int TextAppearance_AppCompat_Notification_Line2_Media = 2131624159;
- // aapt resource value: 0x7f0b008a
- public const int TextAppearance_AppCompat_Notification_Title = 2131427466;
+ // aapt resource value: 0x7F0E00E0
+ public const int TextAppearance_AppCompat_Notification_Media = 2131624160;
- // aapt resource value: 0x7f0b008b
- public const int TextAppearance_AppCompat_Notification_Title_Media = 2131427467;
+ // aapt resource value: 0x7F0E00E1
+ public const int TextAppearance_AppCompat_Notification_Time = 2131624161;
- // aapt resource value: 0x7f0b00e5
- public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131427557;
+ // aapt resource value: 0x7F0E00E2
+ public const int TextAppearance_AppCompat_Notification_Time_Media = 2131624162;
- // aapt resource value: 0x7f0b00e6
- public const int TextAppearance_AppCompat_SearchResult_Title = 2131427558;
+ // aapt resource value: 0x7F0E00E3
+ public const int TextAppearance_AppCompat_Notification_Title = 2131624163;
- // aapt resource value: 0x7f0b00e7
- public const int TextAppearance_AppCompat_Small = 2131427559;
+ // aapt resource value: 0x7F0E00E4
+ public const int TextAppearance_AppCompat_Notification_Title_Media = 2131624164;
- // aapt resource value: 0x7f0b00e8
- public const int TextAppearance_AppCompat_Small_Inverse = 2131427560;
+ // aapt resource value: 0x7F0E00E5
+ public const int TextAppearance_AppCompat_SearchResult_Subtitle = 2131624165;
- // aapt resource value: 0x7f0b00e9
- public const int TextAppearance_AppCompat_Subhead = 2131427561;
+ // aapt resource value: 0x7F0E00E6
+ public const int TextAppearance_AppCompat_SearchResult_Title = 2131624166;
- // aapt resource value: 0x7f0b00ea
- public const int TextAppearance_AppCompat_Subhead_Inverse = 2131427562;
+ // aapt resource value: 0x7F0E00E7
+ public const int TextAppearance_AppCompat_Small = 2131624167;
- // aapt resource value: 0x7f0b00eb
- public const int TextAppearance_AppCompat_Title = 2131427563;
+ // aapt resource value: 0x7F0E00E8
+ public const int TextAppearance_AppCompat_Small_Inverse = 2131624168;
- // aapt resource value: 0x7f0b00ec
- public const int TextAppearance_AppCompat_Title_Inverse = 2131427564;
+ // aapt resource value: 0x7F0E00E9
+ public const int TextAppearance_AppCompat_Subhead = 2131624169;
- // aapt resource value: 0x7f0b002a
- public const int TextAppearance_AppCompat_Tooltip = 2131427370;
+ // aapt resource value: 0x7F0E00EA
+ public const int TextAppearance_AppCompat_Subhead_Inverse = 2131624170;
- // aapt resource value: 0x7f0b00ed
- public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131427565;
+ // aapt resource value: 0x7F0E00EB
+ public const int TextAppearance_AppCompat_Title = 2131624171;
- // aapt resource value: 0x7f0b00ee
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131427566;
+ // aapt resource value: 0x7F0E00EC
+ public const int TextAppearance_AppCompat_Title_Inverse = 2131624172;
- // aapt resource value: 0x7f0b00ef
- public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131427567;
+ // aapt resource value: 0x7F0E00ED
+ public const int TextAppearance_AppCompat_Tooltip = 2131624173;
- // aapt resource value: 0x7f0b00f0
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131427568;
+ // aapt resource value: 0x7F0E00EE
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Menu = 2131624174;
- // aapt resource value: 0x7f0b00f1
- public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131427569;
+ // aapt resource value: 0x7F0E00EF
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle = 2131624175;
- // aapt resource value: 0x7f0b00f2
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131427570;
+ // aapt resource value: 0x7F0E00F0
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Subtitle_Inverse = 2131624176;
- // aapt resource value: 0x7f0b00f3
- public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131427571;
+ // aapt resource value: 0x7F0E00F1
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title = 2131624177;
- // aapt resource value: 0x7f0b00f4
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131427572;
+ // aapt resource value: 0x7F0E00F2
+ public const int TextAppearance_AppCompat_Widget_ActionBar_Title_Inverse = 2131624178;
- // aapt resource value: 0x7f0b00f5
- public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131427573;
+ // aapt resource value: 0x7F0E00F3
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle = 2131624179;
- // aapt resource value: 0x7f0b00f6
- public const int TextAppearance_AppCompat_Widget_Button = 2131427574;
+ // aapt resource value: 0x7F0E00F4
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Subtitle_Inverse = 2131624180;
- // aapt resource value: 0x7f0b00f7
- public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131427575;
+ // aapt resource value: 0x7F0E00F5
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title = 2131624181;
- // aapt resource value: 0x7f0b00f8
- public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131427576;
+ // aapt resource value: 0x7F0E00F6
+ public const int TextAppearance_AppCompat_Widget_ActionMode_Title_Inverse = 2131624182;
- // aapt resource value: 0x7f0b00f9
- public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131427577;
+ // aapt resource value: 0x7F0E00F7
+ public const int TextAppearance_AppCompat_Widget_Button = 2131624183;
- // aapt resource value: 0x7f0b00fa
- public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131427578;
+ // aapt resource value: 0x7F0E00F8
+ public const int TextAppearance_AppCompat_Widget_Button_Borderless_Colored = 2131624184;
- // aapt resource value: 0x7f0b00fb
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131427579;
+ // aapt resource value: 0x7F0E00F9
+ public const int TextAppearance_AppCompat_Widget_Button_Colored = 2131624185;
- // aapt resource value: 0x7f0b00fc
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131427580;
+ // aapt resource value: 0x7F0E00FA
+ public const int TextAppearance_AppCompat_Widget_Button_Inverse = 2131624186;
- // aapt resource value: 0x7f0b00fd
- public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131427581;
+ // aapt resource value: 0x7F0E00FB
+ public const int TextAppearance_AppCompat_Widget_DropDownItem = 2131624187;
- // aapt resource value: 0x7f0b00fe
- public const int TextAppearance_AppCompat_Widget_Switch = 2131427582;
+ // aapt resource value: 0x7F0E00FC
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Header = 2131624188;
- // aapt resource value: 0x7f0b00ff
- public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131427583;
+ // aapt resource value: 0x7F0E00FD
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Large = 2131624189;
- // aapt resource value: 0x7f0b0183
- public const int TextAppearance_Compat_Notification = 2131427715;
+ // aapt resource value: 0x7F0E00FE
+ public const int TextAppearance_AppCompat_Widget_PopupMenu_Small = 2131624190;
- // aapt resource value: 0x7f0b0184
- public const int TextAppearance_Compat_Notification_Info = 2131427716;
+ // aapt resource value: 0x7F0E00FF
+ public const int TextAppearance_AppCompat_Widget_Switch = 2131624191;
- // aapt resource value: 0x7f0b0160
- public const int TextAppearance_Compat_Notification_Info_Media = 2131427680;
+ // aapt resource value: 0x7F0E0100
+ public const int TextAppearance_AppCompat_Widget_TextView_SpinnerItem = 2131624192;
- // aapt resource value: 0x7f0b0189
- public const int TextAppearance_Compat_Notification_Line2 = 2131427721;
+ // aapt resource value: 0x7F0E0101
+ public const int TextAppearance_Compat_Notification = 2131624193;
- // aapt resource value: 0x7f0b0164
- public const int TextAppearance_Compat_Notification_Line2_Media = 2131427684;
+ // aapt resource value: 0x7F0E0102
+ public const int TextAppearance_Compat_Notification_Info = 2131624194;
- // aapt resource value: 0x7f0b0161
- public const int TextAppearance_Compat_Notification_Media = 2131427681;
+ // aapt resource value: 0x7F0E0103
+ public const int TextAppearance_Compat_Notification_Info_Media = 2131624195;
- // aapt resource value: 0x7f0b0185
- public const int TextAppearance_Compat_Notification_Time = 2131427717;
+ // aapt resource value: 0x7F0E0104
+ public const int TextAppearance_Compat_Notification_Line2 = 2131624196;
- // aapt resource value: 0x7f0b0162
- public const int TextAppearance_Compat_Notification_Time_Media = 2131427682;
+ // aapt resource value: 0x7F0E0105
+ public const int TextAppearance_Compat_Notification_Line2_Media = 2131624197;
- // aapt resource value: 0x7f0b0186
- public const int TextAppearance_Compat_Notification_Title = 2131427718;
+ // aapt resource value: 0x7F0E0106
+ public const int TextAppearance_Compat_Notification_Media = 2131624198;
- // aapt resource value: 0x7f0b0163
- public const int TextAppearance_Compat_Notification_Title_Media = 2131427683;
+ // aapt resource value: 0x7F0E0107
+ public const int TextAppearance_Compat_Notification_Time = 2131624199;
- // aapt resource value: 0x7f0b016c
- public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131427692;
+ // aapt resource value: 0x7F0E0108
+ public const int TextAppearance_Compat_Notification_Time_Media = 2131624200;
- // aapt resource value: 0x7f0b016d
- public const int TextAppearance_Design_Counter = 2131427693;
+ // aapt resource value: 0x7F0E0109
+ public const int TextAppearance_Compat_Notification_Title = 2131624201;
- // aapt resource value: 0x7f0b016e
- public const int TextAppearance_Design_Counter_Overflow = 2131427694;
+ // aapt resource value: 0x7F0E010A
+ public const int TextAppearance_Compat_Notification_Title_Media = 2131624202;
- // aapt resource value: 0x7f0b016f
- public const int TextAppearance_Design_Error = 2131427695;
+ // aapt resource value: 0x7F0E010B
+ public const int TextAppearance_Design_CollapsingToolbar_Expanded = 2131624203;
- // aapt resource value: 0x7f0b0170
- public const int TextAppearance_Design_Hint = 2131427696;
+ // aapt resource value: 0x7F0E010C
+ public const int TextAppearance_Design_Counter = 2131624204;
- // aapt resource value: 0x7f0b0171
- public const int TextAppearance_Design_Snackbar_Message = 2131427697;
+ // aapt resource value: 0x7F0E010D
+ public const int TextAppearance_Design_Counter_Overflow = 2131624205;
- // aapt resource value: 0x7f0b0172
- public const int TextAppearance_Design_Tab = 2131427698;
+ // aapt resource value: 0x7F0E010E
+ public const int TextAppearance_Design_Error = 2131624206;
- // aapt resource value: 0x7f0b0100
- public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131427584;
+ // aapt resource value: 0x7F0E010F
+ public const int TextAppearance_Design_Hint = 2131624207;
- // aapt resource value: 0x7f0b0101
- public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131427585;
+ // aapt resource value: 0x7F0E0110
+ public const int TextAppearance_Design_Snackbar_Message = 2131624208;
- // aapt resource value: 0x7f0b0102
- public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131427586;
+ // aapt resource value: 0x7F0E0111
+ public const int TextAppearance_Design_Tab = 2131624209;
- // aapt resource value: 0x7f0b0103
- public const int Theme_AppCompat = 2131427587;
+ // aapt resource value: 0x7F0E0112
+ public const int TextAppearance_Widget_AppCompat_ExpandedMenu_Item = 2131624210;
- // aapt resource value: 0x7f0b0104
- public const int Theme_AppCompat_CompactMenu = 2131427588;
+ // aapt resource value: 0x7F0E0113
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Subtitle = 2131624211;
- // aapt resource value: 0x7f0b0004
- public const int Theme_AppCompat_DayNight = 2131427332;
+ // aapt resource value: 0x7F0E0114
+ public const int TextAppearance_Widget_AppCompat_Toolbar_Title = 2131624212;
- // aapt resource value: 0x7f0b0005
- public const int Theme_AppCompat_DayNight_DarkActionBar = 2131427333;
+ // aapt resource value: 0x7F0E0131
+ public const int ThemeOverlay_AppCompat = 2131624241;
- // aapt resource value: 0x7f0b0006
- public const int Theme_AppCompat_DayNight_Dialog = 2131427334;
+ // aapt resource value: 0x7F0E0132
+ public const int ThemeOverlay_AppCompat_ActionBar = 2131624242;
- // aapt resource value: 0x7f0b0007
- public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131427335;
+ // aapt resource value: 0x7F0E0133
+ public const int ThemeOverlay_AppCompat_Dark = 2131624243;
- // aapt resource value: 0x7f0b0008
- public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131427336;
+ // aapt resource value: 0x7F0E0134
+ public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131624244;
- // aapt resource value: 0x7f0b0009
- public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131427337;
+ // aapt resource value: 0x7F0E0135
+ public const int ThemeOverlay_AppCompat_Dialog = 2131624245;
- // aapt resource value: 0x7f0b000a
- public const int Theme_AppCompat_DayNight_NoActionBar = 2131427338;
+ // aapt resource value: 0x7F0E0136
+ public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131624246;
- // aapt resource value: 0x7f0b0105
- public const int Theme_AppCompat_Dialog = 2131427589;
+ // aapt resource value: 0x7F0E0137
+ public const int ThemeOverlay_AppCompat_Light = 2131624247;
- // aapt resource value: 0x7f0b0106
- public const int Theme_AppCompat_Dialog_Alert = 2131427590;
+ // aapt resource value: 0x7F0E0115
+ public const int Theme_AppCompat = 2131624213;
- // aapt resource value: 0x7f0b0107
- public const int Theme_AppCompat_Dialog_MinWidth = 2131427591;
+ // aapt resource value: 0x7F0E0116
+ public const int Theme_AppCompat_CompactMenu = 2131624214;
- // aapt resource value: 0x7f0b0108
- public const int Theme_AppCompat_DialogWhenLarge = 2131427592;
+ // aapt resource value: 0x7F0E0117
+ public const int Theme_AppCompat_DayNight = 2131624215;
- // aapt resource value: 0x7f0b0109
- public const int Theme_AppCompat_Light = 2131427593;
+ // aapt resource value: 0x7F0E0118
+ public const int Theme_AppCompat_DayNight_DarkActionBar = 2131624216;
- // aapt resource value: 0x7f0b010a
- public const int Theme_AppCompat_Light_DarkActionBar = 2131427594;
+ // aapt resource value: 0x7F0E0119
+ public const int Theme_AppCompat_DayNight_Dialog = 2131624217;
- // aapt resource value: 0x7f0b010b
- public const int Theme_AppCompat_Light_Dialog = 2131427595;
+ // aapt resource value: 0x7F0E011C
+ public const int Theme_AppCompat_DayNight_DialogWhenLarge = 2131624220;
- // aapt resource value: 0x7f0b010c
- public const int Theme_AppCompat_Light_Dialog_Alert = 2131427596;
+ // aapt resource value: 0x7F0E011A
+ public const int Theme_AppCompat_DayNight_Dialog_Alert = 2131624218;
- // aapt resource value: 0x7f0b010d
- public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131427597;
+ // aapt resource value: 0x7F0E011B
+ public const int Theme_AppCompat_DayNight_Dialog_MinWidth = 2131624219;
- // aapt resource value: 0x7f0b010e
- public const int Theme_AppCompat_Light_DialogWhenLarge = 2131427598;
+ // aapt resource value: 0x7F0E011D
+ public const int Theme_AppCompat_DayNight_NoActionBar = 2131624221;
- // aapt resource value: 0x7f0b010f
- public const int Theme_AppCompat_Light_NoActionBar = 2131427599;
+ // aapt resource value: 0x7F0E011E
+ public const int Theme_AppCompat_Dialog = 2131624222;
- // aapt resource value: 0x7f0b0110
- public const int Theme_AppCompat_NoActionBar = 2131427600;
+ // aapt resource value: 0x7F0E0121
+ public const int Theme_AppCompat_DialogWhenLarge = 2131624225;
- // aapt resource value: 0x7f0b018b
- public const int Theme_BiometricPromptDialog = 2131427723;
+ // aapt resource value: 0x7F0E011F
+ public const int Theme_AppCompat_Dialog_Alert = 2131624223;
- // aapt resource value: 0x7f0b0173
- public const int Theme_Design = 2131427699;
+ // aapt resource value: 0x7F0E0120
+ public const int Theme_AppCompat_Dialog_MinWidth = 2131624224;
- // aapt resource value: 0x7f0b0174
- public const int Theme_Design_BottomSheetDialog = 2131427700;
+ // aapt resource value: 0x7F0E0122
+ public const int Theme_AppCompat_Light = 2131624226;
- // aapt resource value: 0x7f0b0175
- public const int Theme_Design_Light = 2131427701;
+ // aapt resource value: 0x7F0E0123
+ public const int Theme_AppCompat_Light_DarkActionBar = 2131624227;
- // aapt resource value: 0x7f0b0176
- public const int Theme_Design_Light_BottomSheetDialog = 2131427702;
+ // aapt resource value: 0x7F0E0124
+ public const int Theme_AppCompat_Light_Dialog = 2131624228;
- // aapt resource value: 0x7f0b0177
- public const int Theme_Design_Light_NoActionBar = 2131427703;
+ // aapt resource value: 0x7F0E0127
+ public const int Theme_AppCompat_Light_DialogWhenLarge = 2131624231;
- // aapt resource value: 0x7f0b0178
- public const int Theme_Design_NoActionBar = 2131427704;
+ // aapt resource value: 0x7F0E0125
+ public const int Theme_AppCompat_Light_Dialog_Alert = 2131624229;
- // aapt resource value: 0x7f0b0111
- public const int ThemeOverlay_AppCompat = 2131427601;
+ // aapt resource value: 0x7F0E0126
+ public const int Theme_AppCompat_Light_Dialog_MinWidth = 2131624230;
- // aapt resource value: 0x7f0b0112
- public const int ThemeOverlay_AppCompat_ActionBar = 2131427602;
+ // aapt resource value: 0x7F0E0128
+ public const int Theme_AppCompat_Light_NoActionBar = 2131624232;
- // aapt resource value: 0x7f0b0113
- public const int ThemeOverlay_AppCompat_Dark = 2131427603;
+ // aapt resource value: 0x7F0E0129
+ public const int Theme_AppCompat_NoActionBar = 2131624233;
- // aapt resource value: 0x7f0b0114
- public const int ThemeOverlay_AppCompat_Dark_ActionBar = 2131427604;
+ // aapt resource value: 0x7F0E012A
+ public const int Theme_BiometricPromptDialog = 2131624234;
- // aapt resource value: 0x7f0b0115
- public const int ThemeOverlay_AppCompat_Dialog = 2131427605;
+ // aapt resource value: 0x7F0E012B
+ public const int Theme_Design = 2131624235;
- // aapt resource value: 0x7f0b0116
- public const int ThemeOverlay_AppCompat_Dialog_Alert = 2131427606;
+ // aapt resource value: 0x7F0E012C
+ public const int Theme_Design_BottomSheetDialog = 2131624236;
- // aapt resource value: 0x7f0b0117
- public const int ThemeOverlay_AppCompat_Light = 2131427607;
+ // aapt resource value: 0x7F0E012D
+ public const int Theme_Design_Light = 2131624237;
- // aapt resource value: 0x7f0b0118
- public const int Widget_AppCompat_ActionBar = 2131427608;
+ // aapt resource value: 0x7F0E012E
+ public const int Theme_Design_Light_BottomSheetDialog = 2131624238;
- // aapt resource value: 0x7f0b0119
- public const int Widget_AppCompat_ActionBar_Solid = 2131427609;
+ // aapt resource value: 0x7F0E012F
+ public const int Theme_Design_Light_NoActionBar = 2131624239;
- // aapt resource value: 0x7f0b011a
- public const int Widget_AppCompat_ActionBar_TabBar = 2131427610;
+ // aapt resource value: 0x7F0E0130
+ public const int Theme_Design_NoActionBar = 2131624240;
- // aapt resource value: 0x7f0b011b
- public const int Widget_AppCompat_ActionBar_TabText = 2131427611;
+ // aapt resource value: 0x7F0E0138
+ public const int Widget_AppCompat_ActionBar = 2131624248;
- // aapt resource value: 0x7f0b011c
- public const int Widget_AppCompat_ActionBar_TabView = 2131427612;
+ // aapt resource value: 0x7F0E0139
+ public const int Widget_AppCompat_ActionBar_Solid = 2131624249;
- // aapt resource value: 0x7f0b011d
- public const int Widget_AppCompat_ActionButton = 2131427613;
+ // aapt resource value: 0x7F0E013A
+ public const int Widget_AppCompat_ActionBar_TabBar = 2131624250;
- // aapt resource value: 0x7f0b011e
- public const int Widget_AppCompat_ActionButton_CloseMode = 2131427614;
+ // aapt resource value: 0x7F0E013B
+ public const int Widget_AppCompat_ActionBar_TabText = 2131624251;
- // aapt resource value: 0x7f0b011f
- public const int Widget_AppCompat_ActionButton_Overflow = 2131427615;
+ // aapt resource value: 0x7F0E013C
+ public const int Widget_AppCompat_ActionBar_TabView = 2131624252;
- // aapt resource value: 0x7f0b0120
- public const int Widget_AppCompat_ActionMode = 2131427616;
+ // aapt resource value: 0x7F0E013D
+ public const int Widget_AppCompat_ActionButton = 2131624253;
- // aapt resource value: 0x7f0b0121
- public const int Widget_AppCompat_ActivityChooserView = 2131427617;
+ // aapt resource value: 0x7F0E013E
+ public const int Widget_AppCompat_ActionButton_CloseMode = 2131624254;
- // aapt resource value: 0x7f0b0122
- public const int Widget_AppCompat_AutoCompleteTextView = 2131427618;
+ // aapt resource value: 0x7F0E013F
+ public const int Widget_AppCompat_ActionButton_Overflow = 2131624255;
- // aapt resource value: 0x7f0b0123
- public const int Widget_AppCompat_Button = 2131427619;
+ // aapt resource value: 0x7F0E0140
+ public const int Widget_AppCompat_ActionMode = 2131624256;
- // aapt resource value: 0x7f0b0124
- public const int Widget_AppCompat_Button_Borderless = 2131427620;
+ // aapt resource value: 0x7F0E0141
+ public const int Widget_AppCompat_ActivityChooserView = 2131624257;
- // aapt resource value: 0x7f0b0125
- public const int Widget_AppCompat_Button_Borderless_Colored = 2131427621;
+ // aapt resource value: 0x7F0E0142
+ public const int Widget_AppCompat_AutoCompleteTextView = 2131624258;
- // aapt resource value: 0x7f0b0126
- public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131427622;
+ // aapt resource value: 0x7F0E0143
+ public const int Widget_AppCompat_Button = 2131624259;
- // aapt resource value: 0x7f0b0127
- public const int Widget_AppCompat_Button_Colored = 2131427623;
+ // aapt resource value: 0x7F0E0149
+ public const int Widget_AppCompat_ButtonBar = 2131624265;
- // aapt resource value: 0x7f0b0128
- public const int Widget_AppCompat_Button_Small = 2131427624;
+ // aapt resource value: 0x7F0E014A
+ public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131624266;
- // aapt resource value: 0x7f0b0129
- public const int Widget_AppCompat_ButtonBar = 2131427625;
+ // aapt resource value: 0x7F0E0144
+ public const int Widget_AppCompat_Button_Borderless = 2131624260;
- // aapt resource value: 0x7f0b012a
- public const int Widget_AppCompat_ButtonBar_AlertDialog = 2131427626;
+ // aapt resource value: 0x7F0E0145
+ public const int Widget_AppCompat_Button_Borderless_Colored = 2131624261;
- // aapt resource value: 0x7f0b012b
- public const int Widget_AppCompat_CompoundButton_CheckBox = 2131427627;
+ // aapt resource value: 0x7F0E0146
+ public const int Widget_AppCompat_Button_ButtonBar_AlertDialog = 2131624262;
- // aapt resource value: 0x7f0b012c
- public const int Widget_AppCompat_CompoundButton_RadioButton = 2131427628;
+ // aapt resource value: 0x7F0E0147
+ public const int Widget_AppCompat_Button_Colored = 2131624263;
- // aapt resource value: 0x7f0b012d
- public const int Widget_AppCompat_CompoundButton_Switch = 2131427629;
+ // aapt resource value: 0x7F0E0148
+ public const int Widget_AppCompat_Button_Small = 2131624264;
- // aapt resource value: 0x7f0b012e
- public const int Widget_AppCompat_DrawerArrowToggle = 2131427630;
+ // aapt resource value: 0x7F0E014B
+ public const int Widget_AppCompat_CompoundButton_CheckBox = 2131624267;
- // aapt resource value: 0x7f0b012f
- public const int Widget_AppCompat_DropDownItem_Spinner = 2131427631;
+ // aapt resource value: 0x7F0E014C
+ public const int Widget_AppCompat_CompoundButton_RadioButton = 2131624268;
- // aapt resource value: 0x7f0b0130
- public const int Widget_AppCompat_EditText = 2131427632;
+ // aapt resource value: 0x7F0E014D
+ public const int Widget_AppCompat_CompoundButton_Switch = 2131624269;
- // aapt resource value: 0x7f0b0131
- public const int Widget_AppCompat_ImageButton = 2131427633;
+ // aapt resource value: 0x7F0E014E
+ public const int Widget_AppCompat_DrawerArrowToggle = 2131624270;
- // aapt resource value: 0x7f0b0132
- public const int Widget_AppCompat_Light_ActionBar = 2131427634;
+ // aapt resource value: 0x7F0E014F
+ public const int Widget_AppCompat_DropDownItem_Spinner = 2131624271;
- // aapt resource value: 0x7f0b0133
- public const int Widget_AppCompat_Light_ActionBar_Solid = 2131427635;
+ // aapt resource value: 0x7F0E0150
+ public const int Widget_AppCompat_EditText = 2131624272;
- // aapt resource value: 0x7f0b0134
- public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131427636;
+ // aapt resource value: 0x7F0E0151
+ public const int Widget_AppCompat_ImageButton = 2131624273;
- // aapt resource value: 0x7f0b0135
- public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131427637;
+ // aapt resource value: 0x7F0E0152
+ public const int Widget_AppCompat_Light_ActionBar = 2131624274;
- // aapt resource value: 0x7f0b0136
- public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131427638;
+ // aapt resource value: 0x7F0E0153
+ public const int Widget_AppCompat_Light_ActionBar_Solid = 2131624275;
- // aapt resource value: 0x7f0b0137
- public const int Widget_AppCompat_Light_ActionBar_TabText = 2131427639;
+ // aapt resource value: 0x7F0E0154
+ public const int Widget_AppCompat_Light_ActionBar_Solid_Inverse = 2131624276;
- // aapt resource value: 0x7f0b0138
- public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131427640;
+ // aapt resource value: 0x7F0E0155
+ public const int Widget_AppCompat_Light_ActionBar_TabBar = 2131624277;
- // aapt resource value: 0x7f0b0139
- public const int Widget_AppCompat_Light_ActionBar_TabView = 2131427641;
+ // aapt resource value: 0x7F0E0156
+ public const int Widget_AppCompat_Light_ActionBar_TabBar_Inverse = 2131624278;
- // aapt resource value: 0x7f0b013a
- public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131427642;
+ // aapt resource value: 0x7F0E0157
+ public const int Widget_AppCompat_Light_ActionBar_TabText = 2131624279;
- // aapt resource value: 0x7f0b013b
- public const int Widget_AppCompat_Light_ActionButton = 2131427643;
+ // aapt resource value: 0x7F0E0158
+ public const int Widget_AppCompat_Light_ActionBar_TabText_Inverse = 2131624280;
- // aapt resource value: 0x7f0b013c
- public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131427644;
+ // aapt resource value: 0x7F0E0159
+ public const int Widget_AppCompat_Light_ActionBar_TabView = 2131624281;
- // aapt resource value: 0x7f0b013d
- public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131427645;
+ // aapt resource value: 0x7F0E015A
+ public const int Widget_AppCompat_Light_ActionBar_TabView_Inverse = 2131624282;
- // aapt resource value: 0x7f0b013e
- public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131427646;
+ // aapt resource value: 0x7F0E015B
+ public const int Widget_AppCompat_Light_ActionButton = 2131624283;
- // aapt resource value: 0x7f0b013f
- public const int Widget_AppCompat_Light_ActivityChooserView = 2131427647;
+ // aapt resource value: 0x7F0E015C
+ public const int Widget_AppCompat_Light_ActionButton_CloseMode = 2131624284;
- // aapt resource value: 0x7f0b0140
- public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131427648;
+ // aapt resource value: 0x7F0E015D
+ public const int Widget_AppCompat_Light_ActionButton_Overflow = 2131624285;
- // aapt resource value: 0x7f0b0141
- public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131427649;
+ // aapt resource value: 0x7F0E015E
+ public const int Widget_AppCompat_Light_ActionMode_Inverse = 2131624286;
- // aapt resource value: 0x7f0b0142
- public const int Widget_AppCompat_Light_ListPopupWindow = 2131427650;
+ // aapt resource value: 0x7F0E015F
+ public const int Widget_AppCompat_Light_ActivityChooserView = 2131624287;
- // aapt resource value: 0x7f0b0143
- public const int Widget_AppCompat_Light_ListView_DropDown = 2131427651;
+ // aapt resource value: 0x7F0E0160
+ public const int Widget_AppCompat_Light_AutoCompleteTextView = 2131624288;
- // aapt resource value: 0x7f0b0144
- public const int Widget_AppCompat_Light_PopupMenu = 2131427652;
+ // aapt resource value: 0x7F0E0161
+ public const int Widget_AppCompat_Light_DropDownItem_Spinner = 2131624289;
- // aapt resource value: 0x7f0b0145
- public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131427653;
+ // aapt resource value: 0x7F0E0162
+ public const int Widget_AppCompat_Light_ListPopupWindow = 2131624290;
- // aapt resource value: 0x7f0b0146
- public const int Widget_AppCompat_Light_SearchView = 2131427654;
+ // aapt resource value: 0x7F0E0163
+ public const int Widget_AppCompat_Light_ListView_DropDown = 2131624291;
- // aapt resource value: 0x7f0b0147
- public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131427655;
+ // aapt resource value: 0x7F0E0164
+ public const int Widget_AppCompat_Light_PopupMenu = 2131624292;
- // aapt resource value: 0x7f0b0148
- public const int Widget_AppCompat_ListMenuView = 2131427656;
+ // aapt resource value: 0x7F0E0165
+ public const int Widget_AppCompat_Light_PopupMenu_Overflow = 2131624293;
- // aapt resource value: 0x7f0b0149
- public const int Widget_AppCompat_ListPopupWindow = 2131427657;
+ // aapt resource value: 0x7F0E0166
+ public const int Widget_AppCompat_Light_SearchView = 2131624294;
- // aapt resource value: 0x7f0b014a
- public const int Widget_AppCompat_ListView = 2131427658;
+ // aapt resource value: 0x7F0E0167
+ public const int Widget_AppCompat_Light_Spinner_DropDown_ActionBar = 2131624295;
- // aapt resource value: 0x7f0b014b
- public const int Widget_AppCompat_ListView_DropDown = 2131427659;
+ // aapt resource value: 0x7F0E0168
+ public const int Widget_AppCompat_ListMenuView = 2131624296;
- // aapt resource value: 0x7f0b014c
- public const int Widget_AppCompat_ListView_Menu = 2131427660;
+ // aapt resource value: 0x7F0E0169
+ public const int Widget_AppCompat_ListPopupWindow = 2131624297;
- // aapt resource value: 0x7f0b014d
- public const int Widget_AppCompat_PopupMenu = 2131427661;
+ // aapt resource value: 0x7F0E016A
+ public const int Widget_AppCompat_ListView = 2131624298;
- // aapt resource value: 0x7f0b014e
- public const int Widget_AppCompat_PopupMenu_Overflow = 2131427662;
+ // aapt resource value: 0x7F0E016B
+ public const int Widget_AppCompat_ListView_DropDown = 2131624299;
- // aapt resource value: 0x7f0b014f
- public const int Widget_AppCompat_PopupWindow = 2131427663;
+ // aapt resource value: 0x7F0E016C
+ public const int Widget_AppCompat_ListView_Menu = 2131624300;
- // aapt resource value: 0x7f0b0150
- public const int Widget_AppCompat_ProgressBar = 2131427664;
+ // aapt resource value: 0x7F0E016D
+ public const int Widget_AppCompat_PopupMenu = 2131624301;
- // aapt resource value: 0x7f0b0151
- public const int Widget_AppCompat_ProgressBar_Horizontal = 2131427665;
+ // aapt resource value: 0x7F0E016E
+ public const int Widget_AppCompat_PopupMenu_Overflow = 2131624302;
- // aapt resource value: 0x7f0b0152
- public const int Widget_AppCompat_RatingBar = 2131427666;
+ // aapt resource value: 0x7F0E016F
+ public const int Widget_AppCompat_PopupWindow = 2131624303;
- // aapt resource value: 0x7f0b0153
- public const int Widget_AppCompat_RatingBar_Indicator = 2131427667;
+ // aapt resource value: 0x7F0E0170
+ public const int Widget_AppCompat_ProgressBar = 2131624304;
- // aapt resource value: 0x7f0b0154
- public const int Widget_AppCompat_RatingBar_Small = 2131427668;
+ // aapt resource value: 0x7F0E0171
+ public const int Widget_AppCompat_ProgressBar_Horizontal = 2131624305;
- // aapt resource value: 0x7f0b0155
- public const int Widget_AppCompat_SearchView = 2131427669;
+ // aapt resource value: 0x7F0E0172
+ public const int Widget_AppCompat_RatingBar = 2131624306;
- // aapt resource value: 0x7f0b0156
- public const int Widget_AppCompat_SearchView_ActionBar = 2131427670;
+ // aapt resource value: 0x7F0E0173
+ public const int Widget_AppCompat_RatingBar_Indicator = 2131624307;
- // aapt resource value: 0x7f0b0157
- public const int Widget_AppCompat_SeekBar = 2131427671;
+ // aapt resource value: 0x7F0E0174
+ public const int Widget_AppCompat_RatingBar_Small = 2131624308;
- // aapt resource value: 0x7f0b0158
- public const int Widget_AppCompat_SeekBar_Discrete = 2131427672;
+ // aapt resource value: 0x7F0E0175
+ public const int Widget_AppCompat_SearchView = 2131624309;
- // aapt resource value: 0x7f0b0159
- public const int Widget_AppCompat_Spinner = 2131427673;
+ // aapt resource value: 0x7F0E0176
+ public const int Widget_AppCompat_SearchView_ActionBar = 2131624310;
- // aapt resource value: 0x7f0b015a
- public const int Widget_AppCompat_Spinner_DropDown = 2131427674;
+ // aapt resource value: 0x7F0E0177
+ public const int Widget_AppCompat_SeekBar = 2131624311;
- // aapt resource value: 0x7f0b015b
- public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131427675;
+ // aapt resource value: 0x7F0E0178
+ public const int Widget_AppCompat_SeekBar_Discrete = 2131624312;
- // aapt resource value: 0x7f0b015c
- public const int Widget_AppCompat_Spinner_Underlined = 2131427676;
+ // aapt resource value: 0x7F0E0179
+ public const int Widget_AppCompat_Spinner = 2131624313;
- // aapt resource value: 0x7f0b015d
- public const int Widget_AppCompat_TextView_SpinnerItem = 2131427677;
+ // aapt resource value: 0x7F0E017A
+ public const int Widget_AppCompat_Spinner_DropDown = 2131624314;
- // aapt resource value: 0x7f0b015e
- public const int Widget_AppCompat_Toolbar = 2131427678;
+ // aapt resource value: 0x7F0E017B
+ public const int Widget_AppCompat_Spinner_DropDown_ActionBar = 2131624315;
- // aapt resource value: 0x7f0b015f
- public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131427679;
+ // aapt resource value: 0x7F0E017C
+ public const int Widget_AppCompat_Spinner_Underlined = 2131624316;
- // aapt resource value: 0x7f0b0187
- public const int Widget_Compat_NotificationActionContainer = 2131427719;
+ // aapt resource value: 0x7F0E017D
+ public const int Widget_AppCompat_TextView_SpinnerItem = 2131624317;
- // aapt resource value: 0x7f0b0188
- public const int Widget_Compat_NotificationActionText = 2131427720;
+ // aapt resource value: 0x7F0E017E
+ public const int Widget_AppCompat_Toolbar = 2131624318;
- // aapt resource value: 0x7f0b0179
- public const int Widget_Design_AppBarLayout = 2131427705;
+ // aapt resource value: 0x7F0E017F
+ public const int Widget_AppCompat_Toolbar_Button_Navigation = 2131624319;
- // aapt resource value: 0x7f0b017a
- public const int Widget_Design_BottomNavigationView = 2131427706;
+ // aapt resource value: 0x7F0E0180
+ public const int Widget_Compat_NotificationActionContainer = 2131624320;
- // aapt resource value: 0x7f0b017b
- public const int Widget_Design_BottomSheet_Modal = 2131427707;
+ // aapt resource value: 0x7F0E0181
+ public const int Widget_Compat_NotificationActionText = 2131624321;
- // aapt resource value: 0x7f0b017c
- public const int Widget_Design_CollapsingToolbar = 2131427708;
+ // aapt resource value: 0x7F0E0182
+ public const int Widget_Design_AppBarLayout = 2131624322;
- // aapt resource value: 0x7f0b017d
- public const int Widget_Design_CoordinatorLayout = 2131427709;
+ // aapt resource value: 0x7F0E0183
+ public const int Widget_Design_BottomNavigationView = 2131624323;
- // aapt resource value: 0x7f0b017e
- public const int Widget_Design_FloatingActionButton = 2131427710;
+ // aapt resource value: 0x7F0E0184
+ public const int Widget_Design_BottomSheet_Modal = 2131624324;
- // aapt resource value: 0x7f0b017f
- public const int Widget_Design_NavigationView = 2131427711;
+ // aapt resource value: 0x7F0E0185
+ public const int Widget_Design_CollapsingToolbar = 2131624325;
- // aapt resource value: 0x7f0b0180
- public const int Widget_Design_ScrimInsetsFrameLayout = 2131427712;
+ // aapt resource value: 0x7F0E0186
+ public const int Widget_Design_CoordinatorLayout = 2131624326;
- // aapt resource value: 0x7f0b0181
- public const int Widget_Design_Snackbar = 2131427713;
+ // aapt resource value: 0x7F0E0187
+ public const int Widget_Design_FloatingActionButton = 2131624327;
- // aapt resource value: 0x7f0b0165
- public const int Widget_Design_TabLayout = 2131427685;
+ // aapt resource value: 0x7F0E0188
+ public const int Widget_Design_NavigationView = 2131624328;
- // aapt resource value: 0x7f0b0182
- public const int Widget_Design_TextInputLayout = 2131427714;
+ // aapt resource value: 0x7F0E0189
+ public const int Widget_Design_ScrimInsetsFrameLayout = 2131624329;
- // aapt resource value: 0x7f0b018c
- public const int custom_dialog2 = 2131427724;
+ // aapt resource value: 0x7F0E018A
+ public const int Widget_Design_Snackbar = 2131624330;
- // aapt resource value: 0x7f0b018d
- public const int picker_view_scale_anim = 2131427725;
+ // aapt resource value: 0x7F0E018B
+ public const int Widget_Design_TabLayout = 2131624331;
- // aapt resource value: 0x7f0b018e
- public const int picker_view_slide_anim = 2131427726;
+ // aapt resource value: 0x7F0E018C
+ public const int Widget_Design_TextInputLayout = 2131624332;
static Style()
{
@@ -5436,204 +5418,193 @@
}
}
- public partial class Xml
- {
-
- // aapt resource value: 0x7f070000
- public const int file_paths = 2131165184;
-
- // aapt resource value: 0x7f070001
- public const int hdl_filepaths = 2131165185;
-
- static Xml()
- {
- global::Android.Runtime.ResourceIdManager.UpdateIdValues();
- }
-
- private Xml()
- {
- }
- }
-
public partial class Styleable
{
+ // aapt resource value: { 0x7F040042,0x7F040043,0x7F040044,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F040083,0x7F040087,0x7F040088,0x7F040093,0x7F0400B4,0x7F0400B5,0x7F0400B9,0x7F0400BA,0x7F0400BB,0x7F0400C0,0x7F0400C6,0x7F0400E3,0x7F0400EC,0x7F0400FC,0x7F040100,0x7F040101,0x7F040168,0x7F04016B,0x7F040197,0x7F0401A1 }
public static int[] ActionBar = new int[] {
- 2130771978,
- 2130771980,
- 2130771981,
- 2130771982,
- 2130771983,
- 2130771984,
- 2130771985,
- 2130771986,
- 2130771987,
- 2130771988,
- 2130771989,
- 2130771990,
- 2130771991,
- 2130771992,
- 2130771993,
- 2130771994,
- 2130771995,
- 2130771996,
- 2130771997,
- 2130771998,
- 2130771999,
- 2130772000,
- 2130772001,
- 2130772002,
- 2130772003,
- 2130772004,
- 2130772005,
- 2130772006,
- 2130772076};
+ 2130968642,
+ 2130968643,
+ 2130968644,
+ 2130968690,
+ 2130968691,
+ 2130968692,
+ 2130968693,
+ 2130968694,
+ 2130968695,
+ 2130968707,
+ 2130968711,
+ 2130968712,
+ 2130968723,
+ 2130968756,
+ 2130968757,
+ 2130968761,
+ 2130968762,
+ 2130968763,
+ 2130968768,
+ 2130968774,
+ 2130968803,
+ 2130968812,
+ 2130968828,
+ 2130968832,
+ 2130968833,
+ 2130968936,
+ 2130968939,
+ 2130968983,
+ 2130968993};
- // aapt resource value: 10
- public const int ActionBar_background = 10;
-
- // aapt resource value: 12
- public const int ActionBar_backgroundSplit = 12;
-
- // aapt resource value: 11
- public const int ActionBar_backgroundStacked = 11;
-
- // aapt resource value: 21
- public const int ActionBar_contentInsetEnd = 21;
-
- // aapt resource value: 25
- public const int ActionBar_contentInsetEndWithActions = 25;
-
- // aapt resource value: 22
- public const int ActionBar_contentInsetLeft = 22;
-
- // aapt resource value: 23
- public const int ActionBar_contentInsetRight = 23;
-
- // aapt resource value: 20
- public const int ActionBar_contentInsetStart = 20;
-
- // aapt resource value: 24
- public const int ActionBar_contentInsetStartWithNavigation = 24;
-
- // aapt resource value: 13
- public const int ActionBar_customNavigationLayout = 13;
-
- // aapt resource value: 3
- public const int ActionBar_displayOptions = 3;
-
- // aapt resource value: 9
- public const int ActionBar_divider = 9;
-
- // aapt resource value: 26
- public const int ActionBar_elevation = 26;
-
- // aapt resource value: 0
- public const int ActionBar_height = 0;
-
- // aapt resource value: 19
- public const int ActionBar_hideOnContentScroll = 19;
-
- // aapt resource value: 28
- public const int ActionBar_homeAsUpIndicator = 28;
-
- // aapt resource value: 14
- public const int ActionBar_homeLayout = 14;
-
- // aapt resource value: 7
- public const int ActionBar_icon = 7;
-
- // aapt resource value: 16
- public const int ActionBar_indeterminateProgressStyle = 16;
-
- // aapt resource value: 18
- public const int ActionBar_itemPadding = 18;
-
- // aapt resource value: 8
- public const int ActionBar_logo = 8;
-
- // aapt resource value: 2
- public const int ActionBar_navigationMode = 2;
-
- // aapt resource value: 27
- public const int ActionBar_popupTheme = 27;
-
- // aapt resource value: 17
- public const int ActionBar_progressBarPadding = 17;
-
- // aapt resource value: 15
- public const int ActionBar_progressBarStyle = 15;
-
- // aapt resource value: 4
- public const int ActionBar_subtitle = 4;
-
- // aapt resource value: 6
- public const int ActionBar_subtitleTextStyle = 6;
-
- // aapt resource value: 1
- public const int ActionBar_title = 1;
-
- // aapt resource value: 5
- public const int ActionBar_titleTextStyle = 5;
-
+ // aapt resource value: { 0x10100B3 }
public static int[] ActionBarLayout = new int[] {
16842931};
// aapt resource value: 0
public const int ActionBarLayout_android_layout_gravity = 0;
+ // aapt resource value: 0
+ public const int ActionBar_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionBar_backgroundSplit = 1;
+
+ // aapt resource value: 2
+ public const int ActionBar_backgroundStacked = 2;
+
+ // aapt resource value: 3
+ public const int ActionBar_contentInsetEnd = 3;
+
+ // aapt resource value: 4
+ public const int ActionBar_contentInsetEndWithActions = 4;
+
+ // aapt resource value: 5
+ public const int ActionBar_contentInsetLeft = 5;
+
+ // aapt resource value: 6
+ public const int ActionBar_contentInsetRight = 6;
+
+ // aapt resource value: 7
+ public const int ActionBar_contentInsetStart = 7;
+
+ // aapt resource value: 8
+ public const int ActionBar_contentInsetStartWithNavigation = 8;
+
+ // aapt resource value: 9
+ public const int ActionBar_customNavigationLayout = 9;
+
+ // aapt resource value: 10
+ public const int ActionBar_displayOptions = 10;
+
+ // aapt resource value: 11
+ public const int ActionBar_divider = 11;
+
+ // aapt resource value: 12
+ public const int ActionBar_elevation = 12;
+
+ // aapt resource value: 13
+ public const int ActionBar_height = 13;
+
+ // aapt resource value: 14
+ public const int ActionBar_hideOnContentScroll = 14;
+
+ // aapt resource value: 15
+ public const int ActionBar_homeAsUpIndicator = 15;
+
+ // aapt resource value: 16
+ public const int ActionBar_homeLayout = 16;
+
+ // aapt resource value: 17
+ public const int ActionBar_icon = 17;
+
+ // aapt resource value: 18
+ public const int ActionBar_indeterminateProgressStyle = 18;
+
+ // aapt resource value: 19
+ public const int ActionBar_itemPadding = 19;
+
+ // aapt resource value: 20
+ public const int ActionBar_logo = 20;
+
+ // aapt resource value: 21
+ public const int ActionBar_navigationMode = 21;
+
+ // aapt resource value: 22
+ public const int ActionBar_popupTheme = 22;
+
+ // aapt resource value: 23
+ public const int ActionBar_progressBarPadding = 23;
+
+ // aapt resource value: 24
+ public const int ActionBar_progressBarStyle = 24;
+
+ // aapt resource value: 25
+ public const int ActionBar_subtitle = 25;
+
+ // aapt resource value: 26
+ public const int ActionBar_subtitleTextStyle = 26;
+
+ // aapt resource value: 27
+ public const int ActionBar_title = 27;
+
+ // aapt resource value: 28
+ public const int ActionBar_titleTextStyle = 28;
+
+ // aapt resource value: { 0x101013F }
public static int[] ActionMenuItemView = new int[] {
16843071};
// aapt resource value: 0
public const int ActionMenuItemView_android_minWidth = 0;
- public static int[] ActionMenuView;
+ // aapt resource value: { 0xFFFFFFFF }
+ public static int[] ActionMenuView = new int[] {
+ -1};
+ // aapt resource value: { 0x7F040042,0x7F040043,0x7F040060,0x7F0400B4,0x7F04016B,0x7F0401A1 }
public static int[] ActionMode = new int[] {
- 2130771978,
- 2130771984,
- 2130771985,
- 2130771989,
- 2130771991,
- 2130772007};
-
- // aapt resource value: 3
- public const int ActionMode_background = 3;
-
- // aapt resource value: 4
- public const int ActionMode_backgroundSplit = 4;
-
- // aapt resource value: 5
- public const int ActionMode_closeItemLayout = 5;
+ 2130968642,
+ 2130968643,
+ 2130968672,
+ 2130968756,
+ 2130968939,
+ 2130968993};
// aapt resource value: 0
- public const int ActionMode_height = 0;
+ public const int ActionMode_background = 0;
+
+ // aapt resource value: 1
+ public const int ActionMode_backgroundSplit = 1;
// aapt resource value: 2
- public const int ActionMode_subtitleTextStyle = 2;
+ public const int ActionMode_closeItemLayout = 2;
- // aapt resource value: 1
- public const int ActionMode_titleTextStyle = 1;
+ // aapt resource value: 3
+ public const int ActionMode_height = 3;
+ // aapt resource value: 4
+ public const int ActionMode_subtitleTextStyle = 4;
+
+ // aapt resource value: 5
+ public const int ActionMode_titleTextStyle = 5;
+
+ // aapt resource value: { 0x7F040096,0x7F0400C1 }
public static int[] ActivityChooserView = new int[] {
- 2130772008,
- 2130772009};
-
- // aapt resource value: 1
- public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 1;
+ 2130968726,
+ 2130968769};
// aapt resource value: 0
- public const int ActivityChooserView_initialActivityCount = 0;
+ public const int ActivityChooserView_expandActivityOverflowButtonDrawable = 0;
+ // aapt resource value: 1
+ public const int ActivityChooserView_initialActivityCount = 1;
+
+ // aapt resource value: { 0x10100F2,0x7F040058,0x7F0400DA,0x7F0400DB,0x7F0400E9,0x7F040117,0x7F040118 }
public static int[] AlertDialog = new int[] {
16842994,
- 2130772010,
- 2130772011,
- 2130772012,
- 2130772013,
- 2130772014,
- 2130772015};
+ 2130968664,
+ 2130968794,
+ 2130968795,
+ 2130968809,
+ 2130968855,
+ 2130968856};
// aapt resource value: 0
public const int AlertDialog_android_layout = 0;
@@ -5641,27 +5612,39 @@
// aapt resource value: 1
public const int AlertDialog_buttonPanelSideLayout = 1;
- // aapt resource value: 5
- public const int AlertDialog_listItemLayout = 5;
-
// aapt resource value: 2
- public const int AlertDialog_listLayout = 2;
+ public const int AlertDialog_listItemLayout = 2;
// aapt resource value: 3
- public const int AlertDialog_multiChoiceItemLayout = 3;
-
- // aapt resource value: 6
- public const int AlertDialog_showTitle = 6;
+ public const int AlertDialog_listLayout = 3;
// aapt resource value: 4
- public const int AlertDialog_singleChoiceItemLayout = 4;
+ public const int AlertDialog_multiChoiceItemLayout = 4;
+ // aapt resource value: 5
+ public const int AlertDialog_showTitle = 5;
+
+ // aapt resource value: 6
+ public const int AlertDialog_singleChoiceItemLayout = 6;
+
+ // aapt resource value: { 0x10100D4,0x101048F,0x1010540,0x7F040093,0x7F040097 }
public static int[] AppBarLayout = new int[] {
16842964,
16843919,
16844096,
- 2130772005,
- 2130772223};
+ 2130968723,
+ 2130968727};
+
+ // aapt resource value: { 0x7F040162,0x7F040163 }
+ public static int[] AppBarLayoutStates = new int[] {
+ 2130968930,
+ 2130968931};
+
+ // aapt resource value: 0
+ public const int AppBarLayoutStates_state_collapsed = 0;
+
+ // aapt resource value: 1
+ public const int AppBarLayoutStates_state_collapsible = 1;
// aapt resource value: 0
public const int AppBarLayout_android_background = 0;
@@ -5678,19 +5661,10 @@
// aapt resource value: 4
public const int AppBarLayout_expanded = 4;
- public static int[] AppBarLayoutStates = new int[] {
- 2130772224,
- 2130772225};
-
- // aapt resource value: 0
- public const int AppBarLayoutStates_state_collapsed = 0;
-
- // aapt resource value: 1
- public const int AppBarLayoutStates_state_collapsible = 1;
-
+ // aapt resource value: { 0x7F0400D4,0x7F0400D5 }
public static int[] AppBarLayout_Layout = new int[] {
- 2130772226,
- 2130772227};
+ 2130968788,
+ 2130968789};
// aapt resource value: 0
public const int AppBarLayout_Layout_layout_scrollFlags = 0;
@@ -5698,11 +5672,12 @@
// aapt resource value: 1
public const int AppBarLayout_Layout_layout_scrollInterpolator = 1;
+ // aapt resource value: { 0x1010119,0x7F04011E,0x7F040195,0x7F040196 }
public static int[] AppCompatImageView = new int[] {
16843033,
- 2130772016,
- 2130772017,
- 2130772018};
+ 2130968862,
+ 2130968981,
+ 2130968982};
// aapt resource value: 0
public const int AppCompatImageView_android_src = 0;
@@ -5716,11 +5691,12 @@
// aapt resource value: 3
public const int AppCompatImageView_tintMode = 3;
+ // aapt resource value: { 0x1010142,0x7F040192,0x7F040193,0x7F040194 }
public static int[] AppCompatSeekBar = new int[] {
16843074,
- 2130772019,
- 2130772020,
- 2130772021};
+ 2130968978,
+ 2130968979,
+ 2130968980};
// aapt resource value: 0
public const int AppCompatSeekBar_android_thumb = 0;
@@ -5734,6 +5710,7 @@
// aapt resource value: 3
public const int AppCompatSeekBar_tickMarkTintMode = 3;
+ // aapt resource value: { 0x1010034,0x101016D,0x101016E,0x101016F,0x1010170,0x1010392,0x1010393 }
public static int[] AppCompatTextHelper = new int[] {
16842804,
16843117,
@@ -5764,265 +5741,267 @@
// aapt resource value: 0
public const int AppCompatTextHelper_android_textAppearance = 0;
+ // aapt resource value: { 0x1010034,0x7F04003D,0x7F04003E,0x7F04003F,0x7F040040,0x7F040041,0x7F0400A6,0x7F040181 }
public static int[] AppCompatTextView = new int[] {
16842804,
- 2130772022,
- 2130772023,
- 2130772024,
- 2130772025,
- 2130772026,
- 2130772027,
- 2130772028};
+ 2130968637,
+ 2130968638,
+ 2130968639,
+ 2130968640,
+ 2130968641,
+ 2130968742,
+ 2130968961};
// aapt resource value: 0
public const int AppCompatTextView_android_textAppearance = 0;
- // aapt resource value: 6
- public const int AppCompatTextView_autoSizeMaxTextSize = 6;
-
- // aapt resource value: 5
- public const int AppCompatTextView_autoSizeMinTextSize = 5;
-
- // aapt resource value: 4
- public const int AppCompatTextView_autoSizePresetSizes = 4;
-
- // aapt resource value: 3
- public const int AppCompatTextView_autoSizeStepGranularity = 3;
+ // aapt resource value: 1
+ public const int AppCompatTextView_autoSizeMaxTextSize = 1;
// aapt resource value: 2
- public const int AppCompatTextView_autoSizeTextType = 2;
+ public const int AppCompatTextView_autoSizeMinTextSize = 2;
+
+ // aapt resource value: 3
+ public const int AppCompatTextView_autoSizePresetSizes = 3;
+
+ // aapt resource value: 4
+ public const int AppCompatTextView_autoSizeStepGranularity = 4;
+
+ // aapt resource value: 5
+ public const int AppCompatTextView_autoSizeTextType = 5;
+
+ // aapt resource value: 6
+ public const int AppCompatTextView_fontFamily = 6;
// aapt resource value: 7
- public const int AppCompatTextView_fontFamily = 7;
+ public const int AppCompatTextView_textAllCaps = 7;
- // aapt resource value: 1
- public const int AppCompatTextView_textAllCaps = 1;
-
+ // aapt resource value: { 0x1010057,0x10100AE,0x7F040000,0x7F040001,0x7F040002,0x7F040003,0x7F040004,0x7F040005,0x7F040006,0x7F040007,0x7F040008,0x7F040009,0x7F04000A,0x7F04000B,0x7F04000C,0x7F04000E,0x7F04000F,0x7F040010,0x7F040011,0x7F040012,0x7F040013,0x7F040014,0x7F040015,0x7F040016,0x7F040017,0x7F040018,0x7F040019,0x7F04001A,0x7F04001B,0x7F04001C,0x7F04001D,0x7F04001E,0x7F040021,0x7F040022,0x7F040023,0x7F040024,0x7F040025,0x7F04003C,0x7F04004F,0x7F040052,0x7F040053,0x7F040054,0x7F040055,0x7F040056,0x7F040059,0x7F04005A,0x7F04005D,0x7F04005E,0x7F040066,0x7F040067,0x7F040068,0x7F040069,0x7F04006A,0x7F04006B,0x7F04006C,0x7F04006D,0x7F04006E,0x7F04006F,0x7F040079,0x7F040085,0x7F040086,0x7F040089,0x7F04008B,0x7F04008E,0x7F04008F,0x7F040090,0x7F040091,0x7F040092,0x7F0400B9,0x7F0400BF,0x7F0400D8,0x7F0400D9,0x7F0400DC,0x7F0400DD,0x7F0400DE,0x7F0400DF,0x7F0400E0,0x7F0400E1,0x7F0400E2,0x7F0400F3,0x7F0400F4,0x7F0400F5,0x7F0400FB,0x7F0400FD,0x7F040104,0x7F040105,0x7F040106,0x7F040107,0x7F04010E,0x7F040111,0x7F040112,0x7F040113,0x7F04011B,0x7F04011C,0x7F04016F,0x7F040182,0x7F040183,0x7F040184,0x7F040185,0x7F040186,0x7F040187,0x7F040188,0x7F040189,0x7F04018A,0x7F04018C,0x7F0401A3,0x7F0401A4,0x7F0401A5,0x7F0401A6,0x7F0401B8,0x7F0401B9,0x7F0401BA,0x7F0401BB,0x7F0401BC,0x7F0401BD,0x7F0401BE,0x7F0401BF,0x7F0401C0,0x7F0401C1 }
public static int[] AppCompatTheme = new int[] {
16842839,
16842926,
- 2130772029,
- 2130772030,
- 2130772031,
- 2130772032,
- 2130772033,
- 2130772034,
- 2130772035,
- 2130772036,
- 2130772037,
- 2130772038,
- 2130772039,
- 2130772040,
- 2130772041,
- 2130772042,
- 2130772043,
- 2130772044,
- 2130772045,
- 2130772046,
- 2130772047,
- 2130772048,
- 2130772049,
- 2130772050,
- 2130772051,
- 2130772052,
- 2130772053,
- 2130772054,
- 2130772055,
- 2130772056,
- 2130772057,
- 2130772058,
- 2130772059,
- 2130772060,
- 2130772061,
- 2130772062,
- 2130772063,
- 2130772064,
- 2130772065,
- 2130772066,
- 2130772067,
- 2130772068,
- 2130772069,
- 2130772070,
- 2130772071,
- 2130772072,
- 2130772073,
- 2130772074,
- 2130772075,
- 2130772076,
- 2130772077,
- 2130772078,
- 2130772079,
- 2130772080,
- 2130772081,
- 2130772082,
- 2130772083,
- 2130772084,
- 2130772085,
- 2130772086,
- 2130772087,
- 2130772088,
- 2130772089,
- 2130772090,
- 2130772091,
- 2130772092,
- 2130772093,
- 2130772094,
- 2130772095,
- 2130772096,
- 2130772097,
- 2130772098,
- 2130772099,
- 2130772100,
- 2130772101,
- 2130772102,
- 2130772103,
- 2130772104,
- 2130772105,
- 2130772106,
- 2130772107,
- 2130772108,
- 2130772109,
- 2130772110,
- 2130772111,
- 2130772112,
- 2130772113,
- 2130772114,
- 2130772115,
- 2130772116,
- 2130772117,
- 2130772118,
- 2130772119,
- 2130772120,
- 2130772121,
- 2130772122,
- 2130772123,
- 2130772124,
- 2130772125,
- 2130772126,
- 2130772127,
- 2130772128,
- 2130772129,
- 2130772130,
- 2130772131,
- 2130772132,
- 2130772133,
- 2130772134,
- 2130772135,
- 2130772136,
- 2130772137,
- 2130772138,
- 2130772139,
- 2130772140,
- 2130772141,
- 2130772142,
- 2130772143,
- 2130772144,
- 2130772145};
+ 2130968576,
+ 2130968577,
+ 2130968578,
+ 2130968579,
+ 2130968580,
+ 2130968581,
+ 2130968582,
+ 2130968583,
+ 2130968584,
+ 2130968585,
+ 2130968586,
+ 2130968587,
+ 2130968588,
+ 2130968590,
+ 2130968591,
+ 2130968592,
+ 2130968593,
+ 2130968594,
+ 2130968595,
+ 2130968596,
+ 2130968597,
+ 2130968598,
+ 2130968599,
+ 2130968600,
+ 2130968601,
+ 2130968602,
+ 2130968603,
+ 2130968604,
+ 2130968605,
+ 2130968606,
+ 2130968609,
+ 2130968610,
+ 2130968611,
+ 2130968612,
+ 2130968613,
+ 2130968636,
+ 2130968655,
+ 2130968658,
+ 2130968659,
+ 2130968660,
+ 2130968661,
+ 2130968662,
+ 2130968665,
+ 2130968666,
+ 2130968669,
+ 2130968670,
+ 2130968678,
+ 2130968679,
+ 2130968680,
+ 2130968681,
+ 2130968682,
+ 2130968683,
+ 2130968684,
+ 2130968685,
+ 2130968686,
+ 2130968687,
+ 2130968697,
+ 2130968709,
+ 2130968710,
+ 2130968713,
+ 2130968715,
+ 2130968718,
+ 2130968719,
+ 2130968720,
+ 2130968721,
+ 2130968722,
+ 2130968761,
+ 2130968767,
+ 2130968792,
+ 2130968793,
+ 2130968796,
+ 2130968797,
+ 2130968798,
+ 2130968799,
+ 2130968800,
+ 2130968801,
+ 2130968802,
+ 2130968819,
+ 2130968820,
+ 2130968821,
+ 2130968827,
+ 2130968829,
+ 2130968836,
+ 2130968837,
+ 2130968838,
+ 2130968839,
+ 2130968846,
+ 2130968849,
+ 2130968850,
+ 2130968851,
+ 2130968859,
+ 2130968860,
+ 2130968943,
+ 2130968962,
+ 2130968963,
+ 2130968964,
+ 2130968965,
+ 2130968966,
+ 2130968967,
+ 2130968968,
+ 2130968969,
+ 2130968970,
+ 2130968972,
+ 2130968995,
+ 2130968996,
+ 2130968997,
+ 2130968998,
+ 2130969016,
+ 2130969017,
+ 2130969018,
+ 2130969019,
+ 2130969020,
+ 2130969021,
+ 2130969022,
+ 2130969023,
+ 2130969024,
+ 2130969025};
- // aapt resource value: 23
- public const int AppCompatTheme_actionBarDivider = 23;
+ // aapt resource value: 2
+ public const int AppCompatTheme_actionBarDivider = 2;
- // aapt resource value: 24
- public const int AppCompatTheme_actionBarItemBackground = 24;
+ // aapt resource value: 3
+ public const int AppCompatTheme_actionBarItemBackground = 3;
- // aapt resource value: 17
- public const int AppCompatTheme_actionBarPopupTheme = 17;
+ // aapt resource value: 4
+ public const int AppCompatTheme_actionBarPopupTheme = 4;
- // aapt resource value: 22
- public const int AppCompatTheme_actionBarSize = 22;
+ // aapt resource value: 5
+ public const int AppCompatTheme_actionBarSize = 5;
- // aapt resource value: 19
- public const int AppCompatTheme_actionBarSplitStyle = 19;
+ // aapt resource value: 6
+ public const int AppCompatTheme_actionBarSplitStyle = 6;
- // aapt resource value: 18
- public const int AppCompatTheme_actionBarStyle = 18;
+ // aapt resource value: 7
+ public const int AppCompatTheme_actionBarStyle = 7;
- // aapt resource value: 13
- public const int AppCompatTheme_actionBarTabBarStyle = 13;
+ // aapt resource value: 8
+ public const int AppCompatTheme_actionBarTabBarStyle = 8;
+
+ // aapt resource value: 9
+ public const int AppCompatTheme_actionBarTabStyle = 9;
+
+ // aapt resource value: 10
+ public const int AppCompatTheme_actionBarTabTextStyle = 10;
+
+ // aapt resource value: 11
+ public const int AppCompatTheme_actionBarTheme = 11;
// aapt resource value: 12
- public const int AppCompatTheme_actionBarTabStyle = 12;
+ public const int AppCompatTheme_actionBarWidgetTheme = 12;
+
+ // aapt resource value: 13
+ public const int AppCompatTheme_actionButtonStyle = 13;
// aapt resource value: 14
- public const int AppCompatTheme_actionBarTabTextStyle = 14;
-
- // aapt resource value: 20
- public const int AppCompatTheme_actionBarTheme = 20;
-
- // aapt resource value: 21
- public const int AppCompatTheme_actionBarWidgetTheme = 21;
-
- // aapt resource value: 50
- public const int AppCompatTheme_actionButtonStyle = 50;
-
- // aapt resource value: 46
- public const int AppCompatTheme_actionDropDownStyle = 46;
-
- // aapt resource value: 25
- public const int AppCompatTheme_actionMenuTextAppearance = 25;
-
- // aapt resource value: 26
- public const int AppCompatTheme_actionMenuTextColor = 26;
-
- // aapt resource value: 29
- public const int AppCompatTheme_actionModeBackground = 29;
-
- // aapt resource value: 28
- public const int AppCompatTheme_actionModeCloseButtonStyle = 28;
-
- // aapt resource value: 31
- public const int AppCompatTheme_actionModeCloseDrawable = 31;
-
- // aapt resource value: 33
- public const int AppCompatTheme_actionModeCopyDrawable = 33;
-
- // aapt resource value: 32
- public const int AppCompatTheme_actionModeCutDrawable = 32;
-
- // aapt resource value: 37
- public const int AppCompatTheme_actionModeFindDrawable = 37;
-
- // aapt resource value: 34
- public const int AppCompatTheme_actionModePasteDrawable = 34;
-
- // aapt resource value: 39
- public const int AppCompatTheme_actionModePopupWindowStyle = 39;
-
- // aapt resource value: 35
- public const int AppCompatTheme_actionModeSelectAllDrawable = 35;
-
- // aapt resource value: 36
- public const int AppCompatTheme_actionModeShareDrawable = 36;
-
- // aapt resource value: 30
- public const int AppCompatTheme_actionModeSplitBackground = 30;
-
- // aapt resource value: 27
- public const int AppCompatTheme_actionModeStyle = 27;
-
- // aapt resource value: 38
- public const int AppCompatTheme_actionModeWebSearchDrawable = 38;
+ public const int AppCompatTheme_actionDropDownStyle = 14;
// aapt resource value: 15
- public const int AppCompatTheme_actionOverflowButtonStyle = 15;
+ public const int AppCompatTheme_actionMenuTextAppearance = 15;
// aapt resource value: 16
- public const int AppCompatTheme_actionOverflowMenuStyle = 16;
+ public const int AppCompatTheme_actionMenuTextColor = 16;
- // aapt resource value: 58
- public const int AppCompatTheme_activityChooserViewStyle = 58;
+ // aapt resource value: 17
+ public const int AppCompatTheme_actionModeBackground = 17;
- // aapt resource value: 95
- public const int AppCompatTheme_alertDialogButtonGroupStyle = 95;
+ // aapt resource value: 18
+ public const int AppCompatTheme_actionModeCloseButtonStyle = 18;
- // aapt resource value: 96
- public const int AppCompatTheme_alertDialogCenterButtons = 96;
+ // aapt resource value: 19
+ public const int AppCompatTheme_actionModeCloseDrawable = 19;
- // aapt resource value: 94
- public const int AppCompatTheme_alertDialogStyle = 94;
+ // aapt resource value: 20
+ public const int AppCompatTheme_actionModeCopyDrawable = 20;
- // aapt resource value: 97
- public const int AppCompatTheme_alertDialogTheme = 97;
+ // aapt resource value: 21
+ public const int AppCompatTheme_actionModeCutDrawable = 21;
+
+ // aapt resource value: 22
+ public const int AppCompatTheme_actionModeFindDrawable = 22;
+
+ // aapt resource value: 23
+ public const int AppCompatTheme_actionModePasteDrawable = 23;
+
+ // aapt resource value: 24
+ public const int AppCompatTheme_actionModePopupWindowStyle = 24;
+
+ // aapt resource value: 25
+ public const int AppCompatTheme_actionModeSelectAllDrawable = 25;
+
+ // aapt resource value: 26
+ public const int AppCompatTheme_actionModeShareDrawable = 26;
+
+ // aapt resource value: 27
+ public const int AppCompatTheme_actionModeSplitBackground = 27;
+
+ // aapt resource value: 28
+ public const int AppCompatTheme_actionModeStyle = 28;
+
+ // aapt resource value: 29
+ public const int AppCompatTheme_actionModeWebSearchDrawable = 29;
+
+ // aapt resource value: 30
+ public const int AppCompatTheme_actionOverflowButtonStyle = 30;
+
+ // aapt resource value: 31
+ public const int AppCompatTheme_actionOverflowMenuStyle = 31;
+
+ // aapt resource value: 32
+ public const int AppCompatTheme_activityChooserViewStyle = 32;
+
+ // aapt resource value: 33
+ public const int AppCompatTheme_alertDialogButtonGroupStyle = 33;
+
+ // aapt resource value: 34
+ public const int AppCompatTheme_alertDialogCenterButtons = 34;
+
+ // aapt resource value: 35
+ public const int AppCompatTheme_alertDialogStyle = 35;
+
+ // aapt resource value: 36
+ public const int AppCompatTheme_alertDialogTheme = 36;
// aapt resource value: 1
public const int AppCompatTheme_android_windowAnimationStyle = 1;
@@ -6030,270 +6009,272 @@
// aapt resource value: 0
public const int AppCompatTheme_android_windowIsFloating = 0;
- // aapt resource value: 102
- public const int AppCompatTheme_autoCompleteTextViewStyle = 102;
+ // aapt resource value: 37
+ public const int AppCompatTheme_autoCompleteTextViewStyle = 37;
- // aapt resource value: 55
- public const int AppCompatTheme_borderlessButtonStyle = 55;
+ // aapt resource value: 38
+ public const int AppCompatTheme_borderlessButtonStyle = 38;
- // aapt resource value: 52
- public const int AppCompatTheme_buttonBarButtonStyle = 52;
+ // aapt resource value: 39
+ public const int AppCompatTheme_buttonBarButtonStyle = 39;
- // aapt resource value: 100
- public const int AppCompatTheme_buttonBarNegativeButtonStyle = 100;
+ // aapt resource value: 40
+ public const int AppCompatTheme_buttonBarNegativeButtonStyle = 40;
- // aapt resource value: 101
- public const int AppCompatTheme_buttonBarNeutralButtonStyle = 101;
+ // aapt resource value: 41
+ public const int AppCompatTheme_buttonBarNeutralButtonStyle = 41;
- // aapt resource value: 99
- public const int AppCompatTheme_buttonBarPositiveButtonStyle = 99;
-
- // aapt resource value: 51
- public const int AppCompatTheme_buttonBarStyle = 51;
-
- // aapt resource value: 103
- public const int AppCompatTheme_buttonStyle = 103;
-
- // aapt resource value: 104
- public const int AppCompatTheme_buttonStyleSmall = 104;
-
- // aapt resource value: 105
- public const int AppCompatTheme_checkboxStyle = 105;
-
- // aapt resource value: 106
- public const int AppCompatTheme_checkedTextViewStyle = 106;
-
- // aapt resource value: 86
- public const int AppCompatTheme_colorAccent = 86;
-
- // aapt resource value: 93
- public const int AppCompatTheme_colorBackgroundFloating = 93;
-
- // aapt resource value: 90
- public const int AppCompatTheme_colorButtonNormal = 90;
-
- // aapt resource value: 88
- public const int AppCompatTheme_colorControlActivated = 88;
-
- // aapt resource value: 89
- public const int AppCompatTheme_colorControlHighlight = 89;
-
- // aapt resource value: 87
- public const int AppCompatTheme_colorControlNormal = 87;
-
- // aapt resource value: 118
- public const int AppCompatTheme_colorError = 118;
-
- // aapt resource value: 84
- public const int AppCompatTheme_colorPrimary = 84;
-
- // aapt resource value: 85
- public const int AppCompatTheme_colorPrimaryDark = 85;
-
- // aapt resource value: 91
- public const int AppCompatTheme_colorSwitchThumbNormal = 91;
-
- // aapt resource value: 92
- public const int AppCompatTheme_controlBackground = 92;
-
- // aapt resource value: 44
- public const int AppCompatTheme_dialogPreferredPadding = 44;
+ // aapt resource value: 42
+ public const int AppCompatTheme_buttonBarPositiveButtonStyle = 42;
// aapt resource value: 43
- public const int AppCompatTheme_dialogTheme = 43;
+ public const int AppCompatTheme_buttonBarStyle = 43;
- // aapt resource value: 57
- public const int AppCompatTheme_dividerHorizontal = 57;
-
- // aapt resource value: 56
- public const int AppCompatTheme_dividerVertical = 56;
-
- // aapt resource value: 75
- public const int AppCompatTheme_dropDownListViewStyle = 75;
-
- // aapt resource value: 47
- public const int AppCompatTheme_dropdownListPreferredItemHeight = 47;
-
- // aapt resource value: 64
- public const int AppCompatTheme_editTextBackground = 64;
-
- // aapt resource value: 63
- public const int AppCompatTheme_editTextColor = 63;
-
- // aapt resource value: 107
- public const int AppCompatTheme_editTextStyle = 107;
-
- // aapt resource value: 49
- public const int AppCompatTheme_homeAsUpIndicator = 49;
-
- // aapt resource value: 65
- public const int AppCompatTheme_imageButtonStyle = 65;
-
- // aapt resource value: 83
- public const int AppCompatTheme_listChoiceBackgroundIndicator = 83;
+ // aapt resource value: 44
+ public const int AppCompatTheme_buttonStyle = 44;
// aapt resource value: 45
- public const int AppCompatTheme_listDividerAlertDialog = 45;
+ public const int AppCompatTheme_buttonStyleSmall = 45;
- // aapt resource value: 115
- public const int AppCompatTheme_listMenuViewStyle = 115;
+ // aapt resource value: 46
+ public const int AppCompatTheme_checkboxStyle = 46;
- // aapt resource value: 76
- public const int AppCompatTheme_listPopupWindowStyle = 76;
+ // aapt resource value: 47
+ public const int AppCompatTheme_checkedTextViewStyle = 47;
+
+ // aapt resource value: 48
+ public const int AppCompatTheme_colorAccent = 48;
+
+ // aapt resource value: 49
+ public const int AppCompatTheme_colorBackgroundFloating = 49;
+
+ // aapt resource value: 50
+ public const int AppCompatTheme_colorButtonNormal = 50;
+
+ // aapt resource value: 51
+ public const int AppCompatTheme_colorControlActivated = 51;
+
+ // aapt resource value: 52
+ public const int AppCompatTheme_colorControlHighlight = 52;
+
+ // aapt resource value: 53
+ public const int AppCompatTheme_colorControlNormal = 53;
+
+ // aapt resource value: 54
+ public const int AppCompatTheme_colorError = 54;
+
+ // aapt resource value: 55
+ public const int AppCompatTheme_colorPrimary = 55;
+
+ // aapt resource value: 56
+ public const int AppCompatTheme_colorPrimaryDark = 56;
+
+ // aapt resource value: 57
+ public const int AppCompatTheme_colorSwitchThumbNormal = 57;
+
+ // aapt resource value: 58
+ public const int AppCompatTheme_controlBackground = 58;
+
+ // aapt resource value: 59
+ public const int AppCompatTheme_dialogPreferredPadding = 59;
+
+ // aapt resource value: 60
+ public const int AppCompatTheme_dialogTheme = 60;
+
+ // aapt resource value: 61
+ public const int AppCompatTheme_dividerHorizontal = 61;
+
+ // aapt resource value: 62
+ public const int AppCompatTheme_dividerVertical = 62;
+
+ // aapt resource value: 64
+ public const int AppCompatTheme_dropdownListPreferredItemHeight = 64;
+
+ // aapt resource value: 63
+ public const int AppCompatTheme_dropDownListViewStyle = 63;
+
+ // aapt resource value: 65
+ public const int AppCompatTheme_editTextBackground = 65;
+
+ // aapt resource value: 66
+ public const int AppCompatTheme_editTextColor = 66;
+
+ // aapt resource value: 67
+ public const int AppCompatTheme_editTextStyle = 67;
+
+ // aapt resource value: 68
+ public const int AppCompatTheme_homeAsUpIndicator = 68;
+
+ // aapt resource value: 69
+ public const int AppCompatTheme_imageButtonStyle = 69;
// aapt resource value: 70
- public const int AppCompatTheme_listPreferredItemHeight = 70;
-
- // aapt resource value: 72
- public const int AppCompatTheme_listPreferredItemHeightLarge = 72;
+ public const int AppCompatTheme_listChoiceBackgroundIndicator = 70;
// aapt resource value: 71
- public const int AppCompatTheme_listPreferredItemHeightSmall = 71;
+ public const int AppCompatTheme_listDividerAlertDialog = 71;
+
+ // aapt resource value: 72
+ public const int AppCompatTheme_listMenuViewStyle = 72;
// aapt resource value: 73
- public const int AppCompatTheme_listPreferredItemPaddingLeft = 73;
+ public const int AppCompatTheme_listPopupWindowStyle = 73;
// aapt resource value: 74
- public const int AppCompatTheme_listPreferredItemPaddingRight = 74;
+ public const int AppCompatTheme_listPreferredItemHeight = 74;
+
+ // aapt resource value: 75
+ public const int AppCompatTheme_listPreferredItemHeightLarge = 75;
+
+ // aapt resource value: 76
+ public const int AppCompatTheme_listPreferredItemHeightSmall = 76;
+
+ // aapt resource value: 77
+ public const int AppCompatTheme_listPreferredItemPaddingLeft = 77;
+
+ // aapt resource value: 78
+ public const int AppCompatTheme_listPreferredItemPaddingRight = 78;
+
+ // aapt resource value: 79
+ public const int AppCompatTheme_panelBackground = 79;
// aapt resource value: 80
- public const int AppCompatTheme_panelBackground = 80;
-
- // aapt resource value: 82
- public const int AppCompatTheme_panelMenuListTheme = 82;
+ public const int AppCompatTheme_panelMenuListTheme = 80;
// aapt resource value: 81
public const int AppCompatTheme_panelMenuListWidth = 81;
- // aapt resource value: 61
- public const int AppCompatTheme_popupMenuStyle = 61;
+ // aapt resource value: 82
+ public const int AppCompatTheme_popupMenuStyle = 82;
- // aapt resource value: 62
- public const int AppCompatTheme_popupWindowStyle = 62;
+ // aapt resource value: 83
+ public const int AppCompatTheme_popupWindowStyle = 83;
- // aapt resource value: 108
- public const int AppCompatTheme_radioButtonStyle = 108;
+ // aapt resource value: 84
+ public const int AppCompatTheme_radioButtonStyle = 84;
- // aapt resource value: 109
- public const int AppCompatTheme_ratingBarStyle = 109;
+ // aapt resource value: 85
+ public const int AppCompatTheme_ratingBarStyle = 85;
- // aapt resource value: 110
- public const int AppCompatTheme_ratingBarStyleIndicator = 110;
+ // aapt resource value: 86
+ public const int AppCompatTheme_ratingBarStyleIndicator = 86;
- // aapt resource value: 111
- public const int AppCompatTheme_ratingBarStyleSmall = 111;
+ // aapt resource value: 87
+ public const int AppCompatTheme_ratingBarStyleSmall = 87;
- // aapt resource value: 69
- public const int AppCompatTheme_searchViewStyle = 69;
+ // aapt resource value: 88
+ public const int AppCompatTheme_searchViewStyle = 88;
- // aapt resource value: 112
- public const int AppCompatTheme_seekBarStyle = 112;
+ // aapt resource value: 89
+ public const int AppCompatTheme_seekBarStyle = 89;
- // aapt resource value: 53
- public const int AppCompatTheme_selectableItemBackground = 53;
+ // aapt resource value: 90
+ public const int AppCompatTheme_selectableItemBackground = 90;
- // aapt resource value: 54
- public const int AppCompatTheme_selectableItemBackgroundBorderless = 54;
+ // aapt resource value: 91
+ public const int AppCompatTheme_selectableItemBackgroundBorderless = 91;
- // aapt resource value: 48
- public const int AppCompatTheme_spinnerDropDownItemStyle = 48;
+ // aapt resource value: 92
+ public const int AppCompatTheme_spinnerDropDownItemStyle = 92;
- // aapt resource value: 113
- public const int AppCompatTheme_spinnerStyle = 113;
+ // aapt resource value: 93
+ public const int AppCompatTheme_spinnerStyle = 93;
- // aapt resource value: 114
- public const int AppCompatTheme_switchStyle = 114;
+ // aapt resource value: 94
+ public const int AppCompatTheme_switchStyle = 94;
- // aapt resource value: 40
- public const int AppCompatTheme_textAppearanceLargePopupMenu = 40;
+ // aapt resource value: 95
+ public const int AppCompatTheme_textAppearanceLargePopupMenu = 95;
- // aapt resource value: 77
- public const int AppCompatTheme_textAppearanceListItem = 77;
+ // aapt resource value: 96
+ public const int AppCompatTheme_textAppearanceListItem = 96;
- // aapt resource value: 78
- public const int AppCompatTheme_textAppearanceListItemSecondary = 78;
-
- // aapt resource value: 79
- public const int AppCompatTheme_textAppearanceListItemSmall = 79;
-
- // aapt resource value: 42
- public const int AppCompatTheme_textAppearancePopupMenuHeader = 42;
-
- // aapt resource value: 67
- public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 67;
-
- // aapt resource value: 66
- public const int AppCompatTheme_textAppearanceSearchResultTitle = 66;
-
- // aapt resource value: 41
- public const int AppCompatTheme_textAppearanceSmallPopupMenu = 41;
+ // aapt resource value: 97
+ public const int AppCompatTheme_textAppearanceListItemSecondary = 97;
// aapt resource value: 98
- public const int AppCompatTheme_textColorAlertDialogListItem = 98;
+ public const int AppCompatTheme_textAppearanceListItemSmall = 98;
- // aapt resource value: 68
- public const int AppCompatTheme_textColorSearchUrl = 68;
+ // aapt resource value: 99
+ public const int AppCompatTheme_textAppearancePopupMenuHeader = 99;
- // aapt resource value: 60
- public const int AppCompatTheme_toolbarNavigationButtonStyle = 60;
+ // aapt resource value: 100
+ public const int AppCompatTheme_textAppearanceSearchResultSubtitle = 100;
- // aapt resource value: 59
- public const int AppCompatTheme_toolbarStyle = 59;
+ // aapt resource value: 101
+ public const int AppCompatTheme_textAppearanceSearchResultTitle = 101;
- // aapt resource value: 117
- public const int AppCompatTheme_tooltipForegroundColor = 117;
+ // aapt resource value: 102
+ public const int AppCompatTheme_textAppearanceSmallPopupMenu = 102;
+
+ // aapt resource value: 103
+ public const int AppCompatTheme_textColorAlertDialogListItem = 103;
+
+ // aapt resource value: 104
+ public const int AppCompatTheme_textColorSearchUrl = 104;
+
+ // aapt resource value: 105
+ public const int AppCompatTheme_toolbarNavigationButtonStyle = 105;
+
+ // aapt resource value: 106
+ public const int AppCompatTheme_toolbarStyle = 106;
+
+ // aapt resource value: 107
+ public const int AppCompatTheme_tooltipForegroundColor = 107;
+
+ // aapt resource value: 108
+ public const int AppCompatTheme_tooltipFrameBackground = 108;
+
+ // aapt resource value: 109
+ public const int AppCompatTheme_windowActionBar = 109;
+
+ // aapt resource value: 110
+ public const int AppCompatTheme_windowActionBarOverlay = 110;
+
+ // aapt resource value: 111
+ public const int AppCompatTheme_windowActionModeOverlay = 111;
+
+ // aapt resource value: 112
+ public const int AppCompatTheme_windowFixedHeightMajor = 112;
+
+ // aapt resource value: 113
+ public const int AppCompatTheme_windowFixedHeightMinor = 113;
+
+ // aapt resource value: 114
+ public const int AppCompatTheme_windowFixedWidthMajor = 114;
+
+ // aapt resource value: 115
+ public const int AppCompatTheme_windowFixedWidthMinor = 115;
// aapt resource value: 116
- public const int AppCompatTheme_tooltipFrameBackground = 116;
+ public const int AppCompatTheme_windowMinWidthMajor = 116;
- // aapt resource value: 2
- public const int AppCompatTheme_windowActionBar = 2;
+ // aapt resource value: 117
+ public const int AppCompatTheme_windowMinWidthMinor = 117;
- // aapt resource value: 4
- public const int AppCompatTheme_windowActionBarOverlay = 4;
+ // aapt resource value: 118
+ public const int AppCompatTheme_windowNoTitle = 118;
- // aapt resource value: 5
- public const int AppCompatTheme_windowActionModeOverlay = 5;
-
- // aapt resource value: 9
- public const int AppCompatTheme_windowFixedHeightMajor = 9;
-
- // aapt resource value: 7
- public const int AppCompatTheme_windowFixedHeightMinor = 7;
-
- // aapt resource value: 6
- public const int AppCompatTheme_windowFixedWidthMajor = 6;
-
- // aapt resource value: 8
- public const int AppCompatTheme_windowFixedWidthMinor = 8;
-
- // aapt resource value: 10
- public const int AppCompatTheme_windowMinWidthMajor = 10;
-
- // aapt resource value: 11
- public const int AppCompatTheme_windowMinWidthMinor = 11;
-
- // aapt resource value: 3
- public const int AppCompatTheme_windowNoTitle = 3;
-
+ // aapt resource value: { 0x7F040120,0x7F040121,0x7F040150 }
public static int[] BallPulseFooter = new int[] {
- 2130772317,
- 2130772338,
- 2130772339};
-
- // aapt resource value: 1
- public const int BallPulseFooter_srlAnimatingColor = 1;
+ 2130968864,
+ 2130968865,
+ 2130968912};
// aapt resource value: 0
- public const int BallPulseFooter_srlClassicsSpinnerStyle = 0;
+ public const int BallPulseFooter_srlAnimatingColor = 0;
+
+ // aapt resource value: 1
+ public const int BallPulseFooter_srlClassicsSpinnerStyle = 1;
// aapt resource value: 2
public const int BallPulseFooter_srlNormalColor = 2;
+ // aapt resource value: { 0x7F04011F,0x7F040132,0x7F040151 }
public static int[] BezierRadarHeader = new int[] {
- 2130772316,
- 2130772324,
- 2130772326};
+ 2130968863,
+ 2130968882,
+ 2130968913};
// aapt resource value: 0
public const int BezierRadarHeader_srlAccentColor = 0;
@@ -6304,18 +6285,19 @@
// aapt resource value: 2
public const int BezierRadarHeader_srlPrimaryColor = 2;
+ // aapt resource value: { 0x7F040093,0x7F0400C4,0x7F0400C5,0x7F0400C8,0x7F0400E8 }
public static int[] BottomNavigationView = new int[] {
- 2130772005,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269};
+ 2130968723,
+ 2130968772,
+ 2130968773,
+ 2130968776,
+ 2130968808};
// aapt resource value: 0
public const int BottomNavigationView_elevation = 0;
- // aapt resource value: 4
- public const int BottomNavigationView_itemBackground = 4;
+ // aapt resource value: 1
+ public const int BottomNavigationView_itemBackground = 1;
// aapt resource value: 2
public const int BottomNavigationView_itemIconTint = 2;
@@ -6323,48 +6305,51 @@
// aapt resource value: 3
public const int BottomNavigationView_itemTextColor = 3;
- // aapt resource value: 1
- public const int BottomNavigationView_menu = 1;
+ // aapt resource value: 4
+ public const int BottomNavigationView_menu = 4;
+ // aapt resource value: { 0x7F040049,0x7F04004B,0x7F04004C }
public static int[] BottomSheetBehavior_Layout = new int[] {
- 2130772228,
- 2130772229,
- 2130772230};
-
- // aapt resource value: 1
- public const int BottomSheetBehavior_Layout_behavior_hideable = 1;
+ 2130968649,
+ 2130968651,
+ 2130968652};
// aapt resource value: 0
- public const int BottomSheetBehavior_Layout_behavior_peekHeight = 0;
+ public const int BottomSheetBehavior_Layout_behavior_hideable = 0;
+
+ // aapt resource value: 1
+ public const int BottomSheetBehavior_Layout_behavior_peekHeight = 1;
// aapt resource value: 2
public const int BottomSheetBehavior_Layout_behavior_skipCollapsed = 2;
+ // aapt resource value: { 0x7F040026 }
public static int[] ButtonBarLayout = new int[] {
- 2130772146};
+ 2130968614};
// aapt resource value: 0
public const int ButtonBarLayout_allowStacking = 0;
+ // aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040157,0x7F040158,0x7F040159,0x7F04015A,0x7F04015D }
public static int[] ClassicsFooter = new int[] {
- 2130772316,
- 2130772317,
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329,
- 2130772330,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772336};
+ 2130968863,
+ 2130968865,
+ 2130968869,
+ 2130968870,
+ 2130968871,
+ 2130968872,
+ 2130968873,
+ 2130968874,
+ 2130968896,
+ 2130968913,
+ 2130968916,
+ 2130968917,
+ 2130968918,
+ 2130968919,
+ 2130968920,
+ 2130968921,
+ 2130968922,
+ 2130968925};
// aapt resource value: 0
public const int ClassicsFooter_srlAccentColor = 0;
@@ -6420,29 +6405,30 @@
// aapt resource value: 17
public const int ClassicsFooter_srlTextSizeTitle = 17;
+ // aapt resource value: { 0x7F04011F,0x7F040121,0x7F040125,0x7F040126,0x7F040127,0x7F040128,0x7F040129,0x7F04012A,0x7F040133,0x7F040140,0x7F040151,0x7F040154,0x7F040155,0x7F040156,0x7F040158,0x7F040159,0x7F04015A,0x7F04015B,0x7F04015C,0x7F04015D,0x7F04015E,0x7F04015F }
public static int[] ClassicsHeader = new int[] {
- 2130772316,
- 2130772317,
- 2130772318,
- 2130772319,
- 2130772320,
- 2130772321,
- 2130772322,
- 2130772323,
- 2130772325,
- 2130772326,
- 2130772327,
- 2130772328,
- 2130772329,
- 2130772331,
- 2130772332,
- 2130772333,
- 2130772334,
- 2130772335,
- 2130772336,
- 2130772337,
- 2130772340,
- 2130772341};
+ 2130968863,
+ 2130968865,
+ 2130968869,
+ 2130968870,
+ 2130968871,
+ 2130968872,
+ 2130968873,
+ 2130968874,
+ 2130968883,
+ 2130968896,
+ 2130968913,
+ 2130968916,
+ 2130968917,
+ 2130968918,
+ 2130968920,
+ 2130968921,
+ 2130968922,
+ 2130968923,
+ 2130968924,
+ 2130968925,
+ 2130968926,
+ 2130968927};
// aapt resource value: 0
public const int ClassicsHeader_srlAccentColor = 0;
@@ -6468,117 +6454,101 @@
// aapt resource value: 7
public const int ClassicsHeader_srlDrawableSize = 7;
- // aapt resource value: 21
- public const int ClassicsHeader_srlEnableLastTime = 21;
-
// aapt resource value: 8
- public const int ClassicsHeader_srlFinishDuration = 8;
+ public const int ClassicsHeader_srlEnableLastTime = 8;
// aapt resource value: 9
- public const int ClassicsHeader_srlPrimaryColor = 9;
+ public const int ClassicsHeader_srlFinishDuration = 9;
// aapt resource value: 10
- public const int ClassicsHeader_srlTextFailed = 10;
+ public const int ClassicsHeader_srlPrimaryColor = 10;
// aapt resource value: 11
- public const int ClassicsHeader_srlTextFinish = 11;
+ public const int ClassicsHeader_srlTextFailed = 11;
// aapt resource value: 12
- public const int ClassicsHeader_srlTextLoading = 12;
+ public const int ClassicsHeader_srlTextFinish = 12;
// aapt resource value: 13
- public const int ClassicsHeader_srlTextPulling = 13;
+ public const int ClassicsHeader_srlTextLoading = 13;
// aapt resource value: 14
- public const int ClassicsHeader_srlTextRefreshing = 14;
+ public const int ClassicsHeader_srlTextPulling = 14;
// aapt resource value: 15
- public const int ClassicsHeader_srlTextRelease = 15;
+ public const int ClassicsHeader_srlTextRefreshing = 15;
// aapt resource value: 16
- public const int ClassicsHeader_srlTextSecondary = 16;
+ public const int ClassicsHeader_srlTextRelease = 16;
// aapt resource value: 17
- public const int ClassicsHeader_srlTextSizeTime = 17;
+ public const int ClassicsHeader_srlTextSecondary = 17;
// aapt resource value: 18
- public const int ClassicsHeader_srlTextSizeTitle = 18;
+ public const int ClassicsHeader_srlTextSizeTime = 18;
+
+ // aapt resource value: 19
+ public const int ClassicsHeader_srlTextSizeTitle = 19;
// aapt resource value: 20
public const int ClassicsHeader_srlTextTimeMarginTop = 20;
- // aapt resource value: 19
- public const int ClassicsHeader_srlTextUpdate = 19;
+ // aapt resource value: 21
+ public const int ClassicsHeader_srlTextUpdate = 21;
+ // aapt resource value: { 0x7F040063,0x7F040064,0x7F040078,0x7F040098,0x7F040099,0x7F04009A,0x7F04009B,0x7F04009C,0x7F04009D,0x7F04009E,0x7F04010A,0x7F04010B,0x7F040165,0x7F040197,0x7F040198,0x7F0401A2 }
public static int[] CollapsingToolbarLayout = new int[] {
- 2130771980,
- 2130772231,
- 2130772232,
- 2130772233,
- 2130772234,
- 2130772235,
- 2130772236,
- 2130772237,
- 2130772238,
- 2130772239,
- 2130772240,
- 2130772241,
- 2130772242,
- 2130772243,
- 2130772244,
- 2130772245};
+ 2130968675,
+ 2130968676,
+ 2130968696,
+ 2130968728,
+ 2130968729,
+ 2130968730,
+ 2130968731,
+ 2130968732,
+ 2130968733,
+ 2130968734,
+ 2130968842,
+ 2130968843,
+ 2130968933,
+ 2130968983,
+ 2130968984,
+ 2130968994};
- // aapt resource value: 13
- public const int CollapsingToolbarLayout_collapsedTitleGravity = 13;
-
- // aapt resource value: 7
- public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 7;
-
- // aapt resource value: 8
- public const int CollapsingToolbarLayout_contentScrim = 8;
-
- // aapt resource value: 14
- public const int CollapsingToolbarLayout_expandedTitleGravity = 14;
+ // aapt resource value: 0
+ public const int CollapsingToolbarLayout_collapsedTitleGravity = 0;
// aapt resource value: 1
- public const int CollapsingToolbarLayout_expandedTitleMargin = 1;
+ public const int CollapsingToolbarLayout_collapsedTitleTextAppearance = 1;
+
+ // aapt resource value: 2
+ public const int CollapsingToolbarLayout_contentScrim = 2;
+
+ // aapt resource value: 3
+ public const int CollapsingToolbarLayout_expandedTitleGravity = 3;
+
+ // aapt resource value: 4
+ public const int CollapsingToolbarLayout_expandedTitleMargin = 4;
// aapt resource value: 5
public const int CollapsingToolbarLayout_expandedTitleMarginBottom = 5;
- // aapt resource value: 4
- public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 4;
-
- // aapt resource value: 2
- public const int CollapsingToolbarLayout_expandedTitleMarginStart = 2;
-
- // aapt resource value: 3
- public const int CollapsingToolbarLayout_expandedTitleMarginTop = 3;
-
// aapt resource value: 6
- public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 6;
+ public const int CollapsingToolbarLayout_expandedTitleMarginEnd = 6;
- // aapt resource value: 12
- public const int CollapsingToolbarLayout_scrimAnimationDuration = 12;
+ // aapt resource value: 7
+ public const int CollapsingToolbarLayout_expandedTitleMarginStart = 7;
- // aapt resource value: 11
- public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+ // aapt resource value: 8
+ public const int CollapsingToolbarLayout_expandedTitleMarginTop = 8;
// aapt resource value: 9
- public const int CollapsingToolbarLayout_statusBarScrim = 9;
+ public const int CollapsingToolbarLayout_expandedTitleTextAppearance = 9;
- // aapt resource value: 0
- public const int CollapsingToolbarLayout_title = 0;
-
- // aapt resource value: 15
- public const int CollapsingToolbarLayout_titleEnabled = 15;
-
- // aapt resource value: 10
- public const int CollapsingToolbarLayout_toolbarId = 10;
-
+ // aapt resource value: { 0x7F0400CF,0x7F0400D0 }
public static int[] CollapsingToolbarLayout_Layout = new int[] {
- 2130772246,
- 2130772247};
+ 2130968783,
+ 2130968784};
// aapt resource value: 0
public const int CollapsingToolbarLayout_Layout_layout_collapseMode = 0;
@@ -6586,10 +6556,29 @@
// aapt resource value: 1
public const int CollapsingToolbarLayout_Layout_layout_collapseParallaxMultiplier = 1;
+ // aapt resource value: 10
+ public const int CollapsingToolbarLayout_scrimAnimationDuration = 10;
+
+ // aapt resource value: 11
+ public const int CollapsingToolbarLayout_scrimVisibleHeightTrigger = 11;
+
+ // aapt resource value: 12
+ public const int CollapsingToolbarLayout_statusBarScrim = 12;
+
+ // aapt resource value: 13
+ public const int CollapsingToolbarLayout_title = 13;
+
+ // aapt resource value: 14
+ public const int CollapsingToolbarLayout_titleEnabled = 14;
+
+ // aapt resource value: 15
+ public const int CollapsingToolbarLayout_toolbarId = 15;
+
+ // aapt resource value: { 0x10101A5,0x101031F,0x7F040027 }
public static int[] ColorStateListItem = new int[] {
16843173,
16843551,
- 2130772147};
+ 2130968615};
// aapt resource value: 2
public const int ColorStateListItem_alpha = 2;
@@ -6600,10 +6589,11 @@
// aapt resource value: 0
public const int ColorStateListItem_android_color = 0;
+ // aapt resource value: { 0x1010107,0x7F04005B,0x7F04005C }
public static int[] CompoundButton = new int[] {
16843015,
- 2130772148,
- 2130772149};
+ 2130968667,
+ 2130968668};
// aapt resource value: 0
public const int CompoundButton_android_button = 0;
@@ -6614,50 +6604,53 @@
// aapt resource value: 2
public const int CompoundButton_buttonTintMode = 2;
+ // aapt resource value: { 0x7F0400C9,0x7F040164 }
public static int[] CoordinatorLayout = new int[] {
- 2130772248,
- 2130772249};
+ 2130968777,
+ 2130968932};
// aapt resource value: 0
public const int CoordinatorLayout_keylines = 0;
- // aapt resource value: 1
- public const int CoordinatorLayout_statusBarBackground = 1;
-
+ // aapt resource value: { 0x10100B3,0x7F0400CC,0x7F0400CD,0x7F0400CE,0x7F0400D1,0x7F0400D2,0x7F0400D3 }
public static int[] CoordinatorLayout_Layout = new int[] {
16842931,
- 2130772250,
- 2130772251,
- 2130772252,
- 2130772253,
- 2130772254,
- 2130772255};
+ 2130968780,
+ 2130968781,
+ 2130968782,
+ 2130968785,
+ 2130968786,
+ 2130968787};
// aapt resource value: 0
public const int CoordinatorLayout_Layout_android_layout_gravity = 0;
+ // aapt resource value: 1
+ public const int CoordinatorLayout_Layout_layout_anchor = 1;
+
// aapt resource value: 2
- public const int CoordinatorLayout_Layout_layout_anchor = 2;
+ public const int CoordinatorLayout_Layout_layout_anchorGravity = 2;
+
+ // aapt resource value: 3
+ public const int CoordinatorLayout_Layout_layout_behavior = 3;
// aapt resource value: 4
- public const int CoordinatorLayout_Layout_layout_anchorGravity = 4;
-
- // aapt resource value: 1
- public const int CoordinatorLayout_Layout_layout_behavior = 1;
-
- // aapt resource value: 6
- public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 6;
+ public const int CoordinatorLayout_Layout_layout_dodgeInsetEdges = 4;
// aapt resource value: 5
public const int CoordinatorLayout_Layout_layout_insetEdge = 5;
- // aapt resource value: 3
- public const int CoordinatorLayout_Layout_layout_keyline = 3;
+ // aapt resource value: 6
+ public const int CoordinatorLayout_Layout_layout_keyline = 6;
+ // aapt resource value: 1
+ public const int CoordinatorLayout_statusBarBackground = 1;
+
+ // aapt resource value: { 0x7F040050,0x7F040051,0x7F04018B }
public static int[] DesignTheme = new int[] {
- 2130772256,
- 2130772257,
- 2130772258};
+ 2130968656,
+ 2130968657,
+ 2130968971};
// aapt resource value: 0
public const int DesignTheme_bottomSheetDialogTheme = 0;
@@ -6668,61 +6661,70 @@
// aapt resource value: 2
public const int DesignTheme_textColorError = 2;
+ // aapt resource value: { 0x7F04003A,0x7F04003B,0x7F040047,0x7F040065,0x7F04008C,0x7F0400B0,0x7F04011A,0x7F04018E }
public static int[] DrawerArrowToggle = new int[] {
- 2130772150,
- 2130772151,
- 2130772152,
- 2130772153,
- 2130772154,
- 2130772155,
- 2130772156,
- 2130772157};
-
- // aapt resource value: 4
- public const int DrawerArrowToggle_arrowHeadLength = 4;
-
- // aapt resource value: 5
- public const int DrawerArrowToggle_arrowShaftLength = 5;
-
- // aapt resource value: 6
- public const int DrawerArrowToggle_barLength = 6;
+ 2130968634,
+ 2130968635,
+ 2130968647,
+ 2130968677,
+ 2130968716,
+ 2130968752,
+ 2130968858,
+ 2130968974};
// aapt resource value: 0
- public const int DrawerArrowToggle_color = 0;
-
- // aapt resource value: 2
- public const int DrawerArrowToggle_drawableSize = 2;
-
- // aapt resource value: 3
- public const int DrawerArrowToggle_gapBetweenBars = 3;
+ public const int DrawerArrowToggle_arrowHeadLength = 0;
// aapt resource value: 1
- public const int DrawerArrowToggle_spinBars = 1;
+ public const int DrawerArrowToggle_arrowShaftLength = 1;
+
+ // aapt resource value: 2
+ public const int DrawerArrowToggle_barLength = 2;
+
+ // aapt resource value: 3
+ public const int DrawerArrowToggle_color = 3;
+
+ // aapt resource value: 4
+ public const int DrawerArrowToggle_drawableSize = 4;
+
+ // aapt resource value: 5
+ public const int DrawerArrowToggle_gapBetweenBars = 5;
+
+ // aapt resource value: 6
+ public const int DrawerArrowToggle_spinBars = 6;
// aapt resource value: 7
public const int DrawerArrowToggle_thickness = 7;
+ // aapt resource value: { 0x7F040045,0x7F040046,0x7F04004E,0x7F040093,0x7F04009F,0x7F0400FF,0x7F040109,0x7F0401AB }
public static int[] FloatingActionButton = new int[] {
- 2130772005,
- 2130772221,
- 2130772222,
- 2130772259,
- 2130772260,
- 2130772261,
- 2130772262,
- 2130772263};
-
- // aapt resource value: 1
- public const int FloatingActionButton_backgroundTint = 1;
-
- // aapt resource value: 2
- public const int FloatingActionButton_backgroundTintMode = 2;
-
- // aapt resource value: 6
- public const int FloatingActionButton_borderWidth = 6;
+ 2130968645,
+ 2130968646,
+ 2130968654,
+ 2130968723,
+ 2130968735,
+ 2130968831,
+ 2130968841,
+ 2130969003};
// aapt resource value: 0
- public const int FloatingActionButton_elevation = 0;
+ public const int FloatingActionButton_backgroundTint = 0;
+
+ // aapt resource value: 1
+ public const int FloatingActionButton_backgroundTintMode = 1;
+
+ // aapt resource value: { 0x7F040048 }
+ public static int[] FloatingActionButton_Behavior_Layout = new int[] {
+ 2130968648};
+
+ // aapt resource value: 0
+ public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
+
+ // aapt resource value: 2
+ public const int FloatingActionButton_borderWidth = 2;
+
+ // aapt resource value: 3
+ public const int FloatingActionButton_elevation = 3;
// aapt resource value: 4
public const int FloatingActionButton_fabSize = 4;
@@ -6730,62 +6732,59 @@
// aapt resource value: 5
public const int FloatingActionButton_pressedTranslationZ = 5;
- // aapt resource value: 3
- public const int FloatingActionButton_rippleColor = 3;
+ // aapt resource value: 6
+ public const int FloatingActionButton_rippleColor = 6;
// aapt resource value: 7
public const int FloatingActionButton_useCompatPadding = 7;
- public static int[] FloatingActionButton_Behavior_Layout = new int[] {
- 2130772264};
-
- // aapt resource value: 0
- public const int FloatingActionButton_Behavior_Layout_behavior_autoHide = 0;
-
+ // aapt resource value: { 0x7F0400A7,0x7F0400A8,0x7F0400A9,0x7F0400AA,0x7F0400AB,0x7F0400AC }
public static int[] FontFamily = new int[] {
- 2130772305,
- 2130772306,
- 2130772307,
- 2130772308,
- 2130772309,
- 2130772310};
+ 2130968743,
+ 2130968744,
+ 2130968745,
+ 2130968746,
+ 2130968747,
+ 2130968748};
- // aapt resource value: 0
- public const int FontFamily_fontProviderAuthority = 0;
-
- // aapt resource value: 3
- public const int FontFamily_fontProviderCerts = 3;
-
- // aapt resource value: 4
- public const int FontFamily_fontProviderFetchStrategy = 4;
-
- // aapt resource value: 5
- public const int FontFamily_fontProviderFetchTimeout = 5;
-
- // aapt resource value: 1
- public const int FontFamily_fontProviderPackage = 1;
-
- // aapt resource value: 2
- public const int FontFamily_fontProviderQuery = 2;
-
+ // aapt resource value: { 0x7F0400A5,0x7F0400AD,0x7F0400AE }
public static int[] FontFamilyFont = new int[] {
- 2130772311,
- 2130772312,
- 2130772313};
-
- // aapt resource value: 1
- public const int FontFamilyFont_font = 1;
+ 2130968741,
+ 2130968749,
+ 2130968750};
// aapt resource value: 0
- public const int FontFamilyFont_fontStyle = 0;
+ public const int FontFamilyFont_font = 0;
+
+ // aapt resource value: 1
+ public const int FontFamilyFont_fontStyle = 1;
// aapt resource value: 2
public const int FontFamilyFont_fontWeight = 2;
+ // aapt resource value: 0
+ public const int FontFamily_fontProviderAuthority = 0;
+
+ // aapt resource value: 1
+ public const int FontFamily_fontProviderCerts = 1;
+
+ // aapt resource value: 2
+ public const int FontFamily_fontProviderFetchStrategy = 2;
+
+ // aapt resource value: 3
+ public const int FontFamily_fontProviderFetchTimeout = 3;
+
+ // aapt resource value: 4
+ public const int FontFamily_fontProviderPackage = 4;
+
+ // aapt resource value: 5
+ public const int FontFamily_fontProviderQuery = 5;
+
+ // aapt resource value: { 0x1010109,0x1010200,0x7F0400AF }
public static int[] ForegroundLinearLayout = new int[] {
16843017,
16843264,
- 2130772265};
+ 2130968751};
// aapt resource value: 0
public const int ForegroundLinearLayout_android_foreground = 0;
@@ -6796,142 +6795,146 @@
// aapt resource value: 2
public const int ForegroundLinearLayout_foregroundInsidePadding = 2;
+ // aapt resource value: { 0x7F040029,0x7F04002A,0x7F04002B,0x7F04002C,0x7F04002D,0x7F04002E,0x7F04002F,0x7F040030,0x7F040031,0x7F040032,0x7F040033,0x7F040034,0x7F040035,0x7F040036,0x7F040037,0x7F040038,0x7F040039,0x7F0400B2 }
public static int[] HDLArcSeekBar = new int[] {
- 2130772382,
- 2130772383,
- 2130772384,
- 2130772385,
- 2130772386,
- 2130772387,
- 2130772388,
- 2130772389,
- 2130772390,
- 2130772391,
- 2130772392,
- 2130772393,
- 2130772394,
- 2130772395,
- 2130772396,
- 2130772397,
- 2130772398,
- 2130772399};
+ 2130968617,
+ 2130968618,
+ 2130968619,
+ 2130968620,
+ 2130968621,
+ 2130968622,
+ 2130968623,
+ 2130968624,
+ 2130968625,
+ 2130968626,
+ 2130968627,
+ 2130968628,
+ 2130968629,
+ 2130968630,
+ 2130968631,
+ 2130968632,
+ 2130968633,
+ 2130968754};
- // aapt resource value: 5
- public const int HDLArcSeekBar_arc_border_color = 5;
-
- // aapt resource value: 4
- public const int HDLArcSeekBar_arc_border_width = 4;
-
- // aapt resource value: 3
- public const int HDLArcSeekBar_arc_colors = 3;
-
- // aapt resource value: 6
- public const int HDLArcSeekBar_arc_max = 6;
-
- // aapt resource value: 7
- public const int HDLArcSeekBar_arc_min = 7;
+ // aapt resource value: 0
+ public const int HDLArcSeekBar_arc_border_color = 0;
// aapt resource value: 1
- public const int HDLArcSeekBar_arc_open_angle = 1;
-
- // aapt resource value: 8
- public const int HDLArcSeekBar_arc_progress = 8;
-
- // aapt resource value: 16
- public const int HDLArcSeekBar_arc_progress_bar_color = 16;
-
- // aapt resource value: 17
- public const int HDLArcSeekBar_arc_progress_bar_text_unit = 17;
+ public const int HDLArcSeekBar_arc_border_width = 1;
// aapt resource value: 2
- public const int HDLArcSeekBar_arc_rotate_angle = 2;
+ public const int HDLArcSeekBar_arc_colors = 2;
- // aapt resource value: 15
- public const int HDLArcSeekBar_arc_shadow_radius = 15;
+ // aapt resource value: 3
+ public const int HDLArcSeekBar_arc_max = 3;
+
+ // aapt resource value: 4
+ public const int HDLArcSeekBar_arc_min = 4;
+
+ // aapt resource value: 5
+ public const int HDLArcSeekBar_arc_open_angle = 5;
+
+ // aapt resource value: 6
+ public const int HDLArcSeekBar_arc_progress = 6;
+
+ // aapt resource value: 7
+ public const int HDLArcSeekBar_arc_progress_bar_color = 7;
+
+ // aapt resource value: 8
+ public const int HDLArcSeekBar_arc_progress_bar_text_unit = 8;
+
+ // aapt resource value: 9
+ public const int HDLArcSeekBar_arc_rotate_angle = 9;
// aapt resource value: 10
- public const int HDLArcSeekBar_arc_thumb_color = 10;
+ public const int HDLArcSeekBar_arc_shadow_radius = 10;
// aapt resource value: 11
- public const int HDLArcSeekBar_arc_thumb_radius = 11;
+ public const int HDLArcSeekBar_arc_thumb_color = 11;
+
+ // aapt resource value: 12
+ public const int HDLArcSeekBar_arc_thumb_radius = 12;
// aapt resource value: 13
public const int HDLArcSeekBar_arc_thumb_shadow_color = 13;
- // aapt resource value: 12
- public const int HDLArcSeekBar_arc_thumb_shadow_radius = 12;
+ // aapt resource value: 14
+ public const int HDLArcSeekBar_arc_thumb_shadow_radius = 14;
- // aapt resource value: 9
- public const int HDLArcSeekBar_arc_thumb_width = 9;
+ // aapt resource value: 15
+ public const int HDLArcSeekBar_arc_thumb_width = 15;
+
+ // aapt resource value: 16
+ public const int HDLArcSeekBar_arc_width = 16;
+
+ // aapt resource value: 17
+ public const int HDLArcSeekBar_hdl_arc_thumb_mode = 17;
+
+ // aapt resource value: { 0x7F04007E,0x7F04007F,0x7F040080,0x7F040081,0x7F040082,0x7F04010F }
+ public static int[] HDLCurtainSeekBar = new int[] {
+ 2130968702,
+ 2130968703,
+ 2130968704,
+ 2130968705,
+ 2130968706,
+ 2130968847};
// aapt resource value: 0
- public const int HDLArcSeekBar_arc_width = 0;
+ public const int HDLCurtainSeekBar_curtain_bar_bg_color = 0;
- // aapt resource value: 14
- public const int HDLArcSeekBar_hdl_arc_thumb_mode = 14;
-
- public static int[] HDLCurtainSeekBar = new int[] {
- 2130772400,
- 2130772401,
- 2130772402,
- 2130772403,
- 2130772404,
- 2130772405};
+ // aapt resource value: 1
+ public const int HDLCurtainSeekBar_curtain_bar_border_color = 1;
// aapt resource value: 2
- public const int HDLCurtainSeekBar_curtain_bar_bg_color = 2;
+ public const int HDLCurtainSeekBar_curtain_bar_color = 2;
// aapt resource value: 3
- public const int HDLCurtainSeekBar_curtain_bar_border_color = 3;
-
- // aapt resource value: 0
- public const int HDLCurtainSeekBar_curtain_bar_color = 0;
-
- // aapt resource value: 5
- public const int HDLCurtainSeekBar_curtain_bar_height = 5;
+ public const int HDLCurtainSeekBar_curtain_bar_height = 3;
// aapt resource value: 4
public const int HDLCurtainSeekBar_curtain_bar_width = 4;
- // aapt resource value: 1
- public const int HDLCurtainSeekBar_second_curtain_bar_color = 1;
+ // aapt resource value: 5
+ public const int HDLCurtainSeekBar_second_curtain_bar_color = 5;
+ // aapt resource value: { 0x7F040110,0x7F0401AD,0x7F0401AE,0x7F0401AF,0x7F0401B0,0x7F0401B1 }
public static int[] HDLWaveSeekBar = new int[] {
- 2130772406,
- 2130772407,
- 2130772408,
- 2130772409,
- 2130772410,
- 2130772411};
-
- // aapt resource value: 1
- public const int HDLWaveSeekBar_second_wave_color = 1;
-
- // aapt resource value: 2
- public const int HDLWaveSeekBar_wave_bg_color = 2;
-
- // aapt resource value: 3
- public const int HDLWaveSeekBar_wave_border_color = 3;
+ 2130968848,
+ 2130969005,
+ 2130969006,
+ 2130969007,
+ 2130969008,
+ 2130969009};
// aapt resource value: 0
- public const int HDLWaveSeekBar_wave_color = 0;
+ public const int HDLWaveSeekBar_second_wave_color = 0;
- // aapt resource value: 5
- public const int HDLWaveSeekBar_wave_height = 5;
+ // aapt resource value: 1
+ public const int HDLWaveSeekBar_wave_bg_color = 1;
+
+ // aapt resource value: 2
+ public const int HDLWaveSeekBar_wave_border_color = 2;
+
+ // aapt resource value: 3
+ public const int HDLWaveSeekBar_wave_color = 3;
// aapt resource value: 4
- public const int HDLWaveSeekBar_wave_width = 4;
+ public const int HDLWaveSeekBar_wave_height = 4;
+ // aapt resource value: 5
+ public const int HDLWaveSeekBar_wave_width = 5;
+
+ // aapt resource value: { 0x10100AF,0x10100C4,0x1010126,0x1010127,0x1010128,0x7F040088,0x7F04008A,0x7F0400E7,0x7F040115 }
public static int[] LinearLayoutCompat = new int[] {
16842927,
16842948,
16843046,
16843047,
16843048,
- 2130771988,
- 2130772158,
- 2130772159,
- 2130772160};
+ 2130968712,
+ 2130968714,
+ 2130968807,
+ 2130968853};
// aapt resource value: 2
public const int LinearLayoutCompat_android_baselineAligned = 2;
@@ -6951,15 +6954,10 @@
// aapt resource value: 5
public const int LinearLayoutCompat_divider = 5;
- // aapt resource value: 8
- public const int LinearLayoutCompat_dividerPadding = 8;
-
// aapt resource value: 6
- public const int LinearLayoutCompat_measureWithLargestChild = 6;
+ public const int LinearLayoutCompat_dividerPadding = 6;
- // aapt resource value: 7
- public const int LinearLayoutCompat_showDividers = 7;
-
+ // aapt resource value: { 0x10100B3,0x10100F4,0x10100F5,0x1010181 }
public static int[] LinearLayoutCompat_Layout = new int[] {
16842931,
16842996,
@@ -6978,6 +6976,13 @@
// aapt resource value: 1
public const int LinearLayoutCompat_Layout_android_layout_width = 1;
+ // aapt resource value: 7
+ public const int LinearLayoutCompat_measureWithLargestChild = 7;
+
+ // aapt resource value: 8
+ public const int LinearLayoutCompat_showDividers = 8;
+
+ // aapt resource value: { 0x10102AC,0x10102AD }
public static int[] ListPopupWindow = new int[] {
16843436,
16843437};
@@ -6988,6 +6993,7 @@
// aapt resource value: 1
public const int ListPopupWindow_android_dropDownVerticalOffset = 1;
+ // aapt resource value: { 0x101000E,0x10100D0,0x1010194,0x10101DE,0x10101DF,0x10101E0 }
public static int[] MenuGroup = new int[] {
16842766,
16842960,
@@ -7014,6 +7020,7 @@
// aapt resource value: 2
public const int MenuGroup_android_visible = 2;
+ // aapt resource value: { 0x1010002,0x101000E,0x10100D0,0x1010106,0x1010194,0x10101DE,0x10101DF,0x10101E1,0x10101E2,0x10101E3,0x10101E4,0x10101E5,0x101026F,0x7F04000D,0x7F04001F,0x7F040020,0x7F040028,0x7F040071,0x7F0400BC,0x7F0400BD,0x7F0400ED,0x7F040114,0x7F0401A7 }
public static int[] MenuItem = new int[] {
16842754,
16842766,
@@ -7028,28 +7035,28 @@
16843236,
16843237,
16843375,
- 2130772161,
- 2130772162,
- 2130772163,
- 2130772164,
- 2130772165,
- 2130772166,
- 2130772167,
- 2130772168,
- 2130772169,
- 2130772170};
-
- // aapt resource value: 16
- public const int MenuItem_actionLayout = 16;
-
- // aapt resource value: 18
- public const int MenuItem_actionProviderClass = 18;
-
- // aapt resource value: 17
- public const int MenuItem_actionViewClass = 17;
+ 2130968589,
+ 2130968607,
+ 2130968608,
+ 2130968616,
+ 2130968689,
+ 2130968764,
+ 2130968765,
+ 2130968813,
+ 2130968852,
+ 2130968999};
// aapt resource value: 13
- public const int MenuItem_alphabeticModifiers = 13;
+ public const int MenuItem_actionLayout = 13;
+
+ // aapt resource value: 14
+ public const int MenuItem_actionProviderClass = 14;
+
+ // aapt resource value: 15
+ public const int MenuItem_actionViewClass = 15;
+
+ // aapt resource value: 16
+ public const int MenuItem_alphabeticModifiers = 16;
// aapt resource value: 9
public const int MenuItem_android_alphabeticShortcut = 9;
@@ -7090,24 +7097,25 @@
// aapt resource value: 4
public const int MenuItem_android_visible = 4;
+ // aapt resource value: 17
+ public const int MenuItem_contentDescription = 17;
+
+ // aapt resource value: 18
+ public const int MenuItem_iconTint = 18;
+
// aapt resource value: 19
- public const int MenuItem_contentDescription = 19;
-
- // aapt resource value: 21
- public const int MenuItem_iconTint = 21;
-
- // aapt resource value: 22
- public const int MenuItem_iconTintMode = 22;
-
- // aapt resource value: 14
- public const int MenuItem_numericModifiers = 14;
-
- // aapt resource value: 15
- public const int MenuItem_showAsAction = 15;
+ public const int MenuItem_iconTintMode = 19;
// aapt resource value: 20
- public const int MenuItem_tooltipText = 20;
+ public const int MenuItem_numericModifiers = 20;
+ // aapt resource value: 21
+ public const int MenuItem_showAsAction = 21;
+
+ // aapt resource value: 22
+ public const int MenuItem_tooltipText = 22;
+
+ // aapt resource value: { 0x10100AE,0x101012C,0x101012D,0x101012E,0x101012F,0x1010130,0x1010131,0x7F0400FE,0x7F040166 }
public static int[] MenuView = new int[] {
16842926,
16843052,
@@ -7116,8 +7124,8 @@
16843055,
16843056,
16843057,
- 2130772171,
- 2130772172};
+ 2130968830,
+ 2130968934};
// aapt resource value: 4
public const int MenuView_android_headerBackground = 4;
@@ -7146,17 +7154,18 @@
// aapt resource value: 8
public const int MenuView_subMenuArrow = 8;
+ // aapt resource value: { 0x10100D4,0x10100DD,0x101011F,0x7F040093,0x7F0400B3,0x7F0400C4,0x7F0400C5,0x7F0400C7,0x7F0400C8,0x7F0400E8 }
public static int[] NavigationView = new int[] {
16842964,
16842973,
16843039,
- 2130772005,
- 2130772266,
- 2130772267,
- 2130772268,
- 2130772269,
- 2130772270,
- 2130772271};
+ 2130968723,
+ 2130968755,
+ 2130968772,
+ 2130968773,
+ 2130968775,
+ 2130968776,
+ 2130968808};
// aapt resource value: 0
public const int NavigationView_android_background = 0;
@@ -7170,28 +7179,63 @@
// aapt resource value: 3
public const int NavigationView_elevation = 3;
- // aapt resource value: 9
- public const int NavigationView_headerLayout = 9;
-
- // aapt resource value: 7
- public const int NavigationView_itemBackground = 7;
+ // aapt resource value: 4
+ public const int NavigationView_headerLayout = 4;
// aapt resource value: 5
- public const int NavigationView_itemIconTint = 5;
-
- // aapt resource value: 8
- public const int NavigationView_itemTextAppearance = 8;
+ public const int NavigationView_itemBackground = 5;
// aapt resource value: 6
- public const int NavigationView_itemTextColor = 6;
+ public const int NavigationView_itemIconTint = 6;
+
+ // aapt resource value: 7
+ public const int NavigationView_itemTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int NavigationView_itemTextColor = 8;
+
+ // aapt resource value: 9
+ public const int NavigationView_menu = 9;
+
+ // aapt resource value: { 0x7F0401B2,0x7F0401B3,0x7F0401B4,0x7F0401B5,0x7F0401B6,0x7F0401B7 }
+ public static int[] pickerview = new int[] {
+ 2130969010,
+ 2130969011,
+ 2130969012,
+ 2130969013,
+ 2130969014,
+ 2130969015};
+
+ // aapt resource value: 0
+ public const int pickerview_wheelview_dividerColor = 0;
+
+ // aapt resource value: 1
+ public const int pickerview_wheelview_gravity = 1;
+
+ // aapt resource value: 2
+ public const int pickerview_wheelview_lineSpacingMultiplier = 2;
+
+ // aapt resource value: 3
+ public const int pickerview_wheelview_textColorCenter = 3;
// aapt resource value: 4
- public const int NavigationView_menu = 4;
+ public const int pickerview_wheelview_textColorOut = 4;
+ // aapt resource value: 5
+ public const int pickerview_wheelview_textSize = 5;
+
+ // aapt resource value: { 0x1010176,0x10102C9,0x7F0400EE }
public static int[] PopupWindow = new int[] {
16843126,
16843465,
- 2130772173};
+ 2130968814};
+
+ // aapt resource value: { 0x7F040161 }
+ public static int[] PopupWindowBackgroundState = new int[] {
+ 2130968929};
+
+ // aapt resource value: 0
+ public const int PopupWindowBackgroundState_state_above_anchor = 0;
// aapt resource value: 1
public const int PopupWindow_android_popupAnimationStyle = 1;
@@ -7202,15 +7246,10 @@
// aapt resource value: 2
public const int PopupWindow_overlapAnchor = 2;
- public static int[] PopupWindowBackgroundState = new int[] {
- 2130772174};
-
- // aapt resource value: 0
- public const int PopupWindowBackgroundState_state_above_anchor = 0;
-
+ // aapt resource value: { 0x7F0400EF,0x7F0400F2 }
public static int[] RecycleListView = new int[] {
- 2130772175,
- 2130772176};
+ 2130968815,
+ 2130968818};
// aapt resource value: 0
public const int RecycleListView_paddingBottomNoButtons = 0;
@@ -7218,18 +7257,19 @@
// aapt resource value: 1
public const int RecycleListView_paddingTopNoTitle = 1;
+ // aapt resource value: { 0x10100C4,0x10100F1,0x7F0400A0,0x7F0400A1,0x7F0400A2,0x7F0400A3,0x7F0400A4,0x7F0400CB,0x7F040108,0x7F040119,0x7F040160 }
public static int[] RecyclerView = new int[] {
16842948,
16842993,
- 2130771968,
- 2130771969,
- 2130771970,
- 2130771971,
- 2130771972,
- 2130771973,
- 2130771974,
- 2130771975,
- 2130771976};
+ 2130968736,
+ 2130968737,
+ 2130968738,
+ 2130968739,
+ 2130968740,
+ 2130968779,
+ 2130968840,
+ 2130968857,
+ 2130968928};
// aapt resource value: 1
public const int RecyclerView_android_descendantFocusability = 1;
@@ -7237,63 +7277,66 @@
// aapt resource value: 0
public const int RecyclerView_android_orientation = 0;
- // aapt resource value: 6
- public const int RecyclerView_fastScrollEnabled = 6;
-
- // aapt resource value: 9
- public const int RecyclerView_fastScrollHorizontalThumbDrawable = 9;
-
- // aapt resource value: 10
- public const int RecyclerView_fastScrollHorizontalTrackDrawable = 10;
-
- // aapt resource value: 7
- public const int RecyclerView_fastScrollVerticalThumbDrawable = 7;
-
- // aapt resource value: 8
- public const int RecyclerView_fastScrollVerticalTrackDrawable = 8;
-
// aapt resource value: 2
- public const int RecyclerView_layoutManager = 2;
-
- // aapt resource value: 4
- public const int RecyclerView_reverseLayout = 4;
+ public const int RecyclerView_fastScrollEnabled = 2;
// aapt resource value: 3
- public const int RecyclerView_spanCount = 3;
+ public const int RecyclerView_fastScrollHorizontalThumbDrawable = 3;
+
+ // aapt resource value: 4
+ public const int RecyclerView_fastScrollHorizontalTrackDrawable = 4;
// aapt resource value: 5
- public const int RecyclerView_stackFromEnd = 5;
+ public const int RecyclerView_fastScrollVerticalThumbDrawable = 5;
+ // aapt resource value: 6
+ public const int RecyclerView_fastScrollVerticalTrackDrawable = 6;
+
+ // aapt resource value: 7
+ public const int RecyclerView_layoutManager = 7;
+
+ // aapt resource value: 8
+ public const int RecyclerView_reverseLayout = 8;
+
+ // aapt resource value: 9
+ public const int RecyclerView_spanCount = 9;
+
+ // aapt resource value: 10
+ public const int RecyclerView_stackFromEnd = 10;
+
+ // aapt resource value: { 0x7F0400C2 }
public static int[] ScrimInsetsFrameLayout = new int[] {
- 2130772272};
+ 2130968770};
// aapt resource value: 0
public const int ScrimInsetsFrameLayout_insetForeground = 0;
+ // aapt resource value: { 0x7F04004A }
public static int[] ScrollingViewBehavior_Layout = new int[] {
- 2130772273};
+ 2130968650};
// aapt resource value: 0
public const int ScrollingViewBehavior_Layout_behavior_overlapTop = 0;
+ // aapt resource value: { 0x10100DA,0x101011F,0x1010220,0x1010264,0x7F04005F,0x7F040070,0x7F040084,0x7F0400B1,0x7F0400BE,0x7F0400CA,0x7F040102,0x7F040103,0x7F04010C,0x7F04010D,0x7F040167,0x7F04016C,0x7F0401AC }
public static int[] SearchView = new int[] {
16842970,
16843039,
16843296,
16843364,
- 2130772177,
- 2130772178,
- 2130772179,
- 2130772180,
- 2130772181,
- 2130772182,
- 2130772183,
- 2130772184,
- 2130772185,
- 2130772186,
- 2130772187,
- 2130772188,
- 2130772189};
+ 2130968671,
+ 2130968688,
+ 2130968708,
+ 2130968753,
+ 2130968766,
+ 2130968778,
+ 2130968834,
+ 2130968835,
+ 2130968844,
+ 2130968845,
+ 2130968935,
+ 2130968940,
+ 2130969004};
// aapt resource value: 0
public const int SearchView_android_focusable = 0;
@@ -7307,83 +7350,84 @@
// aapt resource value: 1
public const int SearchView_android_maxWidth = 1;
- // aapt resource value: 8
- public const int SearchView_closeIcon = 8;
-
- // aapt resource value: 13
- public const int SearchView_commitIcon = 13;
-
- // aapt resource value: 7
- public const int SearchView_defaultQueryHint = 7;
-
- // aapt resource value: 9
- public const int SearchView_goIcon = 9;
+ // aapt resource value: 4
+ public const int SearchView_closeIcon = 4;
// aapt resource value: 5
- public const int SearchView_iconifiedByDefault = 5;
-
- // aapt resource value: 4
- public const int SearchView_layout = 4;
-
- // aapt resource value: 15
- public const int SearchView_queryBackground = 15;
+ public const int SearchView_commitIcon = 5;
// aapt resource value: 6
- public const int SearchView_queryHint = 6;
+ public const int SearchView_defaultQueryHint = 6;
- // aapt resource value: 11
- public const int SearchView_searchHintIcon = 11;
+ // aapt resource value: 7
+ public const int SearchView_goIcon = 7;
+
+ // aapt resource value: 8
+ public const int SearchView_iconifiedByDefault = 8;
+
+ // aapt resource value: 9
+ public const int SearchView_layout = 9;
// aapt resource value: 10
- public const int SearchView_searchIcon = 10;
+ public const int SearchView_queryBackground = 10;
- // aapt resource value: 16
- public const int SearchView_submitBackground = 16;
-
- // aapt resource value: 14
- public const int SearchView_suggestionRowLayout = 14;
+ // aapt resource value: 11
+ public const int SearchView_queryHint = 11;
// aapt resource value: 12
- public const int SearchView_voiceIcon = 12;
+ public const int SearchView_searchHintIcon = 12;
+ // aapt resource value: 13
+ public const int SearchView_searchIcon = 13;
+
+ // aapt resource value: 14
+ public const int SearchView_submitBackground = 14;
+
+ // aapt resource value: 15
+ public const int SearchView_suggestionRowLayout = 15;
+
+ // aapt resource value: 16
+ public const int SearchView_voiceIcon = 16;
+
+ // aapt resource value: { 0x10100EA,0x10100EB,0x7F04011F,0x7F040122,0x7F040123,0x7F040124,0x7F04012B,0x7F04012C,0x7F04012D,0x7F04012E,0x7F04012F,0x7F040130,0x7F040131,0x7F040134,0x7F040135,0x7F040136,0x7F040137,0x7F040138,0x7F040139,0x7F04013B,0x7F04013C,0x7F04013D,0x7F04013E,0x7F040141,0x7F040142,0x7F040145,0x7F040146,0x7F040147,0x7F040148,0x7F040149,0x7F04014A,0x7F04014B,0x7F04014C,0x7F04014D,0x7F04014E,0x7F040151,0x7F040152 }
public static int[] SmartRefreshLayout = new int[] {
16842986,
16842987,
- 2130772316,
- 2130772326,
- 2130772342,
- 2130772343,
- 2130772344,
- 2130772345,
- 2130772346,
- 2130772347,
- 2130772348,
- 2130772349,
- 2130772350,
- 2130772351,
- 2130772352,
- 2130772353,
- 2130772354,
- 2130772355,
- 2130772356,
- 2130772357,
- 2130772358,
- 2130772359,
- 2130772360,
- 2130772361,
- 2130772362,
- 2130772363,
- 2130772364,
- 2130772365,
- 2130772366,
- 2130772367,
- 2130772368,
- 2130772369,
- 2130772370,
- 2130772371,
- 2130772372,
- 2130772373,
- 2130772374};
+ 2130968863,
+ 2130968866,
+ 2130968867,
+ 2130968868,
+ 2130968875,
+ 2130968876,
+ 2130968877,
+ 2130968878,
+ 2130968879,
+ 2130968880,
+ 2130968881,
+ 2130968884,
+ 2130968885,
+ 2130968886,
+ 2130968887,
+ 2130968888,
+ 2130968889,
+ 2130968891,
+ 2130968892,
+ 2130968893,
+ 2130968894,
+ 2130968897,
+ 2130968898,
+ 2130968901,
+ 2130968902,
+ 2130968903,
+ 2130968904,
+ 2130968905,
+ 2130968906,
+ 2130968907,
+ 2130968908,
+ 2130968909,
+ 2130968910,
+ 2130968913,
+ 2130968914};
// aapt resource value: 0
public const int SmartRefreshLayout_android_clipChildren = 0;
@@ -7391,125 +7435,127 @@
// aapt resource value: 1
public const int SmartRefreshLayout_android_clipToPadding = 1;
+ // aapt resource value: { 0x7F0400D6,0x7F0400D7 }
+ public static int[] SmartRefreshLayout_Layout = new int[] {
+ 2130968790,
+ 2130968791};
+
+ // aapt resource value: 0
+ public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 0;
+
+ // aapt resource value: 1
+ public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 1;
+
// aapt resource value: 2
public const int SmartRefreshLayout_srlAccentColor = 2;
- // aapt resource value: 34
- public const int SmartRefreshLayout_srlDisableContentWhenLoading = 34;
-
- // aapt resource value: 33
- public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 33;
-
- // aapt resource value: 9
- public const int SmartRefreshLayout_srlDragRate = 9;
-
- // aapt resource value: 21
- public const int SmartRefreshLayout_srlEnableAutoLoadMore = 21;
-
- // aapt resource value: 31
- public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 31;
-
- // aapt resource value: 30
- public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 30;
-
- // aapt resource value: 28
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 28;
-
- // aapt resource value: 29
- public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 29;
-
- // aapt resource value: 17
- public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 17;
-
- // aapt resource value: 16
- public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 16;
-
- // aapt resource value: 15
- public const int SmartRefreshLayout_srlEnableLoadMore = 15;
-
- // aapt resource value: 27
- public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 27;
-
- // aapt resource value: 24
- public const int SmartRefreshLayout_srlEnableNestedScrolling = 24;
-
- // aapt resource value: 22
- public const int SmartRefreshLayout_srlEnableOverScrollBounce = 22;
-
- // aapt resource value: 32
- public const int SmartRefreshLayout_srlEnableOverScrollDrag = 32;
-
- // aapt resource value: 20
- public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 20;
-
- // aapt resource value: 23
- public const int SmartRefreshLayout_srlEnablePureScrollMode = 23;
-
- // aapt resource value: 14
- public const int SmartRefreshLayout_srlEnableRefresh = 14;
-
- // aapt resource value: 25
- public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 25;
-
- // aapt resource value: 26
- public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 26;
-
- // aapt resource value: 36
- public const int SmartRefreshLayout_srlFixedFooterViewId = 36;
-
- // aapt resource value: 35
- public const int SmartRefreshLayout_srlFixedHeaderViewId = 35;
-
- // aapt resource value: 6
- public const int SmartRefreshLayout_srlFooterHeight = 6;
-
- // aapt resource value: 8
- public const int SmartRefreshLayout_srlFooterInsetStart = 8;
-
- // aapt resource value: 11
- public const int SmartRefreshLayout_srlFooterMaxDragRate = 11;
-
- // aapt resource value: 19
- public const int SmartRefreshLayout_srlFooterTranslationViewId = 19;
-
- // aapt resource value: 13
- public const int SmartRefreshLayout_srlFooterTriggerRate = 13;
-
- // aapt resource value: 5
- public const int SmartRefreshLayout_srlHeaderHeight = 5;
-
- // aapt resource value: 7
- public const int SmartRefreshLayout_srlHeaderInsetStart = 7;
-
- // aapt resource value: 10
- public const int SmartRefreshLayout_srlHeaderMaxDragRate = 10;
-
- // aapt resource value: 18
- public const int SmartRefreshLayout_srlHeaderTranslationViewId = 18;
-
- // aapt resource value: 12
- public const int SmartRefreshLayout_srlHeaderTriggerRate = 12;
-
// aapt resource value: 3
- public const int SmartRefreshLayout_srlPrimaryColor = 3;
+ public const int SmartRefreshLayout_srlDisableContentWhenLoading = 3;
// aapt resource value: 4
- public const int SmartRefreshLayout_srlReboundDuration = 4;
+ public const int SmartRefreshLayout_srlDisableContentWhenRefresh = 4;
- public static int[] SmartRefreshLayout_Layout = new int[] {
- 2130772315,
- 2130772375};
+ // aapt resource value: 5
+ public const int SmartRefreshLayout_srlDragRate = 5;
- // aapt resource value: 1
- public const int SmartRefreshLayout_Layout_layout_srlBackgroundColor = 1;
+ // aapt resource value: 6
+ public const int SmartRefreshLayout_srlEnableAutoLoadMore = 6;
- // aapt resource value: 0
- public const int SmartRefreshLayout_Layout_layout_srlSpinnerStyle = 0;
+ // aapt resource value: 7
+ public const int SmartRefreshLayout_srlEnableClipFooterWhenFixedBehind = 7;
+ // aapt resource value: 8
+ public const int SmartRefreshLayout_srlEnableClipHeaderWhenFixedBehind = 8;
+
+ // aapt resource value: 9
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenLoadFinished = 9;
+
+ // aapt resource value: 10
+ public const int SmartRefreshLayout_srlEnableFooterFollowWhenNoMoreData = 10;
+
+ // aapt resource value: 11
+ public const int SmartRefreshLayout_srlEnableFooterTranslationContent = 11;
+
+ // aapt resource value: 12
+ public const int SmartRefreshLayout_srlEnableHeaderTranslationContent = 12;
+
+ // aapt resource value: 13
+ public const int SmartRefreshLayout_srlEnableLoadMore = 13;
+
+ // aapt resource value: 14
+ public const int SmartRefreshLayout_srlEnableLoadMoreWhenContentNotFull = 14;
+
+ // aapt resource value: 15
+ public const int SmartRefreshLayout_srlEnableNestedScrolling = 15;
+
+ // aapt resource value: 16
+ public const int SmartRefreshLayout_srlEnableOverScrollBounce = 16;
+
+ // aapt resource value: 17
+ public const int SmartRefreshLayout_srlEnableOverScrollDrag = 17;
+
+ // aapt resource value: 18
+ public const int SmartRefreshLayout_srlEnablePreviewInEditMode = 18;
+
+ // aapt resource value: 19
+ public const int SmartRefreshLayout_srlEnablePureScrollMode = 19;
+
+ // aapt resource value: 20
+ public const int SmartRefreshLayout_srlEnableRefresh = 20;
+
+ // aapt resource value: 21
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenLoaded = 21;
+
+ // aapt resource value: 22
+ public const int SmartRefreshLayout_srlEnableScrollContentWhenRefreshed = 22;
+
+ // aapt resource value: 23
+ public const int SmartRefreshLayout_srlFixedFooterViewId = 23;
+
+ // aapt resource value: 24
+ public const int SmartRefreshLayout_srlFixedHeaderViewId = 24;
+
+ // aapt resource value: 25
+ public const int SmartRefreshLayout_srlFooterHeight = 25;
+
+ // aapt resource value: 26
+ public const int SmartRefreshLayout_srlFooterInsetStart = 26;
+
+ // aapt resource value: 27
+ public const int SmartRefreshLayout_srlFooterMaxDragRate = 27;
+
+ // aapt resource value: 28
+ public const int SmartRefreshLayout_srlFooterTranslationViewId = 28;
+
+ // aapt resource value: 29
+ public const int SmartRefreshLayout_srlFooterTriggerRate = 29;
+
+ // aapt resource value: 30
+ public const int SmartRefreshLayout_srlHeaderHeight = 30;
+
+ // aapt resource value: 31
+ public const int SmartRefreshLayout_srlHeaderInsetStart = 31;
+
+ // aapt resource value: 32
+ public const int SmartRefreshLayout_srlHeaderMaxDragRate = 32;
+
+ // aapt resource value: 33
+ public const int SmartRefreshLayout_srlHeaderTranslationViewId = 33;
+
+ // aapt resource value: 34
+ public const int SmartRefreshLayout_srlHeaderTriggerRate = 34;
+
+ // aapt resource value: 35
+ public const int SmartRefreshLayout_srlPrimaryColor = 35;
+
+ // aapt resource value: 36
+ public const int SmartRefreshLayout_srlReboundDuration = 36;
+
+ // aapt resource value: { 0x101011F,0x7F040093,0x7F0400E5 }
public static int[] SnackbarLayout = new int[] {
16843039,
- 2130772005,
- 2130772274};
+ 2130968723,
+ 2130968805};
// aapt resource value: 0
public const int SnackbarLayout_android_maxWidth = 0;
@@ -7520,12 +7566,13 @@
// aapt resource value: 2
public const int SnackbarLayout_maxActionInlineWidth = 2;
+ // aapt resource value: { 0x10100B2,0x1010176,0x101017B,0x1010262,0x7F0400FC }
public static int[] Spinner = new int[] {
16842930,
16843126,
16843131,
16843362,
- 2130772006};
+ 2130968828};
// aapt resource value: 3
public const int Spinner_android_dropDownWidth = 3;
@@ -7542,21 +7589,22 @@
// aapt resource value: 4
public const int Spinner_popupTheme = 4;
+ // aapt resource value: { 0x1010124,0x1010125,0x1010142,0x7F040116,0x7F04011D,0x7F04016D,0x7F04016E,0x7F040170,0x7F04018F,0x7F040190,0x7F040191,0x7F0401A8,0x7F0401A9,0x7F0401AA }
public static int[] SwitchCompat = new int[] {
16843044,
16843045,
16843074,
- 2130772190,
- 2130772191,
- 2130772192,
- 2130772193,
- 2130772194,
- 2130772195,
- 2130772196,
- 2130772197,
- 2130772198,
- 2130772199,
- 2130772200};
+ 2130968854,
+ 2130968861,
+ 2130968941,
+ 2130968942,
+ 2130968944,
+ 2130968975,
+ 2130968976,
+ 2130968977,
+ 2130969000,
+ 2130969001,
+ 2130969002};
// aapt resource value: 1
public const int SwitchCompat_android_textOff = 1;
@@ -7567,39 +7615,40 @@
// aapt resource value: 2
public const int SwitchCompat_android_thumb = 2;
- // aapt resource value: 13
- public const int SwitchCompat_showText = 13;
+ // aapt resource value: 3
+ public const int SwitchCompat_showText = 3;
- // aapt resource value: 12
- public const int SwitchCompat_splitTrack = 12;
+ // aapt resource value: 4
+ public const int SwitchCompat_splitTrack = 4;
- // aapt resource value: 10
- public const int SwitchCompat_switchMinWidth = 10;
+ // aapt resource value: 5
+ public const int SwitchCompat_switchMinWidth = 5;
- // aapt resource value: 11
- public const int SwitchCompat_switchPadding = 11;
+ // aapt resource value: 6
+ public const int SwitchCompat_switchPadding = 6;
- // aapt resource value: 9
- public const int SwitchCompat_switchTextAppearance = 9;
+ // aapt resource value: 7
+ public const int SwitchCompat_switchTextAppearance = 7;
// aapt resource value: 8
public const int SwitchCompat_thumbTextPadding = 8;
- // aapt resource value: 3
- public const int SwitchCompat_thumbTint = 3;
+ // aapt resource value: 9
+ public const int SwitchCompat_thumbTint = 9;
- // aapt resource value: 4
- public const int SwitchCompat_thumbTintMode = 4;
+ // aapt resource value: 10
+ public const int SwitchCompat_thumbTintMode = 10;
- // aapt resource value: 5
- public const int SwitchCompat_track = 5;
+ // aapt resource value: 11
+ public const int SwitchCompat_track = 11;
- // aapt resource value: 6
- public const int SwitchCompat_trackTint = 6;
+ // aapt resource value: 12
+ public const int SwitchCompat_trackTint = 12;
- // aapt resource value: 7
- public const int SwitchCompat_trackTintMode = 7;
+ // aapt resource value: 13
+ public const int SwitchCompat_trackTintMode = 13;
+ // aapt resource value: { 0x1010002,0x10100F2,0x101014F }
public static int[] TabItem = new int[] {
16842754,
16842994,
@@ -7614,56 +7663,57 @@
// aapt resource value: 2
public const int TabItem_android_text = 2;
+ // aapt resource value: { 0x7F040171,0x7F040172,0x7F040173,0x7F040174,0x7F040175,0x7F040176,0x7F040177,0x7F040178,0x7F040179,0x7F04017A,0x7F04017B,0x7F04017C,0x7F04017D,0x7F04017E,0x7F04017F,0x7F040180 }
public static int[] TabLayout = new int[] {
- 2130772275,
- 2130772276,
- 2130772277,
- 2130772278,
- 2130772279,
- 2130772280,
- 2130772281,
- 2130772282,
- 2130772283,
- 2130772284,
- 2130772285,
- 2130772286,
- 2130772287,
- 2130772288,
- 2130772289,
- 2130772290};
-
- // aapt resource value: 3
- public const int TabLayout_tabBackground = 3;
-
- // aapt resource value: 2
- public const int TabLayout_tabContentStart = 2;
-
- // aapt resource value: 5
- public const int TabLayout_tabGravity = 5;
+ 2130968945,
+ 2130968946,
+ 2130968947,
+ 2130968948,
+ 2130968949,
+ 2130968950,
+ 2130968951,
+ 2130968952,
+ 2130968953,
+ 2130968954,
+ 2130968955,
+ 2130968956,
+ 2130968957,
+ 2130968958,
+ 2130968959,
+ 2130968960};
// aapt resource value: 0
- public const int TabLayout_tabIndicatorColor = 0;
+ public const int TabLayout_tabBackground = 0;
// aapt resource value: 1
- public const int TabLayout_tabIndicatorHeight = 1;
+ public const int TabLayout_tabContentStart = 1;
- // aapt resource value: 7
- public const int TabLayout_tabMaxWidth = 7;
+ // aapt resource value: 2
+ public const int TabLayout_tabGravity = 2;
+
+ // aapt resource value: 3
+ public const int TabLayout_tabIndicatorColor = 3;
+
+ // aapt resource value: 4
+ public const int TabLayout_tabIndicatorHeight = 4;
+
+ // aapt resource value: 5
+ public const int TabLayout_tabMaxWidth = 5;
// aapt resource value: 6
public const int TabLayout_tabMinWidth = 6;
- // aapt resource value: 4
- public const int TabLayout_tabMode = 4;
+ // aapt resource value: 7
+ public const int TabLayout_tabMode = 7;
- // aapt resource value: 15
- public const int TabLayout_tabPadding = 15;
+ // aapt resource value: 8
+ public const int TabLayout_tabPadding = 8;
- // aapt resource value: 14
- public const int TabLayout_tabPaddingBottom = 14;
+ // aapt resource value: 9
+ public const int TabLayout_tabPaddingBottom = 9;
- // aapt resource value: 13
- public const int TabLayout_tabPaddingEnd = 13;
+ // aapt resource value: 10
+ public const int TabLayout_tabPaddingEnd = 10;
// aapt resource value: 11
public const int TabLayout_tabPaddingStart = 11;
@@ -7671,15 +7721,16 @@
// aapt resource value: 12
public const int TabLayout_tabPaddingTop = 12;
- // aapt resource value: 10
- public const int TabLayout_tabSelectedTextColor = 10;
+ // aapt resource value: 13
+ public const int TabLayout_tabSelectedTextColor = 13;
- // aapt resource value: 8
- public const int TabLayout_tabTextAppearance = 8;
+ // aapt resource value: 14
+ public const int TabLayout_tabTextAppearance = 14;
- // aapt resource value: 9
- public const int TabLayout_tabTextColor = 9;
+ // aapt resource value: 15
+ public const int TabLayout_tabTextColor = 15;
+ // aapt resource value: { 0x1010095,0x1010096,0x1010097,0x1010098,0x101009A,0x101009B,0x1010161,0x1010162,0x1010163,0x1010164,0x10103AC,0x7F0400A6,0x7F040181 }
public static int[] TextAppearance = new int[] {
16842901,
16842902,
@@ -7692,8 +7743,8 @@
16843107,
16843108,
16843692,
- 2130772022,
- 2130772028};
+ 2130968742,
+ 2130968961};
// aapt resource value: 10
public const int TextAppearance_android_fontFamily = 10;
@@ -7728,29 +7779,30 @@
// aapt resource value: 1
public const int TextAppearance_android_typeface = 1;
- // aapt resource value: 12
- public const int TextAppearance_fontFamily = 12;
-
// aapt resource value: 11
- public const int TextAppearance_textAllCaps = 11;
+ public const int TextAppearance_fontFamily = 11;
+ // aapt resource value: 12
+ public const int TextAppearance_textAllCaps = 12;
+
+ // aapt resource value: { 0x101009A,0x1010150,0x7F04007A,0x7F04007B,0x7F04007C,0x7F04007D,0x7F040094,0x7F040095,0x7F0400B6,0x7F0400B7,0x7F0400B8,0x7F0400F6,0x7F0400F7,0x7F0400F8,0x7F0400F9,0x7F0400FA }
public static int[] TextInputLayout = new int[] {
16842906,
16843088,
- 2130772291,
- 2130772292,
- 2130772293,
- 2130772294,
- 2130772295,
- 2130772296,
- 2130772297,
- 2130772298,
- 2130772299,
- 2130772300,
- 2130772301,
- 2130772302,
- 2130772303,
- 2130772304};
+ 2130968698,
+ 2130968699,
+ 2130968700,
+ 2130968701,
+ 2130968724,
+ 2130968725,
+ 2130968758,
+ 2130968759,
+ 2130968760,
+ 2130968822,
+ 2130968823,
+ 2130968824,
+ 2130968825,
+ 2130968826};
// aapt resource value: 1
public const int TextInputLayout_android_hint = 1;
@@ -7758,41 +7810,41 @@
// aapt resource value: 0
public const int TextInputLayout_android_textColorHint = 0;
- // aapt resource value: 6
- public const int TextInputLayout_counterEnabled = 6;
-
- // aapt resource value: 7
- public const int TextInputLayout_counterMaxLength = 7;
-
- // aapt resource value: 9
- public const int TextInputLayout_counterOverflowTextAppearance = 9;
-
- // aapt resource value: 8
- public const int TextInputLayout_counterTextAppearance = 8;
-
- // aapt resource value: 4
- public const int TextInputLayout_errorEnabled = 4;
-
- // aapt resource value: 5
- public const int TextInputLayout_errorTextAppearance = 5;
-
- // aapt resource value: 10
- public const int TextInputLayout_hintAnimationEnabled = 10;
+ // aapt resource value: 2
+ public const int TextInputLayout_counterEnabled = 2;
// aapt resource value: 3
- public const int TextInputLayout_hintEnabled = 3;
+ public const int TextInputLayout_counterMaxLength = 3;
- // aapt resource value: 2
- public const int TextInputLayout_hintTextAppearance = 2;
+ // aapt resource value: 4
+ public const int TextInputLayout_counterOverflowTextAppearance = 4;
- // aapt resource value: 13
- public const int TextInputLayout_passwordToggleContentDescription = 13;
+ // aapt resource value: 5
+ public const int TextInputLayout_counterTextAppearance = 5;
+
+ // aapt resource value: 6
+ public const int TextInputLayout_errorEnabled = 6;
+
+ // aapt resource value: 7
+ public const int TextInputLayout_errorTextAppearance = 7;
+
+ // aapt resource value: 8
+ public const int TextInputLayout_hintAnimationEnabled = 8;
+
+ // aapt resource value: 9
+ public const int TextInputLayout_hintEnabled = 9;
+
+ // aapt resource value: 10
+ public const int TextInputLayout_hintTextAppearance = 10;
+
+ // aapt resource value: 11
+ public const int TextInputLayout_passwordToggleContentDescription = 11;
// aapt resource value: 12
public const int TextInputLayout_passwordToggleDrawable = 12;
- // aapt resource value: 11
- public const int TextInputLayout_passwordToggleEnabled = 11;
+ // aapt resource value: 13
+ public const int TextInputLayout_passwordToggleEnabled = 13;
// aapt resource value: 14
public const int TextInputLayout_passwordToggleTint = 14;
@@ -7800,36 +7852,37 @@
// aapt resource value: 15
public const int TextInputLayout_passwordToggleTintMode = 15;
+ // aapt resource value: { 0x10100AF,0x1010140,0x7F040057,0x7F040061,0x7F040062,0x7F040072,0x7F040073,0x7F040074,0x7F040075,0x7F040076,0x7F040077,0x7F0400E3,0x7F0400E4,0x7F0400E6,0x7F0400EA,0x7F0400EB,0x7F0400FC,0x7F040168,0x7F040169,0x7F04016A,0x7F040197,0x7F040199,0x7F04019A,0x7F04019B,0x7F04019C,0x7F04019D,0x7F04019E,0x7F04019F,0x7F0401A0 }
public static int[] Toolbar = new int[] {
16842927,
16843072,
- 2130771980,
- 2130771983,
- 2130771987,
- 2130771999,
- 2130772000,
- 2130772001,
- 2130772002,
- 2130772003,
- 2130772004,
- 2130772006,
- 2130772201,
- 2130772202,
- 2130772203,
- 2130772204,
- 2130772205,
- 2130772206,
- 2130772207,
- 2130772208,
- 2130772209,
- 2130772210,
- 2130772211,
- 2130772212,
- 2130772213,
- 2130772214,
- 2130772215,
- 2130772216,
- 2130772217};
+ 2130968663,
+ 2130968673,
+ 2130968674,
+ 2130968690,
+ 2130968691,
+ 2130968692,
+ 2130968693,
+ 2130968694,
+ 2130968695,
+ 2130968803,
+ 2130968804,
+ 2130968806,
+ 2130968810,
+ 2130968811,
+ 2130968828,
+ 2130968936,
+ 2130968937,
+ 2130968938,
+ 2130968983,
+ 2130968985,
+ 2130968986,
+ 2130968987,
+ 2130968988,
+ 2130968989,
+ 2130968990,
+ 2130968991,
+ 2130968992};
// aapt resource value: 0
public const int Toolbar_android_gravity = 0;
@@ -7837,20 +7890,20 @@
// aapt resource value: 1
public const int Toolbar_android_minHeight = 1;
- // aapt resource value: 21
- public const int Toolbar_buttonGravity = 21;
+ // aapt resource value: 2
+ public const int Toolbar_buttonGravity = 2;
- // aapt resource value: 23
- public const int Toolbar_collapseContentDescription = 23;
+ // aapt resource value: 3
+ public const int Toolbar_collapseContentDescription = 3;
- // aapt resource value: 22
- public const int Toolbar_collapseIcon = 22;
+ // aapt resource value: 4
+ public const int Toolbar_collapseIcon = 4;
+
+ // aapt resource value: 5
+ public const int Toolbar_contentInsetEnd = 5;
// aapt resource value: 6
- public const int Toolbar_contentInsetEnd = 6;
-
- // aapt resource value: 10
- public const int Toolbar_contentInsetEndWithActions = 10;
+ public const int Toolbar_contentInsetEndWithActions = 6;
// aapt resource value: 7
public const int Toolbar_contentInsetLeft = 7;
@@ -7858,118 +7911,106 @@
// aapt resource value: 8
public const int Toolbar_contentInsetRight = 8;
- // aapt resource value: 5
- public const int Toolbar_contentInsetStart = 5;
-
// aapt resource value: 9
- public const int Toolbar_contentInsetStartWithNavigation = 9;
+ public const int Toolbar_contentInsetStart = 9;
- // aapt resource value: 4
- public const int Toolbar_logo = 4;
-
- // aapt resource value: 26
- public const int Toolbar_logoDescription = 26;
-
- // aapt resource value: 20
- public const int Toolbar_maxButtonHeight = 20;
-
- // aapt resource value: 25
- public const int Toolbar_navigationContentDescription = 25;
-
- // aapt resource value: 24
- public const int Toolbar_navigationIcon = 24;
+ // aapt resource value: 10
+ public const int Toolbar_contentInsetStartWithNavigation = 10;
// aapt resource value: 11
- public const int Toolbar_popupTheme = 11;
-
- // aapt resource value: 3
- public const int Toolbar_subtitle = 3;
-
- // aapt resource value: 13
- public const int Toolbar_subtitleTextAppearance = 13;
-
- // aapt resource value: 28
- public const int Toolbar_subtitleTextColor = 28;
-
- // aapt resource value: 2
- public const int Toolbar_title = 2;
-
- // aapt resource value: 14
- public const int Toolbar_titleMargin = 14;
-
- // aapt resource value: 18
- public const int Toolbar_titleMarginBottom = 18;
-
- // aapt resource value: 16
- public const int Toolbar_titleMarginEnd = 16;
-
- // aapt resource value: 15
- public const int Toolbar_titleMarginStart = 15;
-
- // aapt resource value: 17
- public const int Toolbar_titleMarginTop = 17;
-
- // aapt resource value: 19
- public const int Toolbar_titleMargins = 19;
+ public const int Toolbar_logo = 11;
// aapt resource value: 12
- public const int Toolbar_titleTextAppearance = 12;
+ public const int Toolbar_logoDescription = 12;
+
+ // aapt resource value: 13
+ public const int Toolbar_maxButtonHeight = 13;
+
+ // aapt resource value: 14
+ public const int Toolbar_navigationContentDescription = 14;
+
+ // aapt resource value: 15
+ public const int Toolbar_navigationIcon = 15;
+
+ // aapt resource value: 16
+ public const int Toolbar_popupTheme = 16;
+
+ // aapt resource value: 17
+ public const int Toolbar_subtitle = 17;
+
+ // aapt resource value: 18
+ public const int Toolbar_subtitleTextAppearance = 18;
+
+ // aapt resource value: 19
+ public const int Toolbar_subtitleTextColor = 19;
+
+ // aapt resource value: 20
+ public const int Toolbar_title = 20;
+
+ // aapt resource value: 21
+ public const int Toolbar_titleMargin = 21;
+
+ // aapt resource value: 22
+ public const int Toolbar_titleMarginBottom = 22;
+
+ // aapt resource value: 23
+ public const int Toolbar_titleMarginEnd = 23;
+
+ // aapt resource value: 26
+ public const int Toolbar_titleMargins = 26;
+
+ // aapt resource value: 24
+ public const int Toolbar_titleMarginStart = 24;
+
+ // aapt resource value: 25
+ public const int Toolbar_titleMarginTop = 25;
// aapt resource value: 27
- public const int Toolbar_titleTextColor = 27;
+ public const int Toolbar_titleTextAppearance = 27;
+ // aapt resource value: 28
+ public const int Toolbar_titleTextColor = 28;
+
+ // aapt resource value: { 0x7F04013A,0x7F04013F,0x7F040143,0x7F040144,0x7F04014F,0x7F040153 }
public static int[] TwoLevelHeader = new int[] {
- 2130772376,
- 2130772377,
- 2130772378,
- 2130772379,
- 2130772380,
- 2130772381};
-
- // aapt resource value: 5
- public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 5;
-
- // aapt resource value: 4
- public const int TwoLevelHeader_srlEnableTwoLevel = 4;
-
- // aapt resource value: 3
- public const int TwoLevelHeader_srlFloorDuration = 3;
-
- // aapt resource value: 1
- public const int TwoLevelHeader_srlFloorRage = 1;
+ 2130968890,
+ 2130968895,
+ 2130968899,
+ 2130968900,
+ 2130968911,
+ 2130968915};
// aapt resource value: 0
- public const int TwoLevelHeader_srlMaxRage = 0;
+ public const int TwoLevelHeader_srlEnablePullToCloseTwoLevel = 0;
+
+ // aapt resource value: 1
+ public const int TwoLevelHeader_srlEnableTwoLevel = 1;
// aapt resource value: 2
- public const int TwoLevelHeader_srlRefreshRage = 2;
+ public const int TwoLevelHeader_srlFloorDuration = 2;
+ // aapt resource value: 3
+ public const int TwoLevelHeader_srlFloorRage = 3;
+
+ // aapt resource value: 4
+ public const int TwoLevelHeader_srlMaxRage = 4;
+
+ // aapt resource value: 5
+ public const int TwoLevelHeader_srlRefreshRage = 5;
+
+ // aapt resource value: { 0x1010000,0x10100DA,0x7F0400F0,0x7F0400F1,0x7F04018D }
public static int[] View = new int[] {
16842752,
16842970,
- 2130772218,
- 2130772219,
- 2130772220};
+ 2130968816,
+ 2130968817,
+ 2130968973};
- // aapt resource value: 1
- public const int View_android_focusable = 1;
-
- // aapt resource value: 0
- public const int View_android_theme = 0;
-
- // aapt resource value: 3
- public const int View_paddingEnd = 3;
-
- // aapt resource value: 2
- public const int View_paddingStart = 2;
-
- // aapt resource value: 4
- public const int View_theme = 4;
-
+ // aapt resource value: { 0x10100D4,0x7F040045,0x7F040046 }
public static int[] ViewBackgroundHelper = new int[] {
16842964,
- 2130772221,
- 2130772222};
+ 2130968645,
+ 2130968646};
// aapt resource value: 0
public const int ViewBackgroundHelper_android_background = 0;
@@ -7980,6 +8021,7 @@
// aapt resource value: 2
public const int ViewBackgroundHelper_backgroundTintMode = 2;
+ // aapt resource value: { 0x10100D0,0x10100F2,0x10100F3 }
public static int[] ViewStubCompat = new int[] {
16842960,
16842994,
@@ -7994,31 +8036,20 @@
// aapt resource value: 1
public const int ViewStubCompat_android_layout = 1;
- public static int[] pickerview = new int[] {
- 2130772412,
- 2130772413,
- 2130772414,
- 2130772415,
- 2130772416,
- 2130772417};
-
- // aapt resource value: 4
- public const int pickerview_wheelview_dividerColor = 4;
+ // aapt resource value: 1
+ public const int View_android_focusable = 1;
// aapt resource value: 0
- public const int pickerview_wheelview_gravity = 0;
-
- // aapt resource value: 5
- public const int pickerview_wheelview_lineSpacingMultiplier = 5;
-
- // aapt resource value: 3
- public const int pickerview_wheelview_textColorCenter = 3;
+ public const int View_android_theme = 0;
// aapt resource value: 2
- public const int pickerview_wheelview_textColorOut = 2;
+ public const int View_paddingEnd = 2;
- // aapt resource value: 1
- public const int pickerview_wheelview_textSize = 1;
+ // aapt resource value: 3
+ public const int View_paddingStart = 3;
+
+ // aapt resource value: 4
+ public const int View_theme = 4;
static Styleable()
{
@@ -8029,6 +8060,25 @@
{
}
}
+
+ 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()
+ {
+ }
+ }
}
}
#pragma warning restore 1591
diff --git a/ZigbeeApp/Home.Ios/Resources/Language.ini b/ZigbeeApp/Home.Ios/Resources/Language.ini
index 6c4e455..9cc5450 100755
--- a/ZigbeeApp/Home.Ios/Resources/Language.ini
+++ b/ZigbeeApp/Home.Ios/Resources/Language.ini
@@ -590,8 +590,8 @@
5398=鍙敮鎸佹暟瀛楄緭鍏�
5399=鍏抽棴澶辫触
-5400=寮�鍚け璐�
-5401=娣诲姞澶辫触
+5400=寮�鍚父寮�妯″紡澶辫触
+5401=娣诲姞鏃舵晥鎬у父寮�璁剧疆澶辫触
5402=鏃舵晥鎬у父寮�璁剧疆
5403=鏃跺叧闂�
diff --git a/ZigbeeApp/Shared/Common/Device.cs b/ZigbeeApp/Shared/Common/Device.cs
index f2b398e..7275b4d 100755
--- a/ZigbeeApp/Shared/Common/Device.cs
+++ b/ZigbeeApp/Shared/Common/Device.cs
@@ -2528,8 +2528,6 @@
mainDevice.InClusterList.AddRange(device.DeviceInfo.InClusterList);
mainDevice.OutClusterList.Clear();
mainDevice.OutClusterList.AddRange(device.DeviceInfo.OutClusterList);
- mainDevice.AttributeStatus.Clear();
- mainDevice.AttributeStatus.AddRange(device.DeviceInfo.AttributeStatus);
//濡傛灉鏄俯搴︿紶鎰熷櫒
if (mainDevice.Type == DeviceType.TemperatureSensor)
@@ -2636,11 +2634,9 @@
public void SetNewDeviceMainKeys(CommonDevice device, Newtonsoft.Json.Linq.JObject jobject)
{
//璁剧疆璁惧涓婚敭绫�
- device.Time = jobject.Value<int>("Time");
device.DeviceID = jobject.Value<int>("Device_ID");
device.DeviceAddr = jobject.Value<string>("DeviceAddr");
device.DeviceEpoint = jobject.Value<int>("Epoint");
- device.DataID = jobject.Value<int>("Data_ID");
}
#endregion
diff --git a/ZigbeeApp/Shared/Common/House.cs b/ZigbeeApp/Shared/Common/House.cs
index 6a70607..96aeddc 100755
--- a/ZigbeeApp/Shared/Common/House.cs
+++ b/ZigbeeApp/Shared/Common/House.cs
@@ -401,6 +401,7 @@
/// GetCurrentFloorName
/// </summary>
/// <returns></returns>
+ [Newtonsoft.Json.JsonIgnore]
public string GetCurrentFloorName
{
get
diff --git a/ZigbeeApp/Shared/Common/SceneUI.cs b/ZigbeeApp/Shared/Common/SceneUI.cs
index 4ca5160..556a4e7 100755
--- a/ZigbeeApp/Shared/Common/SceneUI.cs
+++ b/ZigbeeApp/Shared/Common/SceneUI.cs
@@ -8,7 +8,7 @@
/// 鍦烘櫙
/// </summary>
[System.Serializable]
- public class SceneUI : ZigBee.Device.CommonDevice
+ public class SceneUI
{
#region 鈻� 鍙橀噺澹版槑_________________________
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
index 7c8bd89..2812dda 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/AddCondition.cs
@@ -264,8 +264,8 @@
accounts.Add("Account", Config.Instance.Guid);
accounts.Add("AccountName",accountName);
///mac+绔彛鏄负璇嗗埆鏄偅涓棬閿�;
- accounts.Add("MacAddr", Send.CurrentDoorLock.DeviceAddr);
- accounts.Add("Epoint", Send.CurrentDoorLock.DeviceEpoint.ToString());
+ accounts.Add("Option4", Send.CurrentDoorLock.DeviceAddr);
+ accounts.Add("Option2", Send.CurrentDoorLock.DeviceEpoint.ToString());
accounts.Add("UserId", userId);
if (SelectedDeviceStatuscondition != "")
{
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
index c593a35..742b6f6 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/DoorLockLogic/LockLogicList.cs
@@ -21,17 +21,27 @@
this.AddChidren(view.TopRowView());
view.toptitleNameBtn.TextID = MyInternationalizationString.linkageevent;
view.clickBtn.MouseDownEventHandler += (sender, e) => { RemoveFromParent(); };
+ //鍔犲ぇ鐐瑰嚮鐑敭
+ var addiocnclick = new Button
+ {
+ Width = Application.GetRealWidth(108+58),
+ Height = Application.GetRealHeight(72+20),
+ X = Application.GetRealWidth(1080 - 108 - 58),
+ Y = Application.GetRealHeight(184 - 72),
+ };
+ view.topRowLayout.AddChidren(addiocnclick);
var addiocn = new Button
{
- Width = Application.GetRealWidth(72),
- Height = Application.GetRealHeight(72),
+ Width = Application.GetMinRealAverage(72),
+ Height = Application.GetMinRealAverage(72),
X = Application.GetRealWidth(1080 - 108 - 58),
UnSelectedImagePath = "ZigeeLogic/lockadd.png",
Y = Application.GetRealHeight(184 - 72 - 20),
};
view.topRowLayout.AddChidren(addiocn);
- addiocn.MouseUpEventHandler += (sender, e) =>
+
+ EventHandler<MouseEventArgs> addclick = (sender, e) =>
{
//new涓�涓柊閫昏緫瀵硅薄锛�
Common.Logic.CurrentLogic = new Common.Logic();
@@ -44,6 +54,10 @@
UserView.HomePage.Instance.PageIndex += 1;
lockLogicCommunalPage.Show(() => { });
};
+
+ addiocnclick.MouseUpEventHandler += addclick;
+ addiocn.MouseUpEventHandler += addclick;
+
#endregion
middle = new VerticalRefreshLayout
{
@@ -68,8 +82,12 @@
/// </summary>
public async void Read()
{
+
+
+
+
CommonPage.Loading.Start();
- if (Common.Logic.LockLogicList.Count == 0)
+ if (!BoolExist())
{
var Idlist = await Send.GetLogicId(1);
if (Idlist.Count != 0)
@@ -86,7 +104,8 @@
bool yes = false;
for (int a = 0; a < logic.Accounts.Count; a++)
{
- if (logic.Accounts[a]["MacAddr"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Epoint"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
+ if (logic.Accounts[a]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[a]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
{
//鏌ユ壘鏄惁鏄偅涓棬閿侊紱
//濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
@@ -117,7 +136,8 @@
{
middle.RemoveAll();
- if (Common.Logic.LockLogicList.Count == 0)
+ //if (Common.Logic.LockLogicList.Count == 0)
+ if (!BoolExist())
{
//灏辨槸涓轰簡鏄剧ず寮曞娣诲姞鍥炬爣;
var noFrameLayout = new FrameLayout
@@ -156,6 +176,11 @@
for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
{
var logic = Common.Logic.LockLogicList[i];
+ if (!Exist(logic))
+ {
+ continue;
+ }
+
var logicRowlayout = new RowLayout
{
Width = Application.GetRealWidth(1080),
@@ -259,5 +284,59 @@
}
}
+
+
+ /// <summary>
+ /// 鏌ユ壘璇ラ棬閿佹槸鍚﹀瓨鍦ㄨ嚜鍔ㄥ寲
+ /// </summary>
+ /// <returns></returns>
+ private bool BoolExist()
+ {
+ bool yes = false;
+ for (int i = 0; i < Common.Logic.LockLogicList.Count; i++)
+ {
+ var logic = Common.Logic.LockLogicList[i];
+ if (logic.LogicType != 1)
+ {
+ continue;
+ }
+
+ if (Exist(logic))
+ {
+ yes = true;
+ //瀛樺湪灏遍��鍑�
+ break;
+ }
+ }
+ return yes;
+ }
+
+ /// <summary>
+ /// 鏌ユ壘杩欎竴鏉¤嚜鍔ㄥ寲鏄惁灞炰簬璇ラ棬閿�
+ /// </summary>
+ /// <returns></returns>
+ private bool Exist(Common.Logic logic)
+ {
+ bool yes = false;
+ for (int j = 0; j < logic.Accounts.Count; j++)
+ {
+ //Option4鏄澶噈ac锛汷ption2鏄澶囩鍙ｏ紱
+ if (logic.Accounts[j]["Option4"].ToString() != Send.CurrentDoorLock.DeviceAddr && logic.Accounts[j]["Option2"].ToString() != Send.CurrentDoorLock.DeviceEpoint.ToString())
+ {
+ //鏌ユ壘鏄惁鏄偅涓棬閿侊紱
+ //濡傛灉涓嶆槸璇ラ棬閿佽仈鍔ㄤ簨浠朵笉鏄剧ず鍑烘潵;
+ yes = false;
+ break;
+ }
+ if (logic.Accounts[j]["Account"].ToString() == Config.Instance.Guid)
+ {
+ //鏌ユ壘鑷繁璐﹀彿涓嬬殑鍒涘缓鑱斿姩浜嬩欢锛�
+ yes = true;
+ break;
+ }
+
+ }
+ return yes;
+ }
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
old mode 100755
new mode 100644
index e45f7e8..c7b0fe4
--- a/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/LogicView/TipView.cs
@@ -72,6 +72,9 @@
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
Height = Application.GetRealHeight(127),
+ Gravity=Gravity.BottomCenter,
+
+
};
tipFLayout.AddChidren(bottomFrame);
@@ -81,10 +84,11 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
+
};
bottomFrame.AddChidren(cancelBtn);
cancelBtn.SetCornerWithSameRadius(Application.GetRealHeight(17), HDLUtils.RectCornerBottomLeft);
@@ -95,7 +99,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -215,6 +219,7 @@
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
Height = Application.GetRealHeight(127),
+ Gravity=Gravity.BottomCenter,
};
tipFLayout.AddChidren(bottomFrame);
///鍙栨秷鎺т欢
@@ -223,7 +228,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -236,7 +241,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
@@ -355,6 +360,8 @@
Y = topFrame.Bottom,
Width = Application.GetRealWidth(792),
Height = Application.GetRealHeight(127),
+ Gravity = Gravity.BottomCenter,
+
};
tipFLayout.AddChidren(bottomFrame);
///鍙栨秷鎺т欢
@@ -363,7 +370,7 @@
TextAlignment = TextAlignment.Center,
TextColor = ZigbeeColor.Current.LogicBtnCancelColor,
TextSize = 14,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = Application.GetRealWidth(397),
BackgroundColor = ZigbeeColor.Current.LogicMiddleBackgroundColor,
TextID = R.MyInternationalizationString.cancel,
@@ -376,7 +383,7 @@
TextColor = ZigbeeColor.Current.LogicBlankBackgroundColor,
TextSize = 14,
X = cancelBtn.Right,
- Height = Application.GetRealHeight(127),
+ Height = bottomFrame.Height,
Width = bottomFrame.Width - cancelBtn.Width,
BackgroundColor = ZigbeeColor.Current.LogicBtnTypeColor,
TextID = R.MyInternationalizationString.confrim,
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
index 9b3974a..b1b086f 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/Send.cs
@@ -499,6 +499,15 @@
["AccountName"] = dictionary["AccountName"],
};
+
+ if (dictionary.ContainsKey("Option4"))
+ {
+ accounts1.Add("Option4",dictionary["Option4"]);
+ }
+ if (dictionary.ContainsKey("Option2"))
+ {
+ accounts1.Add("Option2", int.Parse(dictionary["Option2"]));
+ }
accounts.Add(accounts1);
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
index f2a23d6..a86c900 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SkipView.cs
@@ -703,7 +703,7 @@
/// <param name="timeVlaue">鏃堕棿鍊�</param>
/// <param name="common">璁惧</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<bool> LockAddModifyLogic(int timeVlaue, CommonDevice common)
+ public static async System.Threading.Tasks.Task<int> LockAddModifyLogic(int timeVlaue, CommonDevice common)
{
//璇诲彇绯荤粺褰撳墠鏃堕棿锛氭椂-鍒�
var h = DateTime.Now.ToString("HH");
@@ -736,9 +736,9 @@
{
//娣诲姞闂ㄩ攣澶辨晥鏃堕棿鐨勫巻鍙茶褰�
UserCenter.HdlDeviceDoorLockLogic.Current.AddDoorHistoryLog((DoorLock)common, 9003, timeVlaue.ToString());
- return true;//琛ㄧず娣诲姞鎴愬姛;
+ return logicIfon.LogicId;//琛ㄧず娣诲姞鎴愬姛;
}
- return false;//琛ㄧず娣诲姞澶辫触;
+ return 0;//琛ㄧず娣诲姞澶辫触;
}
@@ -759,7 +759,7 @@
}
return exist;
}
-
+
///<summary>
///鑾峰彇閫昏緫淇℃伅
/// 杩斿洖鍊硷細null涓嶅瓨鍦�;鍏跺畠鍊奸兘瀛樺湪;
@@ -799,7 +799,9 @@
}
return _if;
}
-
+
+
+
}
}
diff --git a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
index c78f7f4..54e00a4 100755
--- a/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
+++ b/ZigbeeApp/Shared/Phone/Device/Logic/SoneLogicList.cs
@@ -8,15 +8,15 @@
{
public class SoneLogicList : FrameLayout
{
-
public static SoneLogicList soneLogicList;
public SoneLogicList()
{
Tag = "SoneLogic";
soneLogicList = this;
+
}
/// 缁欏緪姊呭埛鏂扮晫闈㈢敤鐨�
- public Action<bool> action;
+ public Action<bool> action;
///绗簩鍧楃涓�绾х埗鎺т欢
FrameLayout fLayout = new FrameLayout();
///甯稿紑妯″紡鍥炬爣
@@ -29,10 +29,17 @@
FrameLayout listLogicFl = new FrameLayout();
///甯稿紑鑷姩鍖栧垪琛ㄤ笂涓嬫粦鍔ㄧ殑鎺т欢
VerticalRefreshLayout verticalRefresh = new VerticalRefreshLayout();
-
+ /// <summary>
+ /// 璁板綍閫昏緫id
+ /// </summary>
+ public int logicId = 0;
+ /// <summary>
+ /// 璁板綍閫変腑鏃堕棿
+ /// </summary>
+ public int timeValue = 0;
public async void Show()
{
-
+
#region 鐣岄潰鐨勫竷灞�浠ｇ爜
UserView.HomePage.Instance.ScrollEnabled = false;//閿佷綇宸︽粦
TopView view = new TopView();
@@ -41,10 +48,6 @@
view.clickBtn.MouseDownEventHandler += (sender, e) =>
{
UserView.HomePage.Instance.ScrollEnabled = true;
- if (updateThread != null && updateThread.IsAlive)
- {
- updateThread.Abort();
- }
//鎶婇潤鎬佸彉閲忕殑杩欎釜涓滆タ缃┖
soneLogicList = null;
this.RemoveFromParent();
@@ -62,6 +65,23 @@
};
this.AddChidren(middle);
#endregion
+ //鏄父寮�妯″紡鍐嶅幓璇诲彇
+ if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
+ {
+ //杩涙潵鏇存柊涓�娆�
+ //鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
+ var logic = await SkipView.GetLogicIfon();
+ if (logic != null)
+ {
+ try
+ {
+ //杩涙潵鏇存柊涓�娆″��
+ logicId = logic.LogicId;
+ timeValue = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
+ }
+ catch { }
+ }
+ }
#region 甯稿紑妯″紡鍥炬爣 鏃舵晥鎬у父寮�璁剧疆
///绗簩鍧楃涓�绾х埗鎺т欢
@@ -98,7 +118,6 @@
modeFl.AddChidren(button2);
ModeView();
#endregion
-
#region 甯稿紑鑷姩鍖�
///绗笁鍧楃涓�绾х埗鎺т欢
listLogicFl = new FrameLayout
@@ -146,7 +165,7 @@
var addIconclickBtn = new Button
{
- Width = Application.GetRealWidth(90+69+63),
+ Width = Application.GetRealWidth(90 + 69 + 63),
Height = Application.GetRealHeight(69),
X = Application.GetRealWidth(800),
Y = Application.GetRealHeight(60),
@@ -207,18 +226,30 @@
};
Read(true);
#endregion
+
+ UserCenter.DoorLock.DoorLockCommonInfo.LogicAction = (_bool) =>
+ {
+
+ try
+ {
+ Application.RunOnMainThread(() =>
+ {
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = _bool;
+ ModeView();
+ });
+ }
+ catch { }
+ };
+
}
/// <summary>
/// 甯稿紑妯″紡寮�鍏冲垏鎹㈠浘鏍囩晫闈�
/// </summary>
public async void ModeView()
{
-
+
if (Send.CurrentDoorLock.IsDoorLockNormallyMode)
{
- /// 鏌ユ壘鏄惁瀛樺湪鏃舵晥鎬ц嚜鍔ㄥ寲锛涙湁鐨勮瘽灏辫繑鍥炶嚜鍔ㄥ寲瀵硅薄;
- var logic = await SkipView.GetLogicIfon();
-
fLayout.Height = Application.GetRealHeight(780);//鏀瑰彉楂樺害
modeIconBtn.UnSelectedImagePath = "ZigeeLogic/openMode.png";//鏀瑰彉鍥炬爣鐘舵��
modeFl.Y = modeIconBtn.Bottom + Application.GetRealHeight(64);
@@ -242,25 +273,36 @@
button1.MouseUpEventHandler = async (sender, e) =>
{
- var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
- if (result)
+ CommonPage.Loading.Start();
+ try
{
- if (logic != null)
+ var result = await UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
+ if (result)
{
- ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
- ///娌℃湁鍒ゆ柇鐨勮瘽锛岄�昏緫浼氫负绌猴紝鎶涘嚭寮傚父;
- Send.DelLogic(logic.LogicId);
+ if (logicId != 0)
+ {
+ ///鏈夊彲鑳藉彧鏈夊父寮�妯″紡锛屾病鏈夋椂鏁堟�ц嚜鍔ㄥ寲
+ Send.DelLogic(logicId);
+ }
+ Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
+ ModeView();
}
- Send.CurrentDoorLock.IsDoorLockNormallyMode = false;
- ModeView();
+ else
+ {
+ LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
+ }
}
- else
+ catch { }
+ finally
{
- LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.closeFailed));
- }
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+ });
+ }
};
- if (logic != null)
+ if (logicId != 0)
{
///鏄剧ず澶辨晥璁剧疆鏃堕棿鏂囨湰鎺т欢
button2.Y = Application.GetRealHeight(127 + 69);
@@ -271,23 +313,12 @@
button2.TextSize = 15;
button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
///鏈夋椂鏁堟�у父寮�鎵嶆樉绀烘椂闂存潯浠舵枃鏈�
- }
- else
- {
- button2.Width = Application.GetRealWidth(0);
- button2.Height = Application.GetRealHeight(0);
- }
- ///鏃舵晥鎬у父寮�鍙湁涓�涓潯浠�;
- try
- {
-
var y = DateTime.Now.Year.ToString();//閭ｄ竴骞�
var m = DateTime.Now.Month.ToString();//閭ｄ竴鏈�
var d = DateTime.Now.ToString("dd");//閭ｄ竴澶�
var h = int.Parse(DateTime.Now.ToString("HH"));//褰撳墠绯荤粺鏃堕棿
- var timeInt = int.Parse(logic.Conditions[0]["DoorLockOpenDelayTime"]);
- int dayInt = (h + timeInt) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
- int hour = (h + timeInt) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
+ int dayInt = (h + timeValue) / 24;//绠楀嚭鍑犲ぉ鍚庢墽琛�
+ int hour = (h + timeValue) % 24;//绠楀嚭鍑犲ぉ鍚庨偅涓椂闂存墽琛�
int days = int.Parse(d) + dayInt;
string text1 = Language.StringByID(MyInternationalizationString.timeSensitive);
string text2 = Language.StringByID(MyInternationalizationString.yearSone);
@@ -296,7 +327,14 @@
string text5 = Language.StringByID(MyInternationalizationString.executeSone);
button2.Text = text1 + y + text2 + m + text3 + days.ToString() + text4 + hour.ToString() + text5;
}
- catch { }
+ else
+ {
+ button2.Y = Application.GetRealHeight(0);
+ button2.X = Application.GetRealWidth(0);
+ button2.Width = Application.GetRealWidth(0);
+ button2.Height = Application.GetRealHeight(0);
+ }
+
}
else
@@ -332,6 +370,7 @@
button2.UnSelectedImagePath = "ZigeeLogic/nextIconSone.png";
button2.TextSize = 15;
button2.TextColor = ZigbeeColor.Current.LogicTextBlackColor;
+ button2.Text ="";
button2.MouseUpEventHandler = (sender, e) =>
{
@@ -340,6 +379,7 @@
{///鍐嶆纭
LogicView.TipView.ShowInputTip(true, async (str) =>
{///纭鍙戦�佸懡浠�
+ CommonPage.Loading.Start();
try
{
///xm
@@ -354,7 +394,7 @@
///鍥犱负鏈夊父寮�妯″紡涓嬫墠鍙互鍒涘缓澶辨晥閫昏緫锛�
SkipView.GetLogicAll();//鍒犻櫎涔嬪墠鎵�鏈夊け鏁堥�昏緫
var addResult = await SkipView.LockAddModifyLogic(int.Parse(str), Send.CurrentDoorLock);//娣诲姞涓�鏉″け鏁堥�昏緫
- if (!addResult)
+ if (addResult == 0)
{
///鍙璇村鏋滃父寮�妯″紡寮�锛屽垱寤鸿嚜鍔ㄥ寲澶辫触锛岄偅涔堝皢瑕佸彂涓�鏉″父寮�妯″紡鍏抽棴鍛戒护;
UserCenter.DoorLock.DoorLockCommonInfo.DelNormallyOpenMode(Send.CurrentDoorLock);
@@ -362,6 +402,8 @@
LogicView.TipView.ShowFlashTip(Language.StringByID(MyInternationalizationString.addFailed));
return;
}
+ logicId = addResult;
+ timeValue = int.Parse(str);
Send.CurrentDoorLock.IsDoorLockNormallyMode = true;
ModeView();
//娣诲姞App寮�鍚父寮�妯″紡鐨勫巻鍙茶褰�
@@ -371,6 +413,14 @@
catch
{
+ }
+ finally
+ {
+ Application.RunOnMainThread(() =>
+ {
+ CommonPage.Loading.Hide();
+
+ });
}
});
@@ -528,10 +578,7 @@
TextColor = ZigbeeColor.Current.LogicBtnSaveTextColor,
};
logicRow.AddRightView(edit);
- if (logic.LogicType == 2)
- {
- edit.TextID = MyInternationalizationString.look;
- }
+
///鍒犻櫎
var del = new Button
{
@@ -597,32 +644,6 @@
};
}
}
-
- /// <summary>
- /// 瀹氭椂鏇存柊甯稿紑妯″紡(闃叉閫氳繃闂ㄩ攣鍏抽棴娌″強鏃跺埛鏂扮姸鎬�)
- /// </summary>
- System.Threading.Thread updateThread;
- public void UpdateModeIcon()
- {
- updateThread = new System.Threading.Thread(() =>
- {
- while (this.Parent != null)
- {
- System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() =>
- {
- try
- {
- ModeView();
- }
- catch { }
-
- });
- }
- });
- updateThread.Start();
- }
-
}
}
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
index edd1c9e..c221ffc 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAirConditionerLogic.cs
@@ -248,18 +248,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ReadACFirewareVersionResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
if (command == "0259")
{
@@ -412,18 +411,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
if (command == "025b")
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
index bc94bb7..2083d28 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceAttributeLogic.cs
@@ -65,7 +65,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
d = new CommonDevice.SetWritableValueResponAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
index c44215c..bfb0ab6 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlDeviceUpdateLogic.cs
@@ -204,7 +204,7 @@
return;
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.zbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.zbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
@@ -363,7 +363,7 @@
return;
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.zbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.zbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
@@ -412,7 +412,7 @@
/// </summary>
/// <param name="statusData"></param>
/// <returns></returns>
- private bool CheckStatusCode(ZbGatewayData.OTAScheduleResponData statusData)
+ private bool CheckStatusCode(CommonDevice.OTAScheduleResponData statusData)
{
if (statusData == null)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
index d6e9dea..82b77b8 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlGatewayUpdateLogic.cs
@@ -240,7 +240,7 @@
return;
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
@@ -343,7 +343,7 @@
return;
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
@@ -445,7 +445,7 @@
return;
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
@@ -543,7 +543,7 @@
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
@@ -643,7 +643,7 @@
return;
}
var tempZb = (ZbGateway)objValue;
- if (tempZb.CurrentGateWayId != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
+ if (HdlGatewayLogic.Current.GetGatewayId(tempZb) != HdlGatewayLogic.Current.GetGatewayId(this.upDatezbGateway))
{
//涓嶆槸鑷繁鐨勭綉鍏虫帹閫侊紝鍒欎笉澶勭悊
return;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
index d1d8ec5..0dcb055 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/CommonBase/Logic/HdlSafeguardLogic.cs
@@ -104,7 +104,7 @@
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.Safeguard.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp != null)
{
string msg = HdlCheckLogic.Current.CheckCommonErrorCode(temp.Error);
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
index 1685d91..d272cde 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddDevicePage.cs
@@ -416,7 +416,6 @@
curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
}
curRoom = room;
- currentKey.RoomId = room.Id;
RefreshDeviceList(curRoom);
if (curTypeDeviceList.Count == 0)
{
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
index 3cf0c4f..e5976fd 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/AddScenePage.cs
@@ -36,7 +36,11 @@
/// <summary>
/// 鎸夐敭閰嶇疆鐨勭洰鏍囧垪琛�
/// </summary>
- List<CommonDevice> targetList = new List<CommonDevice>();
+ List<CommonDevice> targetListDevice = new List<CommonDevice>();
+ /// <summary>
+ /// 鎸夐敭閰嶇疆鐨勫満鏅洰鏍囧垪琛�
+ /// </summary>
+ List<SceneUI> targetListScene = new List<SceneUI>();
/// <summary>
/// 鏈湴鎴块棿鍒楄〃
/// </summary>
@@ -224,7 +228,7 @@
var sc = currentKey.bindList.Find(obj => (obj != null) && (obj.BindScenesId == scTemp.Id));
if (sc != null)
{
- targetList.Add(scTemp);
+ targetListScene.Add(scTemp);
}
}
}
@@ -244,7 +248,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -259,7 +263,7 @@
bool isFinish = false;
try
{
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
Application.RunOnMainThread(() =>
{
@@ -348,7 +352,7 @@
var addBindeDev = new AddBindData();
addBindeDev.DeviceAddr = currentKey.DeviceAddr;
addBindeDev.Epoint = currentKey.DeviceEpoint;
- foreach (var de in targetList)
+ foreach (var de in targetListDevice)
{
if (de.DeviceAddr != null)
{
@@ -359,15 +363,14 @@
addBindInfo.BindEpoint = de.DeviceEpoint;
addBindeDev.BindList.Add(addBindInfo);
}
- else
- {
- var addBindInfo = new AddBindListObj();
- addBindInfo.BindType = 1;
- addBindInfo.BindCluster = 6;
- var sc1 = (SceneUI)de;
- addBindInfo.BindScenesId = sc1.Id;
- addBindeDev.BindList.Add(addBindInfo);
- }
+ }
+ foreach (var de in targetListScene)
+ {
+ var addBindInfo = new AddBindListObj();
+ addBindInfo.BindType = 1;
+ addBindInfo.BindCluster = 6;
+ addBindInfo.BindScenesId = de.Id;
+ addBindeDev.BindList.Add(addBindInfo);
}
var dev = new AddedDeviceBindResponseAllData();
@@ -377,7 +380,8 @@
if (dev.addedDeviceBindResponseData.Result == 0)
{
currentKey.bindList = dev.addedDeviceBindResponseData.BindList;
- targetList.Clear();
+ targetListDevice.Clear();
+ targetListScene.Clear();
isFinish = true;
if (isFinish)
{
@@ -547,7 +551,6 @@
curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
}
curRoom = room;
- currentKey.RoomId = room.Id;
if (curRoom.ListSceneId.Count == 0)
{
btnFinifh.Enable = false;
@@ -558,7 +561,7 @@
btnFinifh.Enable = true;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMBlack;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -665,7 +668,7 @@
{
btnBindName.Text = scene.Name;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
foreach (var bindedSc in currentKey.bindList)
{
@@ -674,16 +677,15 @@
btnChoose.IsSelected = true;
btnChoose.Visible = true;
oldScene = btnChoose;
- targetList.Add(scene);
+ targetListScene.Add(scene);
}
}
}
else
{
- foreach (var bindedSc in targetList)
+ foreach (var bindedSc in targetListScene)
{
- var sc1 = (SceneUI)bindedSc;
- if (scene.Id == sc1.Id)
+ if (scene.Id == bindedSc.Id)
{
btnChoose.IsSelected = true;
btnChoose.Visible = true;
@@ -719,11 +721,11 @@
oldScene = btnChoose;
oldScene.IsSelected = true;
oldScene.Visible = true;
- currentKey.curSelectSceneID = scene.Id.ToString();
- targetList.Clear();
- targetList.Add(scene);
+ targetListDevice.Clear();
+ targetListScene.Clear();
+ targetListScene.Add(scene);
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -740,7 +742,7 @@
btnChoose.MouseUpEventHandler += hander;
curIndex++;
}
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
@@ -893,7 +895,7 @@
int index = 0;
RefreshRoomList(curRoom, ref index);
RefreshSceneList(roomList[0]);
- if (targetList.Count == 0)
+ if (targetListDevice.Count == 0 && targetListScene.Count == 0)
{
btnFinifh.Enable = false;
btnFinifh.BackgroundColor = Shared.Common.ZigbeeColor.Current.XMUnSelect;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
index 14d3e84..4f40b43 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/BindTargetsPage.cs
@@ -691,7 +691,6 @@
currentKey.bindList.Clear();
RefreshList();
//濡傛灉鏄満鏅紝鐢ㄦ埛鍒犻櫎娓呯┖褰撳墠鍒版埧闂村垪琛�
- currentKey.RoomId = "";
currentKey.ReSave();
}
CommonPage.Loading.Hide();
@@ -1196,7 +1195,6 @@
{
currentKey.panelMode = 65535;
}
- currentKey.RoomId = "";
currentKey.ReSave();
return 0;
break;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
index 7fd5ff7..919a812 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Bind/ChooseKeyModePage.cs
@@ -712,7 +712,6 @@
oldMode = btnChoose;
oldMode.IsSelected = true;
oldMode.Visible = true;
- currentKey.CurrentSwitchMode = btnModeText.Text;
if (btnModeText.Text == Language.StringByID(R.MyInternationalizationString.OnOffOn))
{
currentModeID = 100;
@@ -888,7 +887,6 @@
oldMode = btnChoose;
oldMode.IsSelected = true;
oldMode.Visible = true;
- currentKey.CurrentSwitchMode = btnModeText.Text;
if (btnModeText.Text == Language.StringByID(R.MyInternationalizationString.DimmerMode1))
{
currentModeID = 200;
@@ -1062,7 +1060,6 @@
oldMode = btnChoose;
oldMode.IsSelected = true;
oldMode.Visible = true;
- currentKey.CurrentSwitchMode = btnModeText.Text;
if (btnModeText.Text == Language.StringByID(R.MyInternationalizationString.WcdUp))
{
currentModeID = 300;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
index 1d62a62..90b4e2d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/Device/Panel/PanelFangyueFreshAirTargetsForm.cs
@@ -358,7 +358,6 @@
curentOldRoomFrameLayout.BackgroundImagePath = "Item/RoomIconBackgroundSelected.png";
}
curRoom = room;
- curControlDev.RoomId = room.Id;
//鏂伴闈㈡澘淇濆瓨浣胯兘
btnFinifh.Enable = true;
diff --git a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
index 2fc442e..e1c744d 100755
--- a/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
+++ b/ZigbeeApp/Shared/Phone/UserCenter/DoorLock/UserDoorLockPage.cs
@@ -1348,7 +1348,7 @@
DoorLockCommonInfo.NormallyOpenModeInvalidTime = temp;
//榛樿鍒涘缓甯稿紑妯″紡鐨勭壒娈婇�昏緫
var res = await Shared.Phone.Device.Logic.SkipView.LockAddModifyLogic(DoorLockCommonInfo.NormallyOpenModeInvalidTime, doorLock);
- if (!res)
+ if (res == 0)
{
//榛樿鍒涘缓甯稿紑妯″紡澶辫触
string msg0 = Language.StringByID(R.MyInternationalizationString.AddLogicNormallyModeFailed);
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
index 5fb22cb..04c6a57 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Common/Application.cs
@@ -196,7 +196,6 @@
getGatewayBaseInfo = new ZbGateway.GatewayBaseInfo
{
IpAddress = ipAddress,
- Time = time,
GwName = gwName,
HomeId = homeID,
IsMainGateWay = isMainGateWay,
@@ -248,7 +247,6 @@
else
{
gateWay.PubKey = pubKey;
- gateWay.getGatewayBaseInfo.Time = time;
gateWay.getGatewayBaseInfo.GwName = gwName;
gateWay.getGatewayBaseInfo.HomeId = homeID;
await gateWay.StartLocalMqtt(ipAddress);
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
index daed5b8..ac390e4 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/AC.cs
@@ -4,7 +4,7 @@
namespace ZigBee.Device
{
[System.Serializable]
- public class AC : ThirdPartyModuleUpgrade
+ public class AC : CommonDevice
{
public AC()
{
@@ -14,35 +14,23 @@
/// <summary>
///褰撳墠瀹ゅ唴娓╁害
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentLocalTemperature = 0;
-
/// <summary>
/// 褰撳墠鍔犵儹搴︽暟
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentHeatingSetpoint = 0;
-
/// <summary>
/// 褰撳墠鍒跺喎搴︽暟
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentCoolingSetpoint = 0;
-
/// <summary>
/// 褰撳墠鑷姩娓╁害
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentAutoSetpoint;
-
- /// <summary>
- ///鎭掓俯璁惧绫诲瀷
- /// <para>鎭掓俯璁惧鍏峰鍔熻兘锛孉ttribute Values濡備笅</para>
- /// <para>0:(Cooling Only) 鏃燞eat鍜孍mergency鍔熻兘</para>
- /// <para>1:(Cooling With Reheat)鏃燞eat鍜孍mergency鍔熻兘</para>
- /// <para>2:(Heating Only)鏃燙ool鍜孭recooling鍔熻兘</para>
- /// <para>3:(Heating With Reheat)鏃燙ool鍜孭recooling鍔熻兘</para>
- /// <para>4:(Cooling and Heating 4-pipes)鍙兘鏈夋墍鏈夊姛鑳�</para>
- /// <para>5:(Cooling and Heating 4-pipes with Reheat)鍙兘鏈夋墍鏈夊姛鑳�</para>
- /// </summary>
- public int currentAcType = 0;
-
/// <summary>
/// 鎭掓俯璁惧褰撳墠妯″紡
/// <para>鎭掓俯璁惧鍏峰鍔熻兘锛孲ystemMode Attribute Values濡備笅</para>
@@ -56,8 +44,8 @@
/// <para>8:Dry </para>
/// <para>9:Sleep</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentSystemMode = 0;
-
/// <summary>
/// 椋庢墖褰撳墠妯″紡
/// <para>0:Off </para>
@@ -68,8 +56,8 @@
/// <para>5:Auto </para>
/// <para>6:Smart</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanMode = 0;
-
/// <summary>
/// 椋庢墖zz鎵褰撳墠妯″紡
/// <para>0:1鎸� </para>
@@ -79,18 +67,9 @@
/// <para>4:5 </para>
/// <para>7:Auto </para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanSwingMode = 0;
-
/// <summary>
- /// 鏀寔鐨勬帶鍒舵ā寮�
- /// </summary>
- public List<AcMode> acModes = new List<AcMode> { };
-
- /// <summary>
- /// 鏀寔鐨勯閫熸ā寮�
- /// </summary>
- public List<FanMode> fanModes = new List<FanMode> { };
- /// <summary>
/// <para>鑷畾涔夌┖璋冩敮鎸佺殑妯″紡(榛樿鍏ㄥ紑)</para>
/// <para>鏁扮粍绱㈠紩 -> 0:鍒跺喎 1:鍒剁儹 2:閫侀 3:闄ゆ箍 4:鑷姩</para>
/// <para>鍊� -> 1:浠ｈ〃浣跨敤 0:浠ｈ〃涓嶄娇鐢�</para>
@@ -100,10 +79,10 @@
/// 鏄惁鍚敤鎽嗛鍔熻兘 false:涓嶄娇鐢ㄦ憜椋庡姛鑳� true:浣跨敤鎽嗛鍔熻兘
/// </summary>
public bool UseSwingFunction = true;
-
/// <summary>
/// 杩囨护缃戞竻娲楃姸鎬�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public bool CleanStatu = false;
/// <summary>
@@ -261,8 +240,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -276,7 +254,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -340,8 +317,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -355,7 +331,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -418,8 +393,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -433,7 +407,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -496,8 +469,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -511,7 +483,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -574,8 +545,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -589,7 +559,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -692,8 +661,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -707,7 +675,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
index e852fa5..562405e 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/BindObj.cs
@@ -28,8 +28,7 @@
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -43,7 +42,6 @@
}
else if (topic == gatewayID + "/" + "Bind/SetBind_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
var tempResult = Newtonsoft.Json.JsonConvert.DeserializeObject<AddedDeviceBindResponseData>(jobject["Data"].ToString());
if (tempResult == null)
{
@@ -117,22 +115,9 @@
});
}
- /// <summary>
- /// 缁戝畾璁惧淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public AddedDeviceBindResponseAllData addedDeviceBindResponseAllData;
[System.Serializable]
- public class AddedDeviceBindResponseAllData
+ public class AddedDeviceBindResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧鐩存帴鍙嶉缁戝畾璁惧淇℃伅
/// </summary>
@@ -143,10 +128,6 @@
public AddBindResultResponseData addBindResultResponseData;
}
- /// <summary>
- /// 缁戝畾璁惧淇℃伅
- /// </summary>
- public AddedDeviceBindResponseData addedDeviceBindResponseData;
[System.Serializable]
public class AddedDeviceBindResponseData
{
@@ -218,7 +199,6 @@
/// <summary>
/// 缁戝畾璁惧鐨勬暟鎹�
/// </summary>
- public AddBindData addBindData;
[System.Serializable]
public class AddBindData
{
@@ -294,8 +274,7 @@
// if (topic == gatewayID + "/" + "Error_Respon")
// {
- // var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
// if (temp == null)
// {
@@ -309,7 +288,6 @@
// //鍦烘櫙绉婚櫎
// if (topic == gatewayID + "/" + "Bind/RemoveBind_Respon")
// {
- // var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
// var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelDeviceBindResponseData>(jobject["Data"].ToString());
// if (tempData == null)
@@ -325,7 +303,6 @@
// //璁惧绉婚櫎
// if (topic == gatewayID + "/" + "Bind/RemoveBindResult")
// {
- // var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
// var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveBindResultResponseData>(jobject["Data"].ToString());
// if (tempData != null)
@@ -413,8 +390,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -429,7 +405,6 @@
if (topic == gatewayID + "/" + "Bind/RemoveBind_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelDeviceBindResponseData>(jobject["Data"].ToString());
if (tempData == null)
@@ -446,7 +421,6 @@
if (topic == gatewayID + "/" + "Bind/RemoveBindResult")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveBindResultResponseData>(jobject["Data"].ToString());
if (tempData != null)
@@ -543,22 +517,9 @@
/// <summary>
///瑙ｉ櫎缁戝畾鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
- public DelDeviceBindResponseAllData delDeviceBindResponseAllData;
- /// <summary>
- ///瑙ｉ櫎缁戝畾鏁版嵁,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class DelDeviceBindResponseAllData
+ public class DelDeviceBindResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 瑙ｉ櫎缁戝畾鏁版嵁淇℃伅
/// </summary>
@@ -570,10 +531,6 @@
public RemoveBindResultResponseData removeBindResultResponseData;
}
- /// <summary>
- /// 瑙ｉ櫎缁戝畾鏁版嵁
- /// </summary>
- public DelDeviceBindResponseData delDeviceBindResponseData;
/// <summary>
/// 瑙ｉ櫎缁戝畾鏁版嵁
/// </summary>
@@ -634,10 +591,6 @@
public string DeviceName;
}
- /// <summary>
- /// 瑙ｉ櫎缁戝畾鏁版嵁
- /// </summary>
- public DelDeviceBindData delDeviceBindData;
/// <summary>
/// 瑙ｉ櫎缁戝畾鏁版嵁
/// </summary>
@@ -713,8 +666,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -728,7 +680,6 @@
if (topic == gatewayID + "/" + "Bind/GetDeviceBind_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDeviceBindResponseData>(jobject["Data"].ToString());
//var tempBindList = Newtonsoft.Json.Linq.JArray.Parse(jobject["Data"]["BindList"].ToString());
if (tempData == null)
@@ -775,19 +726,9 @@
/// <summary>
///鑾峰彇鎵�鏈夌粦瀹氭暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
- public GetDeviceBindResponseAllData getAllBindResponseAllData;
[System.Serializable]
- public class GetDeviceBindResponseAllData
+ public class GetDeviceBindResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鎺у埗璁惧缁戝畾鐨勮澶囧垪琛ㄥ洖澶嶆暟鎹�
/// </summary>
@@ -797,7 +738,6 @@
/// <summary>
/// 鑾峰彇鎵�鏈夌粦瀹氬洖澶嶇殑鏁版嵁
/// </summary>
- public GetDeviceBindResponseData getAllBindResponseData;
[System.Serializable]
public class GetDeviceBindResponseData
{
@@ -870,8 +810,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -885,7 +824,6 @@
if (topic == gatewayID + "/" + "Bind/GetDeviceLocalBind_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetDeviceLocalBindResponseData>(jobject["Data"].ToString());
if (tempData == null)
{
@@ -932,19 +870,9 @@
/// <summary>
///浠庤妭鐐硅澶囨湰鍦拌褰曡鍙栫粦瀹氬垪琛ㄤ俊鎭洖澶嶇殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
- public GetDeviceLocalBindResponseAllData getDeviceLocalBindResponseAllData;
[System.Serializable]
- public class GetDeviceLocalBindResponseAllData
+ public class GetDeviceLocalBindResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 浠庤妭鐐硅澶囨湰鍦拌褰曡鍙栫粦瀹氬垪琛ㄤ俊鎭洖澶嶇殑鏁版嵁
/// </summary>
@@ -954,7 +882,6 @@
/// <summary>
/// 浠庤妭鐐硅澶囨湰鍦拌褰曡鍙栫粦瀹氬垪琛ㄤ俊鎭洖澶嶇殑鏁版嵁
/// </summary>
- public GetDeviceLocalBindResponseData getDeviceLocalBindResponseData;
[System.Serializable]
public class GetDeviceLocalBindResponseData
{
@@ -1035,8 +962,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1050,7 +976,6 @@
if (topic == gatewayID + "/" + "Bind/ClearBindInfo_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClearBindInfoResponseData>(jobject["Data"].ToString());
if (tempData == null)
{
@@ -1097,19 +1022,9 @@
/// <summary>
///鍒犻櫎涓�涓帶鍒惰澶囨墍鏈夌粦瀹氭暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
- public ClearBindInfoResponseAllData clearBindInfoResponseAllData;
[System.Serializable]
- public class ClearBindInfoResponseAllData
+ public class ClearBindInfoResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鎺у埗璁惧缁戝畾鐨勮澶囧垪琛ㄥ洖澶嶆暟鎹�
/// </summary>
@@ -1119,7 +1034,6 @@
/// <summary>
/// 鍒犻櫎涓�涓帶鍒惰澶囨墍鏈夌粦瀹氫俊鎭洖澶嶇殑鏁版嵁
/// </summary>
- public ClearBindInfoResponseData clearBindInfoResponseData;
[System.Serializable]
public class ClearBindInfoResponseData
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
index 2eb6f8a..a572e70 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/CommonDevice.cs
@@ -8,36 +8,165 @@
[System.Serializable]
public class CommonDevice
{
+ #region 闇�瑕佷繚瀛樼殑鍙橀噺
+
+ /// <summary>
+ /// 鏄惁鏄嚜瀹氫箟鍥剧墖
+ /// </summary>
+ public bool IsCustomizeImage = false;
+ /// <summary>
+ /// 璁惧鍥剧墖
+ /// </summary>
+ public string IconPath = string.Empty;
+ /// <summary>
+ /// 璁惧鍥剧墖--鍦ㄧ嚎鎴栬�呴�変腑鐘舵��
+ /// </summary>
+ /// <value>The online icon path.</value>
+ [Newtonsoft.Json.JsonIgnore]
+ public string OnlineIconPath
+ {
+ get
+ {
+ if (string.IsNullOrEmpty(IconPath))
+ {
+ return string.Empty;
+ }
+ var pathArr = IconPath.Split('.');
+ if (pathArr == null || string.IsNullOrEmpty(pathArr[0]))
+ {
+ return string.Empty;
+ }
+ return $"{pathArr[0]}Selected.png";
+ }
+ }
+ /// <summary>
+ /// 褰撳墠缃戝叧鐨処D
+ /// </summary>
+ public string CurrentGateWayId;
+ /// <summary>
+ /// 褰撳墠璁惧绫诲瀷
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public DeviceType Type = DeviceType.UnKown;
+ /// <summary>
+ /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿鏈寚瀹�)
+ /// </summary>
+ public DeviceFunctionType DfunctionType = DeviceFunctionType.A鏈畾涔�;
+ /// <summary>
+ /// MAC鍦板潃
+ /// </summary>
+ public string DeviceAddr;
+ /// <summary>
+ /// 璁惧绔彛鍙�
+ /// </summary>
+ public int DeviceEpoint;
+ /// <summary>
+ /// 璁惧id
+ /// <para>258:color dimmable light,璋冨叧鐏� </para>
+ /// <para>10:Door lock,闂ㄩ攣</para>
+ /// <para>514:Window covering device,绐楀笜</para>
+ /// <para>515:Window covering controller锛岀獥甯樻帶鍒跺櫒</para>
+ /// <para>769:Thermostat,鎭掓俯闈㈡澘/绌鸿皟</para>
+ /// <para>770:Temperature Sensor,娓╁害浼犳劅鍣�</para>
+ /// <para>775:Temperature Sensor,婀垮害浼犳劅鍣�</para>
+ /// <para>262:Light sensor,鍏夌収浼犳劅鍣�</para>
+ /// <para>1026:sensor,浼犳劅鍣紝鍏蜂綋绫诲瀷鐨勪紶鎰熷櫒DeviceType鏉ュ尯鍒�</para>
+ /// </summary>
+ public int DeviceID;
+ /// <summary>
+ /// 璇ュ瓧娈典富瑕侀拡瀵笽AS瀹夐槻璁惧璁剧珛銆傛墍鏈塈AS瀹夐槻璁惧鍏辩敤涓�涓狣eviceID涓�1026銆傛墍浠ヨ鍖哄垎瀛愯澶囩被鍨嬶紝闇�瑕佽瀛楁銆�
+ /// 鐬棿鏁版嵁涓婃姤鐨勪紶鎰熷櫒 (MomentStatus=1 TriggerZoneStatus>=1锛滄姤璀︼紴)
+ /// <para>13:Motion sensor (杩愬姩浼犳劅鍣級</para>
+ /// <para>40 Fire sensor 鐑熼浘浼犳劅鍣�</para>
+ /// <para>42 Water sensor 姘翠镜浼犳劅鍣�</para>
+ /// <para>43 Carbon Monoxide (CO) 鐕冩皵浼犳劅鍣�</para>
+ /// <para>44 Personal emergency device 绱ф�ユ寜閽�</para>
+ /// <para>277 Key fob 閽ュ寵鎵�</para>
+ /// <para>鎸佺画鏁版嵁涓婃姤(MomentStatus=0 TriggerZoneStatus>=1锛滄姤璀︼紴 TriggerZoneStatus=0锛滃彇娑堟姤璀︼紴)</para>
+ /// <para>21: Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿欙級</para>
+ /// <para>22:Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿�</para>
+ /// </summary>
+ public int IasDeviceType;
+ /// <summary>
+ /// 璁惧鍚嶇О,浠ヨ澶囩殑MAC鍛藉悕
+ /// </summary>
+ public string DeviceName = "UnKown";
+ /// <summary>
+ /// 璁惧绔偣鍚嶇О锛屼互璁惧绔偣鍚嶇О鍛藉悕
+ /// </summary>
+ public string DeviceEpointName = "UnKown";
+ /// <summary>
+ /// 鐢ㄤ簬鍒ゆ柇璁惧鐨剒igbee鍗忚鐗堟湰銆�
+ ///<para>49246锛歓LL1.0鏍囧噯璁惧銆�</para>
+ ///<para>260锛� ZHA1.2鏍囧噯璁惧銆� Z3.0鏍囧噯璁惧銆�</para>
+ ///<para>41440锛歓GP3.0鏍囧噯璁惧銆�</para>
+ ///<para>265锛歓SE1.4鏍囧噯璁惧銆�</para>
+ /// </summary>
+ [Newtonsoft.Json.JsonIgnore]
+ public int Profile;
+ /// <summary>
+ /// 0锛氳澶囦笉鍦ㄧ嚎
+ /// <para>1锛氳澶囧湪绾�</para>
+ /// </summary>
+ public int IsOnline;
+ /// <summary>
+ /// 褰撳墠杩愯绋嬪簭鐗堟湰淇℃伅銆� 鏈�澶�64瀛楄妭
+ /// </summary>
+ public int ImgVersion;
+ /// <summary>
+ /// 纭欢鐗堟湰
+ /// </summary>
+ public int HwVersion;
+ /// <summary>
+ /// 褰撳墠闀滃儚绫诲瀷id
+ /// </summary>
+ public int ImgTypeId;
+ /// <summary>
+ /// 椹卞姩浠ｇ爜銆備负0鏃讹紝琛ㄧずzigbee鍗忚皟鍣ㄨ澶囥�傚叾浠栧�艰〃绀轰负铏氭嫙椹卞姩璁惧
+ /// </summary>
+ public int DriveCode;
+ /// <summary>
+ /// 鐢熶骇鍟嗗悕瀛�
+ /// </summary>
+ public string ManufacturerName = string.Empty;
+ /// <summary>
+ /// 妯″潡ID锛堣繖涓笢瑗夸篃鍙�愬瀷鍙风爜銆戯級
+ /// </summary>
+ public string ModelIdentifier = string.Empty;
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ public string ProductionDate = string.Empty;
+ /// <summary>
+ /// 鐢垫簮
+ /// </summary>
+ public int PowerSource = -1;
+ /// <summary>
+ /// 搴忓垪鍙�
+ /// </summary>
+ public string SerialNumber = string.Empty;
+ /// <summary>
+ /// 杈撳叆绨囧垪琛�
+ /// </summary>
+ public List<InClusterObj> InClusterList = new List<InClusterObj>();
+ /// <summary>
+ /// 杈撳嚭绨囧垪琛�
+ /// </summary>
+ public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
+
[Newtonsoft.Json.JsonIgnore]
public DateTime LastDateTime = DateTime.MinValue;
- /// <summary>
- /// 鏄惁宸茬粡璇诲彇浜嗚澶囩姸鎬�(姝ゅ睘鎬ф槸缁欎富椤典娇鐢ㄧ殑)
+ /// <summary>
+ /// 鏄惁宸茬粡璇诲彇浜嗚澶囩姸鎬�(姝ゅ睘鎬ф槸缁欎富椤典娇鐢ㄧ殑)
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public bool HadReadDeviceStatu = false;
/// <summary>
- /// 璋冭瘯鏃舵墦寮�鎵撳嵃淇℃伅锛宼rue:鎵撳嵃锛宖alse:涓嶆墦鍗�
- /// </summary>
- /// <param name="msg">Message.</param>
- /// <param name="flage">If set to <c>true</c> flage.</param>
- public static void DebugPrintLog(string msg, bool flage = true)
- {
-#if DEBUG
- if (flage == true)
- {
- if (msg.Contains("DeviceStatusReport") == false)
- {
- System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
- }
- }
-#endif
- }
-
- /// <summary>
/// 绛夊緟浠庣綉鍏虫帴鏀舵暟鎹殑鏃堕棿
/// </summary>
/// <value>The wait receive data time.</value>
+ [Newtonsoft.Json.JsonIgnore]
public virtual int WaitReceiveDataTime
{
get
@@ -50,16 +179,6 @@
{
return 3000;
}
- }
- }
-
-
- [Newtonsoft.Json.JsonIgnore]
- public bool IsValid
- {
- get
- {
- return (DateTime.Now - LastDateTime).TotalSeconds < 10;
}
}
@@ -103,6 +222,82 @@
}
}
+ #endregion
+
+ #region 璁惧淇濆瓨鍙婄敓鎴�
+
+ /// <summary>
+ /// 鐢辫澶囧瓧绗︿覆姣旂壒鎭㈠璁惧瀵硅薄
+ /// </summary>
+ /// <param name="strDeviceType">璁惧DeviceType鐨勫瓧绗︿覆绫诲瀷</param>
+ /// <param name="strDeviceByte">璁惧Json鏂囦欢杞负姣旂壒鍚庡啀杞负鐨勫瓧绗︿覆</param>
+ /// <returns></returns>
+ public static CommonDevice CommonDeviceByByteString(string strDeviceType, string strDeviceByte)
+ {
+ CommonDevice device = null;
+ if (strDeviceType == ZigBee.Device.DeviceType.DimmableLight.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<DimmableLight>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.OnOffOutput.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringDevice.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.OnOffSwitch.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<Panel>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.IASZone.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.OtaDevice.ToString() || strDeviceType == ZigBee.Device.DeviceType.OtaPanelDevice.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<OTADevice>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.AirSwitch.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<AirSwitch>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.Repeater.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<Repeater>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.Thermostat.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.Transverter.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<Transverter>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.DoorLock.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLock>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.TemperatureSensor.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.FreshAirHumiditySensor.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<HumiditySensor>(strDeviceByte);
+ }
+ else if (strDeviceType == ZigBee.Device.DeviceType.FreshAir.ToString())
+ {
+ device = Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
+ }
+ else { return null; }
+ //鑳藉皯瀛樹竴涓彉閲忓氨灏戝瓨涓�涓�
+ device.Type = (DeviceType)device.DeviceID;
+
+ return device;
+ }
+
/// <summary>
/// 鐢辫澶囪矾寰勬仮澶嶈澶囧璞�
/// </summary>
@@ -116,77 +311,6 @@
return null;
}
return CommonDeviceByByteString(v[1], System.Text.Encoding.UTF8.GetString(Shared.Common.Global.ReadFileByHomeId(deviceFilePath)));
- }
-
- /// <summary>
- /// 鐢辫澶囧瓧绗︿覆姣旂壒鎭㈠璁惧瀵硅薄
- /// </summary>
- /// <param name="strDeviceType">璁惧DeviceType鐨勫瓧绗︿覆绫诲瀷</param>
- /// <param name="strDeviceByte">璁惧Json鏂囦欢杞负姣旂壒鍚庡啀杞负鐨勫瓧绗︿覆</param>
- /// <returns></returns>
- public static CommonDevice CommonDeviceByByteString(string strDeviceType, string strDeviceByte)
- {
- if (strDeviceType == ZigBee.Device.DeviceType.DimmableLight.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<DimmableLight>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.OnOffOutput.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<ToggleLight>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.WindowCoveringDevice.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<Rollershade>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.OnOffSwitch.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<Panel>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.IASZone.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.OtaDevice.ToString() || strDeviceType == ZigBee.Device.DeviceType.OtaPanelDevice.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<OTADevice>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.AirSwitch.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<AirSwitch>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.Repeater.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<Repeater>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.Thermostat.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<AC>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.Transverter.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<Transverter>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.DoorLock.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<DoorLock>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.TemperatureSensor.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<TemperatureSensor>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.FreshAirHumiditySensor.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<HumiditySensor>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.FreshAir.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<FreshAir>(strDeviceByte);
- }
- else if (strDeviceType == ZigBee.Device.DeviceType.PMSensor.ToString())
- {
- return Newtonsoft.Json.JsonConvert.DeserializeObject<PMSensor>(strDeviceByte);
- }
- return null;
}
/// <summary>
@@ -252,11 +376,6 @@
//鏂伴
IconPath = "Device/FreshAirEpoint.png";
}
- else if (this.Type == DeviceType.FreshAir)
- {
- //PM2.5绌烘皵璐ㄩ噺浼犳劅鍣�
- IconPath = "Device/FreshAirEpoint.png";
- }
else if (this.Type == DeviceType.FreshAirHumiditySensor)
{
//婀垮害浼犳劅鍣�
@@ -287,192 +406,9 @@
}
}
- /// <summary>
- /// 鏄惁鏄嚜瀹氫箟鍥剧墖
- /// </summary>
- public bool IsCustomizeImage = false;
- /// <summary>
- /// 璁惧鍥剧墖
- /// </summary>
- public string IconPath = string.Empty;
- /// <summary>
- /// 璁惧鍥剧墖--鍦ㄧ嚎鎴栬�呴�変腑鐘舵��
- /// </summary>
- /// <value>The online icon path.</value>
- [Newtonsoft.Json.JsonIgnore]
- public string OnlineIconPath
- {
- get
- {
- if (string.IsNullOrEmpty(IconPath))
- {
- return string.Empty;
- }
- var pathArr = IconPath.Split('.');
- if (pathArr == null || string.IsNullOrEmpty(pathArr[0]))
- {
- return string.Empty;
- }
- return $"{pathArr[0]}Selected.png";
- }
- }
+ #endregion
- /// <summary>
- /// 褰撳墠缃戝叧鐨処D
- /// </summary>
- public string CurrentGateWayId;
- /// <summary>
- /// 褰撳墠璁惧绫诲瀷
- /// </summary>
- public DeviceType Type = DeviceType.UnKown;
- /// <summary>
- /// 璁惧鐨勫姛鑳界被鍨�(姝ょ被鍨嬬洰鍓嶅彧閽堝缁х數鍣ㄥ洖璺湁鏁�,榛樿鏈寚瀹�)
- /// </summary>
- public DeviceFunctionType DfunctionType = DeviceFunctionType.A鏈畾涔�;
- /// <summary>
- /// MAC鍦板潃
- /// </summary>
- public string DeviceAddr;
-
- /// <summary>
- /// 璁惧绔彛鍙�
- /// </summary>
- public int DeviceEpoint;
-
- /// <summary>
- /// 璁惧鍛戒护鏍煎紡锛歁ac+绔彛
- /// </summary>
- /// <value>The common device address epoint.</value>
- public string CommonDeviceAddrEpoint
- {
- get
- {
- return DeviceAddr + "_" + DeviceEpoint.ToString();
- }
- }
-
- /// <summary>
- /// 缃戝叧鍙嶉鐨勬椂闂存埑
- /// </summary>
- public int Time;
-
- /// <summary>
- /// 缃戝叧鍥炲鐨勬暟鎹甀D
- /// </summary>
- public int DataID;
-
- /// <summary>
- /// 璁惧id
- /// <para>258:color dimmable light,璋冨叧鐏� </para>
- /// <para>10:Door lock,闂ㄩ攣</para>
- /// <para>514:Window covering device,绐楀笜</para>
- /// <para>515:Window covering controller锛岀獥甯樻帶鍒跺櫒</para>
- /// <para>769:Thermostat,鎭掓俯闈㈡澘/绌鸿皟</para>
- /// <para>770:Temperature Sensor,娓╁害浼犳劅鍣�</para>
- /// <para>775:Temperature Sensor,婀垮害浼犳劅鍣�</para>
- /// <para>262:Light sensor,鍏夌収浼犳劅鍣�</para>
- /// <para>1026:sensor,浼犳劅鍣紝鍏蜂綋绫诲瀷鐨勪紶鎰熷櫒DeviceType鏉ュ尯鍒�</para>
- /// </summary>
- public int DeviceID;
-
- /// <summary>
- /// 璇ュ瓧娈典富瑕侀拡瀵笽AS瀹夐槻璁惧璁剧珛銆傛墍鏈塈AS瀹夐槻璁惧鍏辩敤涓�涓狣eviceID涓�1026銆傛墍浠ヨ鍖哄垎瀛愯澶囩被鍨嬶紝闇�瑕佽瀛楁銆�
- /// 鐬棿鏁版嵁涓婃姤鐨勪紶鎰熷櫒 (MomentStatus=1 TriggerZoneStatus>=1锛滄姤璀︼紴)
- /// <para>13:Motion sensor (杩愬姩浼犳劅鍣級</para>
- /// <para>40 Fire sensor 鐑熼浘浼犳劅鍣�</para>
- /// <para>42 Water sensor 姘翠镜浼犳劅鍣�</para>
- /// <para>43 Carbon Monoxide (CO) 鐕冩皵浼犳劅鍣�</para>
- /// <para>44 Personal emergency device 绱ф�ユ寜閽�</para>
- /// <para>277 Key fob 閽ュ寵鎵�</para>
- /// <para>鎸佺画鏁版嵁涓婃姤(MomentStatus=0 TriggerZoneStatus>=1锛滄姤璀︼紴 TriggerZoneStatus=0锛滃彇娑堟姤璀︼紴)</para>
- /// <para>21: Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿欙級</para>
- /// <para>22:Door/Window 闂ㄧ獥浼犳劅鍣紙鏈�21鍜�22锛岃繖閲屾病鏈夊啓閿�</para>
- /// </summary>
- public int IasDeviceType;
-
- /// <summary>
- /// 璁惧鍚嶇О,浠ヨ澶囩殑MAC鍛藉悕
- /// </summary>
- public string DeviceName = "UnKown";
-
- /// <summary>
- /// 璁惧绔偣鍚嶇О锛屼互璁惧绔偣鍚嶇О鍛藉悕
- /// </summary>
- public string DeviceEpointName = "UnKown";
-
- /// <summary>
- /// 鐢ㄤ簬鍒ゆ柇璁惧鐨剒igbee鍗忚鐗堟湰銆�
- ///<para>49246锛歓LL1.0鏍囧噯璁惧銆�</para>
- ///<para>260锛� ZHA1.2鏍囧噯璁惧銆� Z3.0鏍囧噯璁惧銆�</para>
- ///<para>41440锛歓GP3.0鏍囧噯璁惧銆�</para>
- ///<para>265锛歓SE1.4鏍囧噯璁惧銆�</para>
- /// </summary>
- public int Profile;
- /// <summary>
- /// 0锛氳澶囦笉鍦ㄧ嚎
- /// <para>1锛氳澶囧湪绾�</para>
- /// </summary>
- public int IsOnline;
- /// <summary>
- /// 褰撳墠杩愯绋嬪簭鐗堟湰淇℃伅銆� 鏈�澶�64瀛楄妭
- /// </summary>
- public int ImgVersion;
- /// <summary>
- /// 纭欢鐗堟湰
- /// </summary>
- public int HwVersion;
- /// <summary>
- /// 褰撳墠闀滃儚绫诲瀷id
- /// </summary>
- public int ImgTypeId;
- /// <summary>
- /// 椹卞姩浠ｇ爜銆備负0鏃讹紝琛ㄧずzigbee鍗忚皟鍣ㄨ澶囥�傚叾浠栧�艰〃绀轰负铏氭嫙椹卞姩璁惧
- /// </summary>
- public int DriveCode;
- /// <summary>
- /// 鐢熶骇鍟嗗悕瀛�
- /// </summary>
- public string ManufacturerName = string.Empty;
- /// <summary>
- /// 妯″潡ID锛堣繖涓笢瑗夸篃鍙�愬瀷鍙风爜銆戯級
- /// </summary>
- public string ModelIdentifier = string.Empty;
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string ProductionDate = string.Empty;
- /// <summary>
- /// 鐢垫簮
- /// </summary>
- public int PowerSource = -1;
- /// <summary>
- /// 搴忓垪鍙�
- /// </summary>
- public string SerialNumber = string.Empty;
- /// <summary>
- /// 鎵�鏈夋寚瀹歝luster鏄惁閮藉凡缁忔垚鍔熺粦瀹氬崗璋冨櫒
- ///<para>0:鏈畬鍏ㄧ粦瀹�</para>
- ///<para>1锛氬凡缁忕粦瀹�</para>
- /// </summary>
- public int ClusterBindZbSuccess = -1;
- /// <summary>
- /// 鏄惁鑾峰彇鎵�鏈夐粯璁ょ粦瀹氫俊鎭�
- ///<para>0锛氬惁</para>
- ///<para>1锛氭槸</para>
- /// </summary>
- public int IsGetAllDefaultBind = -1;
- /// <summary>
- /// 杈撳叆绨囧垪琛�
- /// </summary>
- public List<InClusterObj> InClusterList = new List<InClusterObj>();
- /// <summary>
- /// 杈撳嚭绨囧垪琛�
- /// </summary>
- public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
- /// <summary>
- /// 鐢ㄤ簬璁板綍璁惧鏈�鏂颁笂鎶ョ殑灞炴�х姸鎬佷俊鎭�傛渶澶ф敮鎸佽褰�16涓睘鎬х姸鎬侊紝涓斿彧璁板綍灞炴�у�奸暱搴︿笉澶т簬4瀛楄妭鐨勬暟鎹��
- /// </summary>
- public List<AttributeStatusObj> AttributeStatus = new List<AttributeStatusObj>();
+ #region 杈撳叆杈撳嚭闀炲畾涔�
/// <summary>
/// 璁惧鏈�鏂颁笂鎶ョ殑灞炴�х姸鎬佷俊鎭�
@@ -618,12 +554,15 @@
public int commandId;
}
- #region 浜屻�佽幏鍙栧凡鍏ョ綉璁惧淇℃伅
+ #endregion
+
+ #region 鑾峰彇宸插叆缃戣澶囦俊鎭�
/// <summary>
/// 缃戝叧涓殑璁惧淇℃伅
/// </summary>
- public DeviceInfoData DeviceInfo = new DeviceInfoData();
+ [Newtonsoft.Json.JsonIgnore]
+ public DeviceInfoData DeviceInfo = null;
/// <summary>
/// 缃戝叧涓殑璁惧淇℃伅
/// </summary>
@@ -722,110 +661,15 @@
}
+ #endregion
+
+ #region 閿欒缁撴灉瀹氫箟
+
/// <summary>
- /// 鑾峰彇鎵�鏈夌綉鍏崇殑鑺傜偣璁惧淇℃伅锛堢敤浜庝富缃戝叧锛�
- /// </summary>
- public AllGatewayDeviceInfo getAllGatewayDeviceInfo;
- /// <summary>
- /// 鑾峰彇鎵�鏈夌綉鍏崇殑鑺傜偣璁惧淇℃伅锛堢敤浜庝富缃戝叧锛�
+ /// 缃戝叧淇℃伅閿欒鍙嶉鍏遍��
/// </summary>
[System.Serializable]
- public class AllGatewayDeviceInfo
- {
- /// <summary>
- /// 鍏ョ綉璁惧鎬绘暟銆傜瓑浜�0鏃讹紝琛ㄧず娌℃湁璁惧淇℃伅锛屼笅闈㈠瓧娈靛皢涓嶅瓨鍦ㄣ��
- /// </summary>
- public int TotalNum;
- /// <summary>
- /// 鏍囪瘑褰撳墠璁惧鏄彂閫佺殑鏄鍑犱釜璁惧銆侱eviceNum浠�1寮�濮嬫瘡鍙戦�佷竴涓澶囦俊鎭紝涓嬩竴涓澶囦俊鎭殑DeviceNum灏嗗姞1銆傜洿鍒癉eviceNum绛変簬TotalNum璇存槑鎵�鏈夎澶囦俊鎭彂閫佸畬姣曘��
- /// </summary>
- public int DeviceNum;
- /// <summary>
- /// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
- /// </summary>
- public string GwId;
- /// <summary>
- /// 鍏ョ綉鐨剈tc鏃堕棿鎴�
- /// </summary>
- public int JoinTime;
- /// <summary>
- /// 1:璺敱鍣ㄨ澶�
- /// <para>2:缁堢璁惧</para>
- /// </summary>
- public int ZigbeeType;
- /// <summary>
- /// 璁惧缃戠粶鍦板潃
- /// </summary>
- public int NwkAddr;
- /// <summary>
- /// 璇ュ瓧娈典富瑕侀拡瀵笽AS瀹夐槻璁惧璁剧珛銆傛墍鏈塈AS瀹夐槻璁惧鍏辩敤涓�涓狣eviceID涓�1026銆傛墍浠ヨ鍖哄垎瀛愯澶囩被鍨嬶紝闇�瑕佽瀛楁銆�
- /// <para>13:Motion sensor (杩愬姩浼犳劅鍣級</para>
- /// <para>43:Carbon Monoxide sensor (涓�姘у寲纰充紶鎰熷櫒锛�</para>
- /// <para>44:Personal emergency device (绱ф�ユ寜閽級</para>
- /// </summary>
- public int DeviceType;
- /// <summary>
- /// 鐢ㄤ簬鍒ゆ柇璁惧鐨剒igbee鍗忚鐗堟湰銆�
- /// <para>49246锛歓LL1.0鏍囧噯璁惧銆�</para>
- /// <para>260锛� ZHA1.2鏍囧噯璁惧銆� Z3.0鏍囧噯璁惧銆�</para>
- /// <para>41440锛歓GP3.0鏍囧噯璁惧銆�</para>
- /// <para>265锛歓SE1.4鏍囧噯璁惧銆�</para>
- /// </summary>
- public int Profile;
- /// <summary>
- /// 璁惧绔偣鍚�
- /// </summary>
- public string DeviceName;
- /// <summary>
- /// 璁惧鍚�
- /// </summary>
- public string MacName;
- /// <summary>
- /// 0锛氳澶囦笉鍦ㄧ嚎
- /// <para>1锛氳澶囧湪绾�</para>
- /// </summary>
- public int IsOnline;
- /// <summary>
- /// 褰撳墠杩愯绋嬪簭鐗堟湰淇℃伅銆� 鏈�澶�64瀛楄妭
- /// </summary>
- public int ImgVersion;
- /// <summary>
- /// 纭欢鐗堟湰
- /// </summary>
- public int HwVersion;
- /// <summary>
- /// 褰撳墠闀滃儚绫诲瀷id
- /// </summary>
- public int ImgTypeId;
- /// <summary>
- /// 椹卞姩浠ｇ爜銆備负0鏃讹紝琛ㄧずzigbee鍗忚皟鍣ㄨ澶囥�傚叾浠栧�艰〃绀轰负铏氭嫙椹卞姩璁惧
- /// </summary>
- public int DriveCode;
- /// <summary>
- /// 杈撳叆绨囧垪琛�
- /// </summary>
- public List<InClusterObj> InClusterList = new List<InClusterObj>();
-
- /// <summary>
- /// 杈撳嚭绨囧垪琛�
- /// </summary>
- public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
- /// <summary>
- /// 鐢ㄤ簬璁板綍璁惧鏈�鏂颁笂鎶ョ殑灞炴�х姸鎬佷俊鎭�傛渶澶ф敮鎸佽褰�16涓睘鎬х姸鎬侊紝涓斿彧璁板綍灞炴�у�奸暱搴︿笉澶т簬4瀛楄妭鐨勬暟鎹��
- /// </summary>
- public List<AttributeStatusObj> AttributeStatus = new List<AttributeStatusObj>();
-
- }
-
- /// <summary>
- /// 鑾峰彇缃戝叧璁板綍鐨勮澶囧睘鎬х姸鎬�
- /// </summary>
- public GetStatusRecordAllInfo getStatusRecordAllInfo;
- /// <summary>
- /// 鑾峰彇缃戝叧璁板綍鐨勮澶囧睘鎬х姸鎬�
- /// </summary>
- [System.Serializable]
- public class GetStatusRecordAllInfo
+ public class ErrorResponCommon
{
/// <summary>
/// 閿欒淇℃伅
@@ -836,269 +680,8 @@
/// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
/// </summary>
public ErrorResponData errorResponData;
- /// <summary>
- /// 璁惧鍚嶇О淇敼
- /// </summary>
- public GetStatusRecordInfo getStatusRecordInfo;
}
- /// <summary>
- /// 鑾峰彇鎵�鏈夌綉鍏崇殑鑺傜偣璁惧淇℃伅锛堢敤浜庝富缃戝叧锛�
- /// </summary>
- public GetStatusRecordInfo getStatusRecordInfo;
- /// <summary>
- /// 鑾峰彇鎵�鏈夌綉鍏崇殑鑺傜偣璁惧淇℃伅锛堢敤浜庝富缃戝叧锛�
- /// </summary>
- [System.Serializable]
- public class GetStatusRecordInfo
- {
- /// <summary>
- /// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
- /// </summary>
- public string GwId;
- /// <summary>
- /// 鍏ョ綉鐨剈tc鏃堕棿鎴�
- /// </summary>
- public int JoinTime;
- /// <summary>
- /// 1:璺敱鍣ㄨ澶�
- /// <para>2:缁堢璁惧</para>
- /// </summary>
- public int ZigbeeType;
- /// <summary>
- /// 璁惧缃戠粶鍦板潃
- /// </summary>
- public int NwkAddr;
- /// <summary>
- /// 璇ュ瓧娈典富瑕侀拡瀵笽AS瀹夐槻璁惧璁剧珛銆傛墍鏈塈AS瀹夐槻璁惧鍏辩敤涓�涓狣eviceID涓�1026銆傛墍浠ヨ鍖哄垎瀛愯澶囩被鍨嬶紝闇�瑕佽瀛楁銆�
- /// <para>13:Motion sensor (杩愬姩浼犳劅鍣級</para>
- /// <para>43:Carbon Monoxide sensor (涓�姘у寲纰充紶鎰熷櫒锛�</para>
- /// <para>44:Personal emergency device (绱ф�ユ寜閽級</para>
- /// </summary>
- public int DeviceType;
- /// <summary>
- /// 鐢ㄤ簬鍒ゆ柇璁惧鐨剒igbee鍗忚鐗堟湰銆�
- /// <para>49246锛歓LL1.0鏍囧噯璁惧銆�</para>
- /// <para>260锛� ZHA1.2鏍囧噯璁惧銆� Z3.0鏍囧噯璁惧銆�</para>
- /// <para>41440锛歓GP3.0鏍囧噯璁惧銆�</para>
- /// <para>265锛歓SE1.4鏍囧噯璁惧銆�</para>
- /// </summary>
- public int Profile;
- /// <summary>
- /// 璁惧绔偣鍚�
- /// </summary>
- public string DeviceName;
- /// <summary>
- /// 璁惧鍚�
- /// </summary>
- public string MacName;
- /// <summary>
- /// 0锛氳澶囦笉鍦ㄧ嚎
- /// <para>1锛氳澶囧湪绾�</para>
- /// </summary>
- public int IsOnline;
- /// <summary>
- /// 褰撳墠杩愯绋嬪簭鐗堟湰淇℃伅銆� 鏈�澶�64瀛楄妭
- /// </summary>
- public int ImgVersion;
- /// <summary>
- /// 纭欢鐗堟湰
- /// </summary>
- public int HwVersion;
- /// <summary>
- /// 褰撳墠闀滃儚绫诲瀷id
- /// </summary>
- public int ImgTypeId;
- /// <summary>
- /// 椹卞姩浠ｇ爜銆備负0鏃讹紝琛ㄧずzigbee鍗忚皟鍣ㄨ澶囥�傚叾浠栧�艰〃绀轰负铏氭嫙椹卞姩璁惧
- /// </summary>
- public int DriveCode;
- /// <summary>
- /// 杈撳叆绨囧垪琛�
- /// </summary>
- public List<InClusterObj> InClusterList = new List<InClusterObj>();
- /// <summary>
- /// 杈撳嚭绨囧垪琛�
- /// </summary>
- public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
- /// <summary>
- /// 鐢ㄤ簬璁板綍璁惧鏈�鏂颁笂鎶ョ殑灞炴�х姸鎬佷俊鎭�傛渶澶ф敮鎸佽褰�16涓睘鎬х姸鎬侊紝涓斿彧璁板綍灞炴�у�奸暱搴︿笉澶т簬4瀛楄妭鐨勬暟鎹��
- /// </summary>
- public List<AttributeStatusObj> AttributeStatus = new List<AttributeStatusObj>();
- }
- #endregion
-
- /// <summary>
- /// 鏈夋柊璁惧鍔犲叆zigbee缃戠粶鐨勪俊鎭�
- /// </summary>
- public DeviceDeviceJoinZbNetResponData deviceDeviceJoinZbNetResponData;
- /// <summary>
- /// 鏈夋柊璁惧鍔犲叆zigbee缃戠粶鐨勪俊鎭�
- /// </summary>
- [System.Serializable]
- public class DeviceDeviceJoinZbNetResponData
- {
- /// <summary>
- /// 璁惧缃戠粶鍦板潃
- /// </summary>
- public int NwkAddr;
- /// <summary>
- /// 1:璺敱鍣ㄨ澶�
- /// <para>2:缁堢璁惧</para>
- /// </summary>
- public int ZigbeeType;
- }
-
- /// <summary>
- /// 鑾峰彇鏂拌澶囨墍鏈夌鐐逛俊鎭槸鍚︽垚鍔熶俊鎭�
- /// </summary>
- public DeviceIsGetEpointInfoResponData deviceIsGetEpointInfoResponData;
- /// <summary>
- /// 鑾峰彇鏂拌澶囨墍鏈夌鐐逛俊鎭槸鍚︽垚鍔熶俊鎭�
- /// </summary>
- [System.Serializable]
- public class DeviceIsGetEpointInfoResponData
- {
- /// <summary>
- /// 0锛氭垚鍔熻幏鍙栨墍鏈夌鐐逛俊鎭�
- ///<para>1锛氳幏鍙栧け璐�</para>
- /// </summary>
- public int Result;
- }
-
- /// <summary>
- /// 缃戝叧涓柊鎼滅储鍑虹殑璁惧淇℃伅
- /// </summary>
- public NewDeviceInfoData getNewDeviceInfo;
- /// <summary>
- /// 缃戝叧涓柊鎼滅储鍑虹殑璁惧淇℃伅
- /// </summary>
- [System.Serializable]
- public class NewDeviceInfoData
- {
- /// <summary>
- /// 鍏ョ綉鐨剈tc鏃堕棿鎴�
- /// </summary>
- public int JoinTime;
- /// <summary>
- /// 1:璺敱鍣ㄨ澶�
- /// <para>2:缁堢璁惧</para>
- /// </summary>
- public int ZigbeeType;
- /// <summary>
- /// 璁惧缃戠粶鍦板潃
- /// </summary>
- public int NwkAddr;
- /// <summary>
- /// 璇ュ瓧娈典富瑕侀拡瀵笽AS瀹夐槻璁惧璁剧珛銆傛墍鏈塈AS瀹夐槻璁惧鍏辩敤涓�涓狣eviceID涓�1026銆傛墍浠ヨ鍖哄垎瀛愯澶囩被鍨嬶紝闇�瑕佽瀛楁銆�
- /// <para>13:Motion sensor (杩愬姩浼犳劅鍣級</para>
- /// <para>43:Carbon Monoxide sensor (涓�姘у寲纰充紶鎰熷櫒锛�</para>
- /// <para>44:Personal emergency device (绱ф�ユ寜閽級</para>
- /// </summary>
- public int DeviceType;
- /// <summary>
- /// 鐢ㄤ簬鍒ゆ柇璁惧鐨剒igbee鍗忚鐗堟湰銆傚尯鍒�3.0璁惧鍜孼HA璁惧
- /// <para>49246锛歓LL1.0鏍囧噯璁惧銆�</para>
- /// <para>260锛� ZHA1.2鏍囧噯璁惧銆� Z3.0鏍囧噯璁惧銆�</para>
- /// <para>41440锛歓GP3.0鏍囧噯璁惧銆�</para>
- /// <para>265锛歓SE1.4鏍囧噯璁惧銆�</para>
- /// </summary>
- public int Profile;
- /// <summary>
- /// 鏄惁鏄柊鍏ョ綉璁惧銆�
- /// <para>濡傛灉缃戝叧鍌ㄥ瓨鐨勮澶囧垪琛ㄤ腑鍘熸潵鏄病鏈夎璁惧鍒欎负鏂板叆缃戣澶囥��</para>
- /// <para>濡傛灉缃戝叧鍌ㄥ瓨鐨勮澶囧垪琛ㄤ腑鏈夎璁惧鍒欎负鏃ц澶囥��</para>
- /// <para>濡傛灉閲嶅叆缃戝悗璁惧淇℃伅宸茬粡鏀瑰彉锛堝璁惧鐨勭綉缁滃湴鍧�锛岃澶嘔D锛宑luster鍒楄〃锛夊垯涔熻涓烘柊璁惧鍏ョ綉銆�</para>
- /// <para>璇ュ瓧娈电敤鏉ュ垽鍒敤鎴峰彲鑳介�氳繃鑺傜偣鐨勫疄浣撴寜閿皢璁惧鎭㈠鍑哄巶璁惧鍚庤妭鐐硅澶囬噸鏂板叆缃戠殑鎯呭喌鎴栬妭鐐硅澶囬噸鍚富鍔ㄥ彂閫佸叆缃戜俊鎭殑鎯呭喌銆�</para>
- /// <para>0锛氭棫璁惧鍏ョ綉</para>
- /// <para>1锛氭柊璁惧鍏ョ綉</para>
- /// <para>2锛氳澶囦负鏂拌澶囷紝骞跺湪涓婃姤璇ヤ俊鎭墠宸茬粡閫�缃戯紝鍗宠澶囧叆缃戝悗缃戝叧杩樻潵涓嶅強涓婃姤璇ヨ澶囦俊鎭澶囦究宸茬粡閫�缃戙�傦紙璁惧鍏ョ綉锛屽埌缃戝叧涓婃姤璁惧淇℃伅鏈変竴娈靛欢鏃讹紝濡傛灉鍦ㄦ鏈熼棿濡傛灉璁惧宸茬粡閫�缃戯紝灏嗗弽棣堣鍊笺�傝鍊间负寮傚父鎯呭喌锛屽綋鏀跺埌璇ュ�兼椂鍊欒鏄庤澶囧苟娌″叆缃戯紝鍙涪寮冭繖涓叆缃戜俊鎭級</para>
- /// </summary>
- public int IsNewDev;
- /// <summary>
- /// 褰撳墠杩愯绋嬪簭鐗堟湰淇℃伅銆� 鏈�澶�64瀛楄妭
- /// </summary>
- public int ImgVersion;
- /// <summary>
- /// 纭欢鐗堟湰
- /// </summary>
- public int HwVersion;
- /// <summary>
- /// 褰撳墠闀滃儚绫诲瀷id
- /// </summary>
- public int ImgTypeId;
- /// <summary>
- /// 椹卞姩浠ｇ爜銆備负0鏃讹紝琛ㄧずzigbee鍗忚皟鍣ㄨ澶囥�傚叾浠栧�艰〃绀轰负铏氭嫙椹卞姩璁惧
- /// </summary>
- public int DriveCode;
- /// <summary>
- /// 璁惧鎵�鍦ㄧ綉鍏崇殑缃戝叧id
- /// </summary>
- public string GwId;
- /// <summary>
- /// 璁惧鍚�
- /// </summary>
- public string MacName;
- /// <summary>
- /// 璁惧绔偣鍚�
- /// </summary>
- public string DeviceName;
- /// <summary>
- /// 0锛氳澶囦笉鍦ㄧ嚎
- /// <para>1锛氳澶囧湪绾�</para>
- /// </summary>
- public int IsOnline;
- /// <summary>
- /// 鎵�鏈夋寚瀹歝luster鏄惁閮藉凡缁忔垚鍔熺粦瀹氬崗璋冨櫒
- ///<para>0:鏈畬鍏ㄧ粦瀹�</para>
- ///<para>1锛氬凡缁忕粦瀹�</para>
- /// </summary>
- public int ClusterBindZbSuccess = -1;
- /// <summary>
- /// 鏄惁鑾峰彇鎵�鏈夐粯璁ょ粦瀹氫俊鎭�
- ///<para>0锛氬惁</para>
- ///<para>1锛氭槸</para>
- /// </summary>
- public int IsGetAllDefaultBind = -1;
- /// <summary>
- /// 鐢熶骇鍟嗗悕瀛�
- /// </summary>
- public string ManufacturerName = string.Empty;
- /// <summary>
- /// 妯″潡ID锛堣繖涓笢瑗夸篃鍙�愬瀷鍙风爜銆戯級
- /// </summary>
- public string ModelIdentifier = string.Empty;
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- public string ProductionDate = string.Empty;
- /// <summary>
- /// 鐢垫簮
- /// </summary>
- public int PowerSource = -1;
- /// <summary>
- /// 搴忓垪鍙�
- /// </summary>
- public string SerialNumber = string.Empty;
- /// <summary>
- /// 杈撳叆绨囧垪琛�
- /// </summary>
- public List<InClusterObj> InClusterList = new List<InClusterObj>();
- /// <summary>
- /// 杈撳嚭绨囧垪琛�
- /// </summary>
- public List<OutClusterObj> OutClusterList = new List<OutClusterObj>();
- /// <summary>
- /// 鐢ㄤ簬璁板綍璁惧鏈�鏂颁笂鎶ョ殑灞炴�х姸鎬佷俊鎭�傛渶澶ф敮鎸佽褰�16涓睘鎬х姸鎬侊紝涓斿彧璁板綍灞炴�у�奸暱搴︿笉澶т簬4瀛楄妭鐨勬暟鎹��
- /// </summary>
- public List<AttributeStatusObj> AttributeStatus = new List<AttributeStatusObj>();
- }
-
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧淇℃伅閿欒鍙嶉
/// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
@@ -1146,6 +729,8 @@
return message;
}
+ #endregion
+
#region 淇敼璁惧绔彛鍚嶇О
///<summary >
/// 淇敼璁惧绔彛锛堟寜閿級鍚嶇О
@@ -1168,8 +753,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1226,10 +810,6 @@
/// <summary>
/// 閲嶅懡鍚嶈澶�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public DeviceRenameAllData renameDeviceAllData;
- /// <summary>
- /// 閲嶅懡鍚嶈澶�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
public class DeviceRenameAllData
{
@@ -1248,10 +828,6 @@
public DeviceRenameResponseData deviceRenameData;
}
- /// <summary>
- /// 璁惧鍚嶇О淇敼
- /// </summary>
- public DeviceRenameResponseData renameDeviceData;
/// <summary>
/// 璁惧鍚嶇О淇敼
/// </summary>
@@ -1291,8 +867,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1350,32 +925,15 @@
/// <summary>
/// 淇敼璁惧mac鍚嶇О鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public RenameDeviceMacNameAllData renameDeviceMacNameAllData;
- /// <summary>
- /// 淇敼璁惧mac鍚嶇О鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class RenameDeviceMacNameAllData
+ public class RenameDeviceMacNameAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇敼璁惧mac鍚嶇О鏁版嵁
/// </summary>
public RenameDeviceMacNameData renameDeviceMacNameData;
}
- /// <summary>
- /// 淇敼璁惧mac鍚嶇О鏁版嵁
- /// </summary>
- public RenameDeviceMacNameData renameDeviceMacNameData;
/// <summary>
/// 淇敼璁惧mac鍚嶇О鏁版嵁
/// </summary>
@@ -1391,32 +949,6 @@
/// 淇敼鍚庣殑璁惧鍚嶇О
/// </summary>
public string MacName;
- }
- #endregion
-
- #region 璁惧鎭㈠鍑哄巶璁剧疆涓庡嚭缃�
- ///<summary >
- /// 浣胯澶囨仮澶嶅嚭鍘傝缃�
- /// <para>浠呮仮澶嶅嚭鍘傝缃紝涓嶇缃戙�備絾鏈変簺涓嶆爣鍑嗙殑3.0璁惧锛屾仮澶嶅嚭鍘傝缃氨浼氱缃戙�� 瀹㈡埛绔垨浜戠鍒扮綉鍏�</para>
- /// </summary>
- public async void ResetDeviceFactoryAsync(string deviceAddr, int deviceEpoint)
- {
- if (Gateway == null)
- {
- return;
- }
- //Action<string, string> action = (topic, message) => { };
- //Gateway.Actions += action;
- System.Console.WriteLine("FactoryResete_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
- try
- {
- var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 97 } };
- Gateway.Send("FactoryReset", jObject.ToString());
- }
- catch { }
-
- //Gateway.Actions -= action;
- System.Console.WriteLine("FactoryReset_Action閫�鍑�" + System.DateTime.Now.ToString());
}
#endregion
@@ -1442,8 +974,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1457,16 +988,15 @@
if (topic == gatewayID + "/" + "RemoveDeviceRespon")
{
- var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- gatewayTemp.removeDeviceResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.RemoveDeviceResponseData>(jobject["Data"].ToString());
+ var removeDeviceResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RemoveDeviceResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.removeDeviceResponseData == null)
+ if (removeDeviceResponseData == null)
{
d = new RemoveDeviceResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new RemoveDeviceResponseAllData { removeDeviceResponseData = gatewayTemp.removeDeviceResponseData };
+ d = new RemoveDeviceResponseAllData { removeDeviceResponseData = removeDeviceResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -1519,10 +1049,6 @@
/// <summary>
/// 闇�瑕佸垹闄よ澶囩殑鏁版嵁
/// </summary>
- public RemoveDeviceData removeDeviceData;
- /// <summary>
- /// 闇�瑕佸垹闄よ澶囩殑鏁版嵁
- /// </summary>
[System.Serializable]
public class RemoveDeviceData
{
@@ -1552,10 +1078,6 @@
/// <summary>
/// 绉婚櫎璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public RemoveDeviceResponseAllData removeDeviceResponseAllData;
- /// <summary>
- /// 绉婚櫎璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
public class RemoveDeviceResponseAllData
{
@@ -1574,10 +1096,6 @@
public RemoveDeviceResponseData removeDeviceResponseData;
}
- /// <summary>
- /// 鍒犻櫎璁惧鍥炲鏁版嵁
- /// </summary>
- public RemoveDeviceResponseData removeDeviceResponseData;
/// <summary>
/// 鍒犻櫎璁惧鍥炲鏁版嵁
/// <para>杩斿洖缁撴灉Resul=锛屽垹闄ゆ垚鍔�</para>
@@ -1618,135 +1136,6 @@
public int Epoint;
}
- #endregion
-
- #region 浠庢�昏澶囧垪琛ㄤ腑绉婚櫎涓�涓綉鍏崇殑鎵�鏈夎妭鐐硅澶囷紙鐢ㄤ簬涓荤綉鍏筹級
- ///<summary >
- /// 浠庢�昏澶囧垪琛ㄤ腑绉婚櫎涓�涓綉鍏崇殑鎵�鏈夎妭鐐硅澶囷紙鐢ㄤ簬涓荤綉鍏筹級
- /// <para>GwId:瑕佺Щ闄よ妭鐐硅澶囩殑缃戝叧id</para>
- /// </summary>
- public async System.Threading.Tasks.Task<RemoveGatewayDeviceListAllData> RemoveGatewayDeviceListAsync(string gwId)
- {
- if (Gateway == null || gwId == null)
- {
- return null;
- }
- return await System.Threading.Tasks.Task.Run(async () =>
- {
- RemoveGatewayDeviceListAllData d = null;
- Action<string, string> action = (topic, message) =>
- {
- var gatewayID = topic.Split('/')[0];
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- if (topic == gatewayID + "/" + "Error_Respon")
- {
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- if (temp == null)
- {
- d = new RemoveGatewayDeviceListAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
- else
- {
- d = new RemoveGatewayDeviceListAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
- }
- if (topic == gatewayID + "/" + "RemoveEqOfGw_Respon")
- {
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- gatewayTemp.removeGatewayDeviceListData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveGatewayDeviceListData>(jobject["Data"].ToString());
-
- if (gatewayTemp.removeGatewayDeviceListData == null)
- {
- d = new RemoveGatewayDeviceListAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- }
- else
- {
- d = new RemoveGatewayDeviceListAllData { removeGatewayDeviceListData = gatewayTemp.removeGatewayDeviceListData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- }
- }
- };
-
- Gateway.Actions += action;
- System.Console.WriteLine("RemoveEqOfGw_Actions 鍚姩" + "_" + System.DateTime.Now.ToString());
-
- try
- {
- var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 81 } };
- var data = new JObject { { "GwId", gwId } };
- jObject.Add("Data", data);
- Gateway.Send(("RemoveEqOfGw"), jObject.ToString());
- }
- catch { }
-
-
- var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
- {
- await System.Threading.Tasks.Task.Delay(10);
- if (d != null)
- {
- break;
- }
- }
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
- {
- d = new RemoveGatewayDeviceListAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- }
- Gateway.Actions -= action;
- System.Console.WriteLine("RemoveEqOfGw_Actions 閫�鍑�" + System.DateTime.Now.ToString());
-
- return d;
- });
- }
-
- /// <summary>
- /// 绉婚櫎璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
- public RemoveGatewayDeviceListAllData removeGatewayDeviceListAllData;
- /// <summary>
- /// 绉婚櫎璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
- [System.Serializable]
- public class RemoveGatewayDeviceListAllData
- {
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
- /// <summary>
- /// 璁惧鍚嶇О淇敼
- /// </summary>
- public RemoveGatewayDeviceListData removeGatewayDeviceListData;
- }
-
- /// <summary>
- /// 浠庢�昏澶囧垪琛ㄤ腑绉婚櫎涓�涓綉鍏崇殑鎵�鏈夎妭鐐硅澶囷紙鐢ㄤ簬涓荤綉鍏筹級
- /// </summary>
- public RemoveGatewayDeviceListData removeGatewayDeviceListData;
- /// <summary>
- /// 浠庢�昏澶囧垪琛ㄤ腑绉婚櫎涓�涓綉鍏崇殑鎵�鏈夎妭鐐硅澶囷紙鐢ㄤ簬涓荤綉鍏筹級
- /// </summary>
- [System.Serializable]
- public class RemoveGatewayDeviceListData
- {
- /// <summary>
- /// 瑕佺Щ闄よ妭鐐硅澶囩殑缃戝叧id
- /// </summary>
- public string GwId;
- /// <summary>
- /// 琚垹闄よ澶囩殑鏁伴噺
- /// </summary>
- public int RemoveNum;
- }
-
#endregion
#region 璇嗗埆璁惧
@@ -1826,7 +1215,8 @@
/// <summary>
/// 璁惧灞炴�х姸鎬佷笂鎶�
/// </summary>
- public DeviceStatusReportData DeviceStatusReport = new DeviceStatusReportData { };
+ [Newtonsoft.Json.JsonIgnore]
+ public DeviceStatusReportData DeviceStatusReport = new DeviceStatusReportData();
/// <summary>
/// 璁惧灞炴�х姸鎬佷笂鎶�
/// </summary>
@@ -1891,8 +1281,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1906,7 +1295,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -1955,22 +1343,9 @@
/// <summary>
/// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
/// </summary>
- public SetWritableValueResponAllData setWritableValueResponAllData;
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class SetWritableValueResponAllData
+ public class SetWritableValueResponAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧鐗堟湰淇℃伅
/// </summary>
@@ -2001,10 +1376,6 @@
}
- /// <summary>
- /// 璁剧疆鍙啓灞炴�х殑鍊肩殑鏁版嵁
- /// </summary>
- public SetWritableValueData setWritableValueData;
/// <summary>
/// 璁剧疆鍙啓灞炴�х殑鍊肩殑鏁版嵁
/// </summary>
@@ -2081,8 +1452,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2096,22 +1466,21 @@
if (topic == gatewayID + "/" + "Cluster/OwnAttributes_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- gatewayTemp.clusterOwnAttributesResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ClusterOwnAttributesResponData>(jobject["Data"].ToString());
+ var clusterOwnAttributesResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClusterOwnAttributesResponData>(jobject["Data"].ToString());
var tempAttributes = Newtonsoft.Json.Linq.JArray.Parse(jobject["Data"]["Attribute"].ToString());
for (int m = 0; tempAttributes != null && m < tempAttributes.Count; m++)
{
var tempAttribute = tempAttributes[m];
- gatewayTemp.clusterOwnAttributesResponData.AttributeList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AttributeObj>(tempAttribute.ToString()));
+ clusterOwnAttributesResponData.AttributeList.Add(Newtonsoft.Json.JsonConvert.DeserializeObject<AttributeObj>(tempAttribute.ToString()));
}
- if (gatewayTemp.clusterOwnAttributesResponData == null)
+ if (clusterOwnAttributesResponData == null)
{
d = new ClusterOwnAttributesResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new ClusterOwnAttributesResponAllData { clusterOwnAttributesResponData = gatewayTemp.clusterOwnAttributesResponData };
+ d = new ClusterOwnAttributesResponAllData { clusterOwnAttributesResponData = clusterOwnAttributesResponData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -2150,32 +1519,15 @@
/// <summary>
/// 鍙戠幇灞炴��,缃戝叧鍙嶉淇℃伅
/// </summary>
- public ClusterOwnAttributesResponAllData clusterOwnAttributesResponAllData;
- /// <summary>
- /// 鍙戠幇灞炴��,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class ClusterOwnAttributesResponAllData
+ public class ClusterOwnAttributesResponAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧鐗堟湰淇℃伅
/// </summary>
public ClusterOwnAttributesResponData clusterOwnAttributesResponData;
}
- /// <summary>
- /// 鍙戠幇灞炴�ф暟鎹�
- /// </summary>
- public ClusterOwnAttributesResponData clusterOwnAttributesResponData;
[System.Serializable]
public class ClusterOwnAttributesResponData
{
@@ -2214,8 +1566,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2230,17 +1581,16 @@
if (topic == gatewayID + "/" + "Cluster/OwnCommand_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- gatewayTemp.clusterOwnCommandResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClusterOwnCommandResponData>(jobject["Data"].ToString());
+ var clusterOwnCommandResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClusterOwnCommandResponData>(jobject["Data"].ToString());
- if (gatewayTemp.clusterOwnCommandResponData == null)
+ if (clusterOwnCommandResponData == null)
{
d = new ClusterOwnCommandResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new ClusterOwnCommandResponAllData { clusterOwnCommandResponData = gatewayTemp.clusterOwnCommandResponData };
+ d = new ClusterOwnCommandResponAllData { clusterOwnCommandResponData = clusterOwnCommandResponData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2279,32 +1629,15 @@
/// <summary>
/// 璁惧鏌恈luster鎵�鏀寔鐨凜ommand鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
- public ClusterOwnCommandResponAllData clusterOwnCommandResponAllData;
- /// <summary>
- /// 璁惧鏌恈luster鎵�鏀寔鐨凜ommand鏁版嵁,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class ClusterOwnCommandResponAllData
+ public class ClusterOwnCommandResponAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戣澶囨煇cluster鎵�鏀寔鐨凜ommand鏁版嵁
/// </summary>
public ClusterOwnCommandResponData clusterOwnCommandResponData;
}
- /// <summary>
- /// 璁惧鏌恈luster鎵�鏀寔鐨凜ommand鏁版嵁
- /// </summary>
- public ClusterOwnCommandResponData clusterOwnCommandResponData;
/// <summary>
/// 璁惧鏌恈luster鎵�鏀寔鐨凜ommand鏁版嵁
/// </summary>
@@ -2342,8 +1675,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2358,16 +1690,15 @@
if (topic == gatewayID + "/" + "OTA/SetImage_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.oTASetImageData = Newtonsoft.Json.JsonConvert.DeserializeObject<OTASetImageData>(jobject["Data"].ToString());
+ var oTASetImageData = Newtonsoft.Json.JsonConvert.DeserializeObject<OTASetImageData>(jobject["Data"].ToString());
- if (gatewayTemp.oTASetImageData == null)
+ if (oTASetImageData == null)
{
d = new OTASetImageResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new OTASetImageResponseAllData { otaSetImageData = gatewayTemp.oTASetImageData };
+ d = new OTASetImageResponseAllData { otaSetImageData = oTASetImageData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2407,31 +1738,15 @@
/// <summary>
/// 璁惧杩涜OTA鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public OTASetImageResponseAllData otaSetImageResponseAllData;
- /// <summary>
- /// 璁惧杩涜OTA鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class OTASetImageResponseAllData
+ public class OTASetImageResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�
/// </summary>
public OTASetImageData otaSetImageData;
}
- /// <summary>
- /// 璁惧杩涜OTA鍗囩骇
- /// </summary>
- public OTASetImageData oTASetImageData;
+
[System.Serializable]
public class OTASetImageData
{
@@ -2505,8 +1820,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2521,16 +1835,15 @@
if (topic == gatewayID + "/" + "OTA/StartUpdate_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.startUpdateDeviceData = Newtonsoft.Json.JsonConvert.DeserializeObject<StartDeviceUpdateData>(jobject["Data"].ToString());
+ var startUpdateDeviceData = Newtonsoft.Json.JsonConvert.DeserializeObject<StartDeviceUpdateData>(jobject["Data"].ToString());
- if (gatewayTemp.startUpdateDeviceData == null)
+ if (startUpdateDeviceData == null)
{
d = new StartDeviceUpdateResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new StartDeviceUpdateResponseAllData { startUpdateDeviceData = gatewayTemp.startUpdateDeviceData };
+ d = new StartDeviceUpdateResponseAllData { startUpdateDeviceData = startUpdateDeviceData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2583,10 +1896,6 @@
/// <summary>
/// 鍚姩鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public StartDeviceUpdateResponseAllData startUpdateDeviceResponseAllData;
- /// <summary>
- /// 鍚姩鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
public class StartDeviceUpdateResponseAllData
{
@@ -2604,10 +1913,7 @@
/// </summary>
public StartDeviceUpdateData startUpdateDeviceData;
}
- /// <summary>
- /// 鍚姩鍗囩骇
- /// </summary>
- public StartDeviceUpdateData startUpdateDeviceData;
+
[System.Serializable]
public class StartDeviceUpdateData
{
@@ -2648,7 +1954,9 @@
/// <summary>
/// 鍚姩鍗囩骇
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public OTAScheduleResponData oTAScheduleResponData;
+
[System.Serializable]
public class OTAScheduleResponData
{
@@ -2669,10 +1977,6 @@
public int Percent = 999;
}
- /// <summary>
- /// 鍚姩鍗囩骇鐨勬暟鎹�
- /// </summary>
- public StartUpdateData startUpdateData;
[System.Serializable]
public class StartUpdateData
{
@@ -2702,8 +2006,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2718,16 +2021,15 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
d = new ClientDataPassthroughResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new ClientDataPassthroughResponseAllData { clientDataPassthroughResponseData = gatewayTemp.clientDataPassthroughResponseData };
+ d = new ClientDataPassthroughResponseAllData { clientDataPassthroughResponseData = clientDataPassthroughResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2767,22 +2069,9 @@
/// <summary>
/// 瀹㈡埛绔悜鑺傜偣璁惧閫忎紶鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public ClientDataPassthroughResponseAllData clientDataPassthroughResponseAllData;
- /// <summary>
- /// 瀹㈡埛绔悜鑺傜偣璁惧閫忎紶鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class ClientDataPassthroughResponseAllData
+ public class ClientDataPassthroughResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 瀹㈡埛绔悜鑺傜偣璁惧閫忎紶鏁版嵁
/// </summary>
@@ -2791,7 +2080,9 @@
/// <summary>
/// 瀹㈡埛绔悜鑺傜偣璁惧閫忎紶鏁版嵁
/// </summary>
- public ClientDataPassthroughResponseData clientDataPassthroughResponseData = new ClientDataPassthroughResponseData { };
+ [Newtonsoft.Json.JsonIgnore]
+ public ClientDataPassthroughResponseData clientDataPassthroughResponseData = new ClientDataPassthroughResponseData();
+
[System.Serializable]
public class ClientDataPassthroughResponseData
{
@@ -2804,31 +2095,15 @@
/// <summary>
/// 鍚敤鎴栧叧闂妭鐐硅澶囬�忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public OnZbDataPassthroughResponseAllData onZbDataPassthroughResponseAllData;
- /// <summary>
- /// 鍚敤鎴栧叧闂妭鐐硅澶囬�忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class OnZbDataPassthroughResponseAllData
+ public class OnZbDataPassthroughResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍚敤鎴栧叧闂妭鐐硅澶囬�忎紶鏁版嵁涓婁紶鎺ュ彛
/// </summary>
public OnZbDataPassthroughData onZbDataPassthroughData;
}
- /// <summary>
- /// 鍚敤鎴栧叧闂妭鐐硅澶囬�忎紶鏁版嵁涓婁紶鎺ュ彛
- /// </summary>
- public OnZbDataPassthroughData onZbDataPassthroughData;
+
[System.Serializable]
public class OnZbDataPassthroughData
{
@@ -2863,8 +2138,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2878,16 +2152,15 @@
if (topic == gatewayID + "/" + "DownloadFile_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.downloadFileResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DownloadFileResponData>(jobject["Data"].ToString());
+ var downloadFileResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DownloadFileResponData>(jobject["Data"].ToString());
- if (gatewayTemp.downloadFileResponData == null)
+ if (downloadFileResponData == null)
{
d = new DownloadFileResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new DownloadFileResponAllData { downloadFileResponData = gatewayTemp.downloadFileResponData };
+ d = new DownloadFileResponAllData { downloadFileResponData = downloadFileResponData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2928,35 +2201,19 @@
});
}
- /// <summary>
- /// 缃戝叧绯荤粺鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
- public DownloadFileResponAllData downloadFileResponAllData;
+
/// <summary>
/// 缃戝叧绯荤粺鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
[System.Serializable]
- public class DownloadFileResponAllData
+ public class DownloadFileResponAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 涓嬭浇浜戠鍥轰欢
/// </summary>
public DownloadFileResponData downloadFileResponData;
}
- /// <summary>
- /// 涓嬭浇浜戠鍥轰欢
- /// </summary>
- public DownloadFileResponData downloadFileResponData;
/// <summary>
/// 涓嬭浇浜戠鍥轰欢
/// </summary>
@@ -2980,6 +2237,7 @@
/// <summary>
/// 涓嬭浇杩涘害
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public DownloadFileProgressResponData downloadFileProgressResponData;
/// <summary>
/// 涓嬭浇杩涘害
@@ -3032,8 +2290,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -3048,16 +2305,15 @@
if (topic == gatewayID + "/" + "OTA/KillUpdate_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.killUpdateData = Newtonsoft.Json.JsonConvert.DeserializeObject<KillUpdateData>(jobject["Data"].ToString());
+ var killUpdateData = Newtonsoft.Json.JsonConvert.DeserializeObject<KillUpdateData>(jobject["Data"].ToString());
- if (gatewayTemp.killUpdateData == null)
+ if (killUpdateData == null)
{
d = new KillUpdateResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new KillUpdateResponseAllData { killUpdateData = gatewayTemp.killUpdateData };
+ d = new KillUpdateResponseAllData { killUpdateData = killUpdateData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -3095,31 +2351,15 @@
/// <summary>
/// 缁堟璁惧鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public KillUpdateResponseAllData killUpdateResponseAllData;
- /// <summary>
- /// 缁堟璁惧鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class KillUpdateResponseAllData
+ public class KillUpdateResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缁堟璁惧鍗囩骇
/// </summary>
public KillUpdateData killUpdateData;
}
- /// <summary>
- /// 缁堟璁惧鍗囩骇
- /// </summary>
- public KillUpdateData killUpdateData;
+
[System.Serializable]
public class KillUpdateData
{
@@ -3132,22 +2372,10 @@
#endregion
#region 绉佹湁鍗忚缃戝叧鍜岃澶囩殑榛樿鍥炲
- /// <summary>
- /// 绉佹湁鍗忚缃戝叧鍜岃澶囩殑榛樿鍥炲
- /// </summary>
- public ResponseAllData keyColorDataResponseAllData;
+
[System.Serializable]
- public class ResponseAllData
+ public class ResponseAllData : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鎸夐敭鎸囩ず鐏鑹蹭俊鎭�
/// </summary>
@@ -3171,5 +2399,27 @@
public int status = -1;
}
#endregion
+
+ #region 鈻� 璋冭瘯鎵撳嵃
+
+ /// <summary>
+ /// 璋冭瘯鏃舵墦寮�鎵撳嵃淇℃伅锛宼rue:鎵撳嵃锛宖alse:涓嶆墦鍗�
+ /// </summary>
+ /// <param name="msg">Message.</param>
+ /// <param name="flage">If set to <c>true</c> flage.</param>
+ public static void DebugPrintLog(string msg, bool flage = true)
+ {
+#if DEBUG
+ if (flage == true)
+ {
+ if (msg.Contains("DeviceStatusReport") == false)
+ {
+ System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
+ }
+ }
+#endif
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs
index 4badda8..9edb5f8 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DimmableLight.cs
@@ -12,6 +12,7 @@
/// <summary>
///浜害锛屾暣褰紝鍙栧�艰寖鍥达細0-254琛ㄧず0%-100%
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int Level = 0;
/// <summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
index 6a54df8..d893657 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/DoorLock.cs
@@ -41,21 +41,23 @@
/// ture:甯稿紑锛� false:鍏抽棴
/// </summary>
public bool IsDoorLockNormallyMode = false;
+ [Newtonsoft.Json.JsonIgnore]
public string LocalTempPassword = string.Empty;//鏈湴鐢熸垚鐨勪复鏃跺瘑鐮�
public Dictionary<string, bool> IsFreezeAccount = new Dictionary<string, bool> { };//鏄惁鍐荤粨瀛愯处鎴�
public Dictionary<string, bool> HasRemoteUnlockAccess = new Dictionary<string, bool> { };//鏄惁缁欏瓙璐︽埛鎷ユ湁杩滅▼寮�閿佺殑鏉′欢
public Dictionary<string, bool> IsFailedToGetDoorLockInfo = new Dictionary<string, bool> { };//鏄惁鑾峰彇闂ㄩ攣鏁版嵁澶辫触
+ [Newtonsoft.Json.JsonIgnore]
public string RemoteUnlockPassword = string.Empty;//杩滅▼寮�閿佸瘑鐮�
public static int RemoteUnlockCount = 5;//杩滅▼寮�閿佹鏁伴檺鍒�
public static int failedCount = 3;//杩滅▼寮�閿佸け璐ユ鏁�
- public static DateTime maxValue = DateTime.MaxValue;
public static DateTime minValue = DateTime.MinValue;
#region 涓存椂瀵嗙爜淇℃伅
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public TempPasswordObject tempPasswordObject;
/// <summary>
/// 涓存椂瀵嗙爜鏈湴瀵硅薄
@@ -684,6 +686,7 @@
/// <summary>
/// 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public DoorLockOperatingEventNotificationCommand doorLockOperatingEventNotificationCommand;
/// <summary>
/// 闂ㄩ攣鎿嶄綔浜嬩欢閫氱煡
@@ -927,13 +930,14 @@
/// Unlock鍛戒护锛歟rror,invalid schedule浜嬩欢
/// </summary>
UnlockInvalidScheduleEvent = 6,
- }
+ }
#endregion
-
+
#region 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
/// <summary>
/// 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public DoorLockProgrammingEventNotificationCommand doorLockProgrammingEventNotificationCommand;
/// <summary>
/// 闂ㄩ攣缂栫▼浜嬩欢閫氱煡
@@ -1003,8 +1007,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1018,7 +1021,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -1064,50 +1066,6 @@
});
}
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public SetWritableValueResponAllData setWritableValueResponAllData;
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
- [System.Serializable]
- public class SetWritableValueResponAllData
- {
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅
- /// </summary>
- public SetWritableValueResponData setWritableValueResponData;
- }
-
- /// <summary>
- /// 璁剧疆鍙啓灞炴�х殑鍊肩殑鏁版嵁
- /// </summary>
- [System.Serializable]
- public class SetWritableValueResponData
- {
- /// <summary>
- /// 閰嶇疆灞炴�ф墍鍦ㄧ殑cluster
- /// </summary>
- public int Cluster;
- /// <summary>
- /// 0锛氶厤缃垚鍔燂紙鑻ラ厤缃垚鍔燂紝涓嬮潰鐨凙ttributeId瀛楁涓嶅瓨鍦級
- ///<para>134锛氫笉鏀寔璇ュ睘鎬�</para>
- ///<para>135锛氭棤鏁堢殑灞炴�у��</para>
- ///<para>141锛氭棤鏁堢殑鏁版嵁绫诲瀷</para>
- /// </summary>
- public int Status;
-
- }
#endregion
#endregion
@@ -1135,8 +1093,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1150,18 +1107,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1378,7 +1334,6 @@
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
/// </summary>
- public DefaultControlResponseAllData defaultControlResponseAllData;
[System.Serializable]
public class DefaultControlResponseAllData
{
@@ -1476,8 +1431,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1491,18 +1445,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new VerifyPasswordResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 12)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1582,7 +1535,6 @@
/// <summary>
/// 鐢ㄦ埛绠＄悊鍙戦�佹暟鎹洖澶�
/// </summary>
- public VerifyPasswordResponseAllData verifyPasswordResponseAllData;
[System.Serializable]
public class VerifyPasswordResponseAllData
{
@@ -1626,8 +1578,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1652,18 +1603,17 @@
}
else if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new RemoteResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1756,7 +1706,6 @@
/// <summary>
/// 杩滅▼鍥炲鏁版嵁
/// </summary>
- public RemoteResponseAllData remoteResponseAllData;
[System.Serializable]
public class RemoteResponseAllData
{
@@ -1821,8 +1770,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1836,18 +1784,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new TempPasswordResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1949,7 +1896,6 @@
/// <summary>
/// 涓存椂瀵嗙爜鍥炲鏁版嵁
/// </summary>
- public TempPasswordResponseAllData tempPasswordResponseAllData;
[System.Serializable]
public class TempPasswordResponseAllData
{
@@ -2034,8 +1980,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2050,18 +1995,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new KeyPasswordInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 20)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2376,8 +2320,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2391,18 +2334,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new VolumeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 14)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2476,8 +2418,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2491,18 +2432,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2610,7 +2550,6 @@
/// <summary>
/// 闊抽噺鍥炲鏁版嵁
/// </summary>
- public VolumeResponseAllData volumeResponseAllData;
[System.Serializable]
public class VolumeResponseAllData
{
@@ -2673,8 +2612,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2688,18 +2626,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new OpenModeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 12)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2771,8 +2708,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2786,18 +2722,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new DefaultControlResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2899,7 +2834,6 @@
/// <summary>
/// 甯稿紑妯″紡聽鍥炲鏁版嵁
/// </summary>
- public OpenModeResponseAllData openModeResponseAllData;
[System.Serializable]
public class OpenModeResponseAllData
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
index b90f787..25d2391 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/FreshAir.cs
@@ -20,6 +20,7 @@
/// <para>6:Smart</para>
/// <para>15:鎵嬪姩</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanMode = 0;
/// <summary>
/// 椋庨�熸。浣�
@@ -27,12 +28,14 @@
/// <para>2:涓</para>
/// <para>3:楂橀 </para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanSpeed = 0;
/// <summary>
/// 椋庢墖鐘舵��
/// <para>0:鍏抽棴 </para>
/// <para>4:鎵撳紑 </para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int currentFanStatus = 0;
/// <summary>
@@ -109,8 +112,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -124,7 +126,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
index 65da172..726efe2 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/IASZone.cs
@@ -11,16 +11,6 @@
{
this.Type = DeviceType.IASZone;
}
- /// <summary>
- /// 鍏夋劅绛夌骇涓暟锛圠ux鑳藉姏锛�
- /// <para>鏈夊嚑涓瓑绾у氨鏄剧ず鍑犱釜鍒诲害</para>
- /// </summary>
- public int LightLevelCount = -1;
-
- /// <summary>
- /// 褰撳墠Lux鍊�
- /// </summary>
- public int PirLux = -1;
#region IAS瀹夐槻淇℃伅涓婃姤.
/// <summary>
@@ -130,8 +120,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -146,18 +135,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new PirLightAbilitySizeInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 12)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -165,7 +153,6 @@
{
var cou = data[10].ToString() + data[11].ToString();
int countTemp = Convert.ToInt32(cou, 16);
- LightLevelCount = countTemp;
result = new PirLightAbilitySizeInfo { LightLevelCount = countTemp };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0303_{ topic}");
}
@@ -235,19 +222,9 @@
/// <summary>
/// PIR閰嶇疆鍙傛暟鍥炲
/// </summary>
- public PirLightAbilitySizeInfo lightLevelSizeInfo;
[System.Serializable]
- public class PirLightAbilitySizeInfo
+ public class PirLightAbilitySizeInfo : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍏夋劅绛夌骇涓暟锛圠ux鑳藉姏锛�
/// <para>鏈夊嚑涓瓑绾у氨鏄剧ず鍑犱釜鍒诲害</para>
@@ -278,8 +255,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -294,18 +270,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -362,29 +337,15 @@
/// <summary>
/// PIR閰嶇疆鍙傛暟鍥炲
/// </summary>
- public ParamatesInfo paramatesInfo;
[System.Serializable]
- public class ParamatesInfo
+ public class ParamatesInfo : ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// PIR閰嶇疆鍙傛暟
/// </summary>
public ConfigureParamates configureParamates;
}
- /// <summary>
- /// PIR閰嶇疆鍙傛暟
- /// </summary>
- public ConfigureParamates configureParamates;
/// <summary>
/// PIR閰嶇疆鍙傛暟
/// </summary>
@@ -626,8 +587,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -642,18 +602,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ParamatesInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 34)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -691,7 +650,6 @@
tempD.dimmerOffTime = Convert.ToInt32(data[30].ToString() + data[31].ToString(), 16);
tempD.dimmerLevel = Convert.ToInt32(data[32].ToString() + data[33].ToString(), 16);
- configureParamates = tempD;
result = new ParamatesInfo { configureParamates = tempD };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0301_{ topic}");
@@ -782,8 +740,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -798,18 +755,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new PirLuxAbilitySizeInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 12)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -817,7 +773,6 @@
{
var cou = data[10].ToString() + data[11].ToString();
int countTemp = Convert.ToInt32(cou, 16);
- PirLux = countTemp;
result = new PirLuxAbilitySizeInfo { pirLux = countTemp };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0303_{ topic}");
}
@@ -886,7 +841,6 @@
/// <summary>
/// PIR閰嶇疆鍙傛暟鍥炲
/// </summary>
- public PirLuxAbilitySizeInfo pirLuxAbilitySizeInfo;
[System.Serializable]
public class PirLuxAbilitySizeInfo
{
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs
index 6085d62..3a26cac 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/LigthtBase.cs
@@ -9,20 +9,8 @@
/// <summary>
/// 寮�鍏夌姸鎬�:0=鍏�,1=寮�,
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int OnOffStatus = 0;
- //{
- // get{
- // if (DeviceStatusReport != null && DeviceStatusReport.CluterID == 6)
- // {
- // var attriButeList = DeviceStatusReport.AttriBute;
- // foreach (var attriBute1 in attriButeList)
- // {
- // return attriBute1.AttriButeData;
- // }
- // }
- // return 0;
- // }
- //}
#region 寮�鍏�
///<summary >
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/LogicBase.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/LogicBase.cs
deleted file mode 100755
index 539af55..0000000
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/LogicBase.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-锘縰sing System;
-using Newtonsoft.Json.Linq;
-
-namespace ZigBee.Ios.Device
-{
- [System.Serializable]
- public class LogicBase
- {
- /// <summary>
- /// 鏄惁鏄柊鍏ョ綉璁惧
- /// 0锛氭棫璁惧鍏ョ綉
- ///1锛氭柊璁惧鍏ョ綉
- /// </summary>
- public int IsNewDev;
-
- /// <summary>
- /// 寮�鍏夌姸鎬�
- /// </summary>
- public bool Power;
-
- /// <summary>
- /// 褰撳墠灞炴�х殑鏁版嵁
- /// </summary>
- public int CurrentAttriButeData = 0;
-
- }
-}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
index edd263e..360323a 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Panel.cs
@@ -18,61 +18,23 @@
/// 鎸夐敭妯″紡锛堢鏈夊姛鑳斤級
/// </summary>
public int panelMode = 65535;
- /// <summary>
- ///鎸夐敭寮�鐘舵�侊紙鎸囩ず锛変寒搴�
- /// </summary>
- public int panelDirectionsLevel = -1;
-
- /// <summary>
- /// 鎸夐敭鍏崇姸鎬侊紙鑳屽厜锛変寒搴�
- /// </summary>
- public int panelBacklightLevel = -1;
/// <summary>
/// 褰撳墠閫夋嫨妯″紡
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string currentKeySelectModeText = "";
/// <summary>
/// 褰撳墠閫夋嫨鐨勬ゼ灞侷D
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string currentSelectFloorId = string.Empty;
/// <summary>
/// 褰撳墠閫夋嫨鐨勬埧闂碔D銆愭柊椋庨潰鏉裤��
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string currentSelectRoomId = string.Empty;
- /// <summary>
- /// 褰撳墠寮�鍏虫ā寮�
- /// </summary>
- public string CurrentSwitchMode = "";
- /// <summary>
- /// 褰撳墠灞炴�фā寮�
- /// </summary>
- public int currentClusterID;
- /// <summary>
- /// 褰撳墠璋冨厜妯″紡
- /// </summary>
- public string CurrentDimmerMode = "";
-
- /// <summary>
- /// 褰撳墠閬槼妯″紡
- /// </summary>
- public string CurrentCurtainMode = "";
-
- /// <summary>
- /// 褰撳墠鎴块棿ID
- /// </summary>
- public string RoomId = "";
-
- /// <summary>
- /// 褰撳墠閫変腑鐨勫満鏅疘D
- /// </summary>
- public string curSelectSceneID = "";
-
- /// <summary>
- /// 鏈湴妤煎眰鎴块棿缁戝畾鍒楄〃
- /// </summary>
- public Dictionary<int, FloorRoomBindObj> FloorRoomBindObjList = new Dictionary<int, FloorRoomBindObj> { };
/// <summary>
/// 缁戝畾鐨勬ゼ灞傛埧闂翠俊鎭�
/// </summary>
@@ -113,12 +75,8 @@
// <summary>
/// 鎸夐敭涓缁戝畾鐨勭洰鏍囧垪琛�
/// </summary>
- public System.Collections.Generic.List<BindListResponseObj> bindList = new System.Collections.Generic.List<BindListResponseObj> { };
-
- /// <summary>
- /// 鎸夐敭鏀寔鐨勭鏈夋ā寮忓垪琛�
- /// </summary>
- public System.Collections.Generic.Dictionary<int, string> priDeviceModeFunList = new System.Collections.Generic.Dictionary<int, string> { };
+ [Newtonsoft.Json.JsonIgnore]
+ public List<BindListResponseObj> bindList = new List<BindListResponseObj>();
/// <summary>
/// 绉佹湁鍔熻兘绫�
@@ -193,8 +151,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -209,18 +166,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new PanelPrivateFunctionsResponseAllInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length > 12)
{
@@ -316,7 +272,6 @@
}
break;
}
- panelPrivateFunctionsResponseInfo = tempD;
result = new PanelPrivateFunctionsResponseAllInfo { panelPrivateFunctionsResponseInfo = tempD };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0003_{topic}");
}
@@ -363,17 +318,8 @@
/// PIR閰嶇疆鍙傛暟鍥炲
/// </summary>
[System.Serializable]
- public class PanelPrivateFunctionsResponseAllInfo
+ public class PanelPrivateFunctionsResponseAllInfo:ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍏夋劅绛夌骇涓暟锛圠ux鑳藉姏锛�
/// <para>鏈夊嚑涓瓑绾у氨鏄剧ず鍑犱釜鍒诲害</para>
@@ -384,7 +330,6 @@
/// <summary>
/// 閰嶇疆鍙傛暟鍥炲
/// </summary>
- public PanelPrivateFunctionsResponseInfo panelPrivateFunctionsResponseInfo;
[System.Serializable]
public class PanelPrivateFunctionsResponseInfo
{
@@ -717,8 +662,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -733,18 +677,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -896,8 +839,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -911,18 +853,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1123,10 +1064,6 @@
return data;
}
- /// <summary>
- /// 鎸夐敭鎸囩ず鐏鑹蹭俊鎭�
- /// </summary>
- public KeyColorData keyColorData;
// <summary>
/// 鎸夐敭鎸囩ず鐏鑹蹭俊鎭�
/// </summary>
@@ -1274,8 +1211,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1289,18 +1225,17 @@
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1427,8 +1362,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1443,18 +1377,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1601,8 +1534,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1617,18 +1549,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new ResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 16)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1738,8 +1669,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1754,18 +1684,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new KeyColorDataResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 24)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1829,7 +1758,6 @@
tempR.keyNum = KeyNum.Key15;
break;
}
- keyColorData = tempR;
result = new KeyColorDataResponseAllData { keyColorData = tempR };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0404_{ topic}");
}
@@ -1991,8 +1919,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2007,18 +1934,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new PanelSwitchLevelInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 14)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2026,8 +1952,6 @@
{
var level1 = Convert.ToInt32(data[10].ToString() + data[11].ToString(), 16);
var level2 = Convert.ToInt32(data[12].ToString() + data[13].ToString(), 16);
- panelDirectionsLevel = level1;
- panelBacklightLevel = level2;
result = new PanelSwitchLevelInfo { panelDirectionsLevel = level1, panelBacklightLevel = level2 };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0406_{ topic}");
}
@@ -2142,8 +2066,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2158,18 +2081,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new PanelSwitchLevelResponInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 18)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2186,7 +2108,6 @@
}
tempR.time = Convert.ToInt32(data[14].ToString() + data[15].ToString() + data[12].ToString() + data[13].ToString(), 16);
tempR.level = Convert.ToInt32(data[16].ToString() + data[17].ToString(), 16);
- panelSaveEnergyModeInfo = tempR;
result = new PanelSwitchLevelResponInfo { panelSaveEnergyModeInfo = tempR };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0408_{ topic}");
}
@@ -2275,10 +2196,6 @@
}
/// <summary>
- /// 鎸夐敭鑺傝兘妯″紡淇℃伅
- /// </summary>
- public PanelSaveEnergyModeInfo panelSaveEnergyModeInfo;
- /// <summary>
/// 鑾峰彇鎸夐敭鑺傝兘妯″紡閰嶇疆鐘舵�佹暟鎹�
/// </summary>
[System.Serializable]
@@ -2321,8 +2238,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2337,18 +2253,17 @@
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new PanelProximitySensorResponInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 20)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -2365,7 +2280,6 @@
}
tempR.sensorDistance = Convert.ToInt32(data[14].ToString() + data[15].ToString() + data[12].ToString() + data[13].ToString(), 16);
tempR.sensorDelayTime = Convert.ToInt32(data[18].ToString() + data[19].ToString() + data[16].ToString() + data[17].ToString(), 16);
- panelProximitySensorInfo = tempR;
result = new PanelProximitySensorResponInfo { panelProximitySensorInfo = tempR };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_command:0408_{ topic}");
}
@@ -2453,10 +2367,6 @@
}
/// <summary>
- /// 鑾峰彇鎺ヨ繎浼犳劅閰嶇疆
- /// </summary>
- public PanelProximitySensorInfo panelProximitySensorInfo;
- /// <summary>
/// 鑾峰彇鎺ヨ繎浼犳劅閰嶇疆鏁版嵁
/// </summary>
[System.Serializable]
@@ -2502,8 +2412,7 @@
// if (topic == gatewayID + "/" + "Error_Respon")
// {
- // var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
// if (temp == null)
// {
@@ -2517,18 +2426,17 @@
// }
// if (topic == gatewayID + "/" + "ZbDataPassthrough")
// {
- // var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- // gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ // var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- // if (gatewayTemp.clientDataPassthroughResponseData == null)
+ // if (clientDataPassthroughResponseData == null)
// {
// result = new PanelSleepGroupResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
// }
// else
// {
- // if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ // if (clientDataPassthroughResponseData?.PassData != null)
// {
- // var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ // var data = clientDataPassthroughResponseData.PassData;
// if (data.Length == 14)
// {
// var tempR = new PanelSleepGroupResponseData();
@@ -2893,8 +2801,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2908,7 +2815,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -3064,8 +2970,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -3083,8 +2988,6 @@
var tempEpoint = jobject.Value<int>("Epoint");
var dataId = jobject.Value<int>("Data_ID");
- var lightSwitch = new Panel { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint, DataID = dataId };
- lightSwitch.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<Panel.DeviceStatusReportData>(jobject["Data"].ToString());
if ((DeviceType)(deviceID) == DeviceType.OnOffSwitch)
{
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<Panel.DeviceStatusReportData>(jobject["Data"].ToString());
@@ -3254,10 +3157,6 @@
public GetSceneInfo getSceneInfo;
}
- /// <summary>
- /// 鑾峰彇鍦烘櫙淇℃伅
- /// </summary>
- public GetSceneInfo sceneGetInfo;
/// <summary>
/// 鑾峰彇鍦烘櫙淇℃伅
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs
index 78f02ed..7a88bfd 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Rollershade.cs
@@ -17,72 +17,11 @@
/// WcdType=0锛氬嵎甯�
/// </summary>
public int WcdType = -1;
-
- /// <summary>
- ///绐楀笜褰撳墠楂樺害锛屽崟浣嶏細cm.
- /// </summary>
- public int WcdCurrentPositionLift = 0;
-
/// <summary>
/// 褰撳墠绐楀笜鎵�鍦ㄧ殑浣嶇疆(鐧惧垎姣�).
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int WcdCurrentPositionLiftPercentage = 0;
- //{
- // get
- // {
- // if (DeviceStatusReport.CluterID == 258)
- // {
- // var attriButeList = DeviceStatusReport.AttriBute;
- // foreach (var attriBute in attriButeList)
- // {
- // if (attriBute.AttributeId == 8)
- // {
- // return attriBute.AttriButeData;
- // }
- // }
- // }
- // return 0;
- // }
- //}
-
- /// <summary>
- /// 绐楀笜鍏ㄥ紑鎵�鍦ㄧ殑瑙掑害锛屽崟浣嶏細0.1掳
- /// </summary>
- public int WcdInstalledOpenLimitTilt = 0;
-
- /// <summary>
- /// 绐楀笜鍏ㄥ叧鎵�鍦ㄧ殑瑙掑害锛屽崟浣嶏細0.1掳
- /// </summary>
- public int WcdInstalledClosedLimitTilt = 0;
-
- /// <summary>
- /// 褰撳墠寮�鍚堝笜鐢垫満鏂瑰悜
- /// <para> (false:鐢垫満鏂瑰悜姝ｅ悜锛泃rue:鐢垫満鏂瑰悜鍙嶅悜锛�)</para> .
- /// </summary>
- public bool WcdCurrentDirection = false;
-
- /// <summary>
- /// 褰撳墠寮�鍚堝笜缁存姢妯″紡
- /// <para>fasle:鐢垫満杩愯浆姝ｅ父锛泃rue:鐢垫満鍦ㄧ淮淇ā寮忎笅杩愯锛�</para>
- /// </summary>
- public bool WcdCurrentMaintenance = false;
-
- /// <summary>
- /// 褰撳墠绐楀笜寮�鍚堝笜闄愪綅寮�锛堜笂锛夐檺浣�
- /// 娉ㄦ剰杩欓噷鍊兼槸缃戝叧杩斿洖鐨勫疄闄呭�硷紝UI涓婃樉绀虹殑鍊艰瀹為檯澶勭悊
- /// </summary>
- public int WcdCurrentWcdInstalOpenLimit = 0;
-
- /// <summary>
- /// 褰撳墠寮�鍚堝笜闄愪綅鍏筹紙涓嬶級闄愪綅
- /// 娉ㄦ剰杩欓噷鍊兼槸缃戝叧杩斿洖鐨勫疄闄呭�硷紝UI涓婃樉绀虹殑鍊艰瀹為檯澶勭悊
- /// </summary>
- public int WcdCurrentInstalCloseLimit = 0;
-
- /// <summary>
- /// 褰撳墠寮�鍚堝笜鎬荤殑闀垮害
- /// </summary>
- public int WcdCurrentLength = 0;
/// <summary>
/// 璇诲彇褰撳墠绐楀笜鐨勬ā寮�
@@ -325,8 +264,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -340,7 +278,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -415,8 +352,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -430,7 +366,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -505,8 +440,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -520,7 +454,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -613,8 +546,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -628,7 +560,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
@@ -712,8 +643,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -727,7 +657,6 @@
if (topic == gatewayID + "/" + "SetWritableValue_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetWritableValueResponData>(jobject["Data"].ToString());
if (tempData == null)
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
index 2c0df35..4c28218 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Safeguard.cs
@@ -23,7 +23,7 @@
/// </summary>
public int Time;
- /// <summary>
+ /// <summary>
/// 绛夊緟浠庣綉鍏虫帴鏀舵暟鎹殑鏃堕棿
/// </summary>
/// <value>The wait receive data time.</value>
@@ -35,7 +35,8 @@
if (mainGateway == null)
{
return 3000;
- }else if (mainGateway.IsVirtual)
+ }
+ else if (mainGateway.IsVirtual)
{
return 6000;
}
@@ -47,31 +48,8 @@
}
/// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- ErrorResponData errResponData;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- [System.Serializable]
- public class ErrorResponData
- {
- /// <summary>
- /// Error鍙傛暟鍚箟
- ///<para>1锛氱綉鍏虫棤娉曡В鏋愬懡浠ゆ暟鎹��</para>
- ///<para>2锛氬崗璋冨櫒姝ｅ湪鍗囩骇鎴栧浠�/鎭㈠鏁版嵁
- ///<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para>
- ///<para>4锛氬叾浠栭敊璇�</para>
- ///<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para>
- /// </summary>
- public int Error;
- }
-
- /// <summary>
/// 缃戝叧淇℃伅閿欒鍙嶉鍐呭
- /// </summary>
+ /// </summary>
static string ErrorMess(int err)
{
string message = "";
@@ -126,8 +104,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -135,28 +112,27 @@
}
else
{
- d = new AdminLoginResponAllData { errorResponData = temp , errorMessageBase = ErrorMess(temp.Error) };
+ d = new AdminLoginResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new AdminLoginResponAllData { };
if (temp == null)
{
- d .errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
if (temp.Error == 1)
{
- d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��" ;
+ d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
else if (temp.Error == 2)
{
- d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��" ;
+ d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
@@ -164,7 +140,6 @@
if (topic == gatewayID + "/" + "Security/AdminLogin_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (tempData == null)
{
@@ -182,10 +157,10 @@
try
{
- var bytes = new byte[32];
- var reamarkGwBytes = System.Text.Encoding.UTF8.GetBytes(password);
- System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 32 < reamarkGwBytes.Length ? 32 : reamarkGwBytes.Length);
- password = System.Text.Encoding.UTF8.GetString(bytes);
+ var bytes = new byte[32];
+ var reamarkGwBytes = System.Text.Encoding.UTF8.GetBytes(password);
+ System.Array.Copy(reamarkGwBytes, 0, bytes, 0, 32 < reamarkGwBytes.Length ? 32 : reamarkGwBytes.Length);
+ password = System.Text.Encoding.UTF8.GetString(bytes);
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
@@ -195,12 +170,12 @@
jObject.Add("Data", data);
mainGateway.Send("Security/AdminLogin", jObject.ToString());
}
- catch{}
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
await System.Threading.Tasks.Task.Delay(10);
- if (d!= null)
+ if (d != null)
{
break;
}
@@ -224,17 +199,8 @@
/// 绠＄悊鍛樺瘑鐮佺櫥闄嗚繑鍥炵殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AdminLoginResponAllData
+ public class AdminLoginResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 杩斿洖缁撴灉Result
/// <para>0锛氱櫥闄嗘垚鍔�</para>
@@ -277,12 +243,11 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
- d = new ChangeAdminPasswordResponseAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
+ d = new ChangeAdminPasswordResponseAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
}
else
{
@@ -292,14 +257,13 @@
if (topic == gatewayID + "/" + "Security/ChangeAdminPassword_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.changeAdminPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ChangeAdminPasswordResponseData>(jobject["Data"].ToString());
- if (security.changeAdminPasswordResponseData != null)
+ var changeAdminPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ChangeAdminPasswordResponseData>(jobject["Data"].ToString());
+ if (changeAdminPasswordResponseData != null)
{
- d = new ChangeAdminPasswordResponseAllData { changeAdminPasswordResponseData = security.changeAdminPasswordResponseData };
+ d = new ChangeAdminPasswordResponseAllData { changeAdminPasswordResponseData = changeAdminPasswordResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
@@ -324,7 +288,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/ChangeAdminPassword_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4023}
@@ -338,7 +303,7 @@
mainGateway.Send("Security/ChangeAdminPassword", jObject.ToString());
}
catch { }
-
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -367,17 +332,8 @@
/// 淇敼绠＄悊鍛樺瘑鐮佽繑鍥炵殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class ChangeAdminPasswordResponseAllData
+ public class ChangeAdminPasswordResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇敼绠＄悊鍛樺瘑鐮佽繑鍥炵殑鏁版嵁
/// </summary>
@@ -435,8 +391,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -450,29 +405,29 @@
if (topic == gatewayID + "/" + "Security/CatDelayTime_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.catDelayTimeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatDelayTimeResponseData>(jobject["Data"].ToString());
- if (security.catDelayTimeResponseData == null)
+ var catDelayTimeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatDelayTimeResponseData>(jobject["Data"].ToString());
+ if (catDelayTimeResponseData == null)
{
d = new CatDelayTimeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new CatDelayTimeResponseAllData { catDelayTimeResponseData = security.catDelayTimeResponseData };
+ d = new CatDelayTimeResponseAllData { catDelayTimeResponseData = catDelayTimeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/CatDelayTime_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4019}
};
mainGateway.Send("Security/CatDelayTime", jObject.ToString());
}
- catch{}
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -501,24 +456,15 @@
/// 鏌ョ湅寤舵椂鏃堕棿杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class CatDelayTimeResponseAllData
+ public class CatDelayTimeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅寤舵椂鏃堕棿杩斿洖鐨勬暟鎹�
/// </summary>
public CatDelayTimeResponseData catDelayTimeResponseData;
}
-
+
/// <summary>
/// 鏌ョ湅寤舵椂鏃堕棿杩斿洖鐨勬暟鎹�
/// </summary>
@@ -548,7 +494,7 @@
/// <para>goOutDelayTime:澶栧嚭寤舵椂鏃堕棿锛屽崟浣嶇鑼冨洿锛�0-65535</para>
/// <para>loginToken:鐧婚檰鏍囪瘑锛屾渶澶�32涓瓧绗︺�傜敱app鑷姩鐢熸垚鐨勫敮涓�鏍囪瘑銆傚鏋滅櫥闄嗘垚鍔燂紝缃戝叧灏嗚褰曡鏍囪瘑锛宎pp闇�瑕佺鐞嗗憳鏉冮檺鐨勬寚浠ら兘搴旇甯︽湁璇ユ爣璇嗭紝缃戝叧浼氭牴鎹鏍囪瘑鏉ュ垽鏂槸鍚︿负绠＄悊鍛樻搷浣滐紝濡傛灉鏍囪瘑閿欒锛屽皢杩斿洖鈥淪ecurity/Error_Respon鈥濅富棰樻暟鎹�� 銆�</para>
/// </summary>
- public static async System.Threading.Tasks.Task<SetDelayTimeResponseAllData> SetDelayTimeAsync(int entranceDelayTime,int goOutDelayTime,string loginToken)
+ public static async System.Threading.Tasks.Task<SetDelayTimeResponseAllData> SetDelayTimeAsync(int entranceDelayTime, int goOutDelayTime, string loginToken)
{
return await System.Threading.Tasks.Task.Run(async () =>
{
@@ -567,8 +513,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -583,15 +528,15 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new SetDelayTimeResponseAllData { };
if (temp == null)
{
- d .errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
- d .errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
if (temp.Error == 1)
{
d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
@@ -601,41 +546,42 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/SetDelayTime_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.setDelayTimeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetDelayTimeResponseData>(jobject["Data"].ToString());
- if (security.setDelayTimeResponseData == null)
+ var setDelayTimeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetDelayTimeResponseData>(jobject["Data"].ToString());
+ if (setDelayTimeResponseData == null)
{
d = new SetDelayTimeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new SetDelayTimeResponseAllData { setDelayTimeResponseData = security.setDelayTimeResponseData };
+ d = new SetDelayTimeResponseAllData { setDelayTimeResponseData = setDelayTimeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/SetDelayTime_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
- var jObject = new Newtonsoft.Json.Linq.JObject() {
+ try
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4020}
};
- var data = new JObject
+ var data = new JObject
{
{ "EntranceDelayTime", entranceDelayTime},
{ "GoOutDelayTime", goOutDelayTime},
{ "LoginToken", loginToken}
};
- jObject.Add("Data", data);
- mainGateway.Send("Security/SetDelayTime", jObject.ToString());
- }catch { }
+ jObject.Add("Data", data);
+ mainGateway.Send("Security/SetDelayTime", jObject.ToString());
+ }
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -664,17 +610,8 @@
/// 璁剧疆寤舵椂鏃堕棿杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class SetDelayTimeResponseAllData
+ public class SetDelayTimeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 璁剧疆寤舵椂鏃堕棿杩斿洖鐨勬暟鎹�
/// </summary>
@@ -714,7 +651,7 @@
{
return await System.Threading.Tasks.Task.Run(async () =>
{
- CatUserPasswordResponseAllData d =null;
+ CatUserPasswordResponseAllData d = null;
var mainGateway = ZbGateway.MainGateWay;
if (mainGateway == null)
{
@@ -729,8 +666,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -744,17 +680,16 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new CatUserPasswordResponseAllData { };
if (temp == null)
{
- d .errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
- if (temp.Error == 1)
+ if (temp.Error == 1)
{
d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
@@ -763,41 +698,42 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/CatUserPassword_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.catUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatUserPasswordResponseData>(jobject["Data"].ToString());
- if (security.catUserPasswordResponseData == null)
+ var catUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatUserPasswordResponseData>(jobject["Data"].ToString());
+ if (catUserPasswordResponseData == null)
{
d = new CatUserPasswordResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new CatUserPasswordResponseAllData { catUserPasswordResponseData = security.catUserPasswordResponseData };
+ d = new CatUserPasswordResponseAllData { catUserPasswordResponseData = catUserPasswordResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/CatUserPassword_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4024}
- };
+ };
var data = new JObject
{
{ "LoginToken", loginToken}
};
jObject.Add("Data", data);
- mainGateway.Send("Security/CatUserPassword", jObject.ToString());
- }
- catch {
- }
+ mainGateway.Send("Security/CatUserPassword", jObject.ToString());
+ }
+ catch
+ {
+ }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -826,17 +762,8 @@
/// 鏌ョ湅鐢ㄦ埛瀵嗙爜鍜岃儊杩瘑鐮佽繑鍥炵殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class CatUserPasswordResponseAllData
+ public class CatUserPasswordResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅鐢ㄦ埛瀵嗙爜鍜岃儊杩瘑鐮佽繑鍥炵殑鏁版嵁
/// </summary>
@@ -912,8 +839,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -928,11 +854,11 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new SetUserPasswordResponseAllData { };
if (temp == null)
{
- d .errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
@@ -945,20 +871,19 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/SetUserPassword_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.setUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetUserPasswordResponseData>(jobject["Data"].ToString());
- if (security.setUserPasswordResponseData != null)
+ var setUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetUserPasswordResponseData>(jobject["Data"].ToString());
+ if (setUserPasswordResponseData != null)
{
- d = new SetUserPasswordResponseAllData { setUserPasswordResponseData = security.setUserPasswordResponseData };
+ d = new SetUserPasswordResponseAllData { setUserPasswordResponseData = setUserPasswordResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
@@ -975,7 +900,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/SetUserPassword_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4025}
@@ -990,8 +916,9 @@
jObject.Add("Data", data);
mainGateway.Send("Security/SetUserPassword", jObject.ToString());
}
- catch{
- }
+ catch
+ {
+ }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -1039,8 +966,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1055,7 +981,7 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new SetUserPasswordResponseAllData { };
if (temp == null)
{
@@ -1077,14 +1003,13 @@
if (topic == gatewayID + "/" + "Security/AddPassWordTips_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.setUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetUserPasswordResponseData>(jobject["Data"].ToString());
- if (security.setUserPasswordResponseData != null)
+ var setUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetUserPasswordResponseData>(jobject["Data"].ToString());
+ if (setUserPasswordResponseData != null)
{
- d = new SetUserPasswordResponseAllData { setUserPasswordResponseData = security.setUserPasswordResponseData };
+ d = new SetUserPasswordResponseAllData { setUserPasswordResponseData = setUserPasswordResponseData };
}
}
else
@@ -1143,17 +1068,8 @@
/// 鏂板鎴栭噸璁剧敤鎴峰瘑鐮佽繑鍥炵殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class SetUserPasswordResponseAllData
+ public class SetUserPasswordResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇敼绠＄悊鍛樺瘑鐮佽繑鍥炵殑鏁版嵁
/// </summary>
@@ -1198,7 +1114,7 @@
/// 涓�0鏃讹紝鑷姩鍒嗛厤鏂扮殑鐢ㄦ埛id銆備负5鏃讹紝鍒欎慨鏀硅儊杩瘑鐮併�傚彇鍊艰寖鍥�0-5銆�</para>
/// <para>loginToken:鐧婚檰鏍囪瘑锛屾渶澶�32涓瓧绗︺�傜敱app鑷姩鐢熸垚鐨勫敮涓�鏍囪瘑銆備笌绠＄悊鍛樼櫥闄嗘寚浠ょ殑鈥淟oginToken鈥濅竴鑷达紝鍚﹀垯灏嗚繑鍥炩�淪ecurity/Error_Respon鈥濋敊璇��</para>
/// </summary>
- public static async System.Threading.Tasks.Task<DelUserPasswordResponseAllData> DelUserPasswordAsync(int userId,string loginToken)
+ public static async System.Threading.Tasks.Task<DelUserPasswordResponseAllData> DelUserPasswordAsync(int userId, string loginToken)
{
return await System.Threading.Tasks.Task.Run(async () =>
{
@@ -1217,8 +1133,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1231,16 +1146,15 @@
}
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new DelUserPasswordResponseAllData { };
if (temp == null)
{
- d .errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
- {
+ {
if (temp.Error == 1)
{
d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
@@ -1255,11 +1169,10 @@
}
if (topic == gatewayID + "/" + "Security/DelUserPassword_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.delUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelUserPasswordResponseData>(jobject["Data"].ToString());
- if (security.delUserPasswordResponseData != null)
+ var delUserPasswordResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelUserPasswordResponseData>(jobject["Data"].ToString());
+ if (delUserPasswordResponseData != null)
{
- d = new DelUserPasswordResponseAllData { delUserPasswordResponseData = security.delUserPasswordResponseData };
+ d = new DelUserPasswordResponseAllData { delUserPasswordResponseData = delUserPasswordResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
@@ -1273,7 +1186,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/DelUserPassword_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4026}
@@ -1286,7 +1200,7 @@
jObject.Add("Data", data);
mainGateway.Send("Security/DelUserPassword", jObject.ToString());
}
- catch{}
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -1315,17 +1229,8 @@
/// 鍒犻櫎鐢ㄦ埛瀵嗙爜杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class DelUserPasswordResponseAllData
+ public class DelUserPasswordResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒犻櫎鐢ㄦ埛瀵嗙爜杩斿洖鐨勬暟鎹�
/// </summary>
@@ -1381,7 +1286,7 @@
// if (topic == gatewayID + "/" + "Error_Respon")
// {
// var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
// if (temp == null)
// {
@@ -1607,67 +1512,67 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
d = new AddDeviceToZoneResponseAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
+ }
else
{
d = new AddDeviceToZoneResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
-
+
}
}
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new AddDeviceToZoneResponseAllData { };
if (temp == null)
{
- d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
if (temp.Error == 1)
{
- d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��" ;
+ d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
else if (temp.Error == 2)
{
- d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��" ;
+ d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp ;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/AddEqToZone_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
-
+
if (result == 0)
{
- security.addDeviceToZoneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddDeviceToZoneResponseData>(jobject["Data"].ToString());
- if(security.addDeviceToZoneResponseData!=null){
- d = new AddDeviceToZoneResponseAllData { addDeviceToPartResponseData = security.addDeviceToZoneResponseData };
- }
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
+ var addDeviceToZoneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddDeviceToZoneResponseData>(jobject["Data"].ToString());
+ if (addDeviceToZoneResponseData != null)
+ {
+ d = new AddDeviceToZoneResponseAllData { addDeviceToPartResponseData = addDeviceToZoneResponseData };
+ }
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
{
d = new AddDeviceToZoneResponseAllData { errorMessageBase = "娣诲姞澶辫触" };
- }
+ }
}
};
mainGateway.Actions += action;
System.Console.WriteLine($"Security/AddEqToZone_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
+ try
+ {
if (addDeviceToZoneData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4003 } };
@@ -1692,7 +1597,8 @@
mainGateway.Send(("Security/AddEqToZone_Actions 鍚姩"), jObject.ToString());
}
}
- catch {
+ catch
+ {
}
var dateTime = DateTime.Now;
@@ -1724,17 +1630,8 @@
/// 璁惧鍔犲叆闃插尯鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AddDeviceToZoneResponseAllData
+ public class AddDeviceToZoneResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 璁惧鍔犲叆闃插尯鐨勮繑鍥炴暟鎹�
/// </summary>
@@ -1891,8 +1788,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1907,7 +1803,7 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new AddNewModeResponseAllData { };
if (temp == null)
@@ -1932,17 +1828,16 @@
if (topic == gatewayID + "/" + "Security/AddNewMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.addNewModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddNewModeResponseData>(jobject["Data"].ToString());
- if (security.addNewModeResponseData != null)
+ var addNewModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddNewModeResponseData>(jobject["Data"].ToString());
+ if (addNewModeResponseData != null)
{
- d = new AddNewModeResponseAllData { addNewModeResponseData = security.addNewModeResponseData };
+ d = new AddNewModeResponseAllData { addNewModeResponseData = addNewModeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- }
+ }
}
else
{
@@ -1952,7 +1847,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/AddNewMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
if (addNewModeData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4004 } };
@@ -1967,7 +1863,7 @@
mainGateway.Send(("Security/AddNewMode"), jObject.ToString());
}
}
- catch {}
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -1977,9 +1873,9 @@
break;
}
}
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime )
+ if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- d = new AddNewModeResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new AddNewModeResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
@@ -1997,17 +1893,8 @@
/// 鏂板缓鎴栦慨鏀瑰竷闃叉ā寮忚繑鍥炵殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AddNewModeResponseAllData
+ public class AddNewModeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
///鏂板缓鎴栦慨鏀瑰竷闃叉ā寮忚繑鍥炵殑鏁版嵁
/// </summary>
@@ -2040,14 +1927,14 @@
/// <summary>
/// 甯冮槻妯″紡鍚嶇О 锛屾渶澶�32涓瓧绗︺��
/// </summary>
- public string ModeName;
+ public string ModeName;
/// <summary>
/// 鍏佽澶辫兘銆�
///<para>0锛氫笉鍏佽澶辫兘銆�</para>
///<para>1锛氬厑璁稿け鑳�</para>
/// </summary>
- public int AllowDisable;
+ public int AllowDisable;
}
/// <summary>
@@ -2071,7 +1958,7 @@
/// 甯冮槻妯″紡鍚嶇О 锛屾渶澶�32涓瓧绗︺��
///<para>涓嶉渶瑕佷慨鏀瑰彲蹇界暐璇ュ瓧娈点��</para>
/// </summary>
- public string ModeName;
+ public string ModeName;
/// <summary>
/// 鍏佽澶辫兘銆�
@@ -2111,8 +1998,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2121,13 +2007,12 @@
else
{
d = new ZoneJoinModeResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
+ }
}
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new ZoneJoinModeResponseAllData { };
if (temp == null)
@@ -2152,15 +2037,14 @@
if (topic == gatewayID + "/" + "Security/ZoneJoinMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
var modeId = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["ModeId"].ToString());
if (result == 0)
{
- security.zoneJoinModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZoneJoinModeResponseData>(jobject["Data"].ToString());
- if (security.zoneJoinModeResponseData != null)
+ var zoneJoinModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZoneJoinModeResponseData>(jobject["Data"].ToString());
+ if (zoneJoinModeResponseData != null)
{
- d = new ZoneJoinModeResponseAllData { zoneJoinModeResponseData = security.zoneJoinModeResponseData };
+ d = new ZoneJoinModeResponseAllData { zoneJoinModeResponseData = zoneJoinModeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2177,7 +2061,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/ZoneJoinMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
if (zoneJoinModeData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4005 } };
@@ -2199,8 +2084,8 @@
mainGateway.Send(("Security/ZoneJoinMode"), jObject.ToString());
}
}
- catch{}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -2230,17 +2115,8 @@
/// 闃插尯鍔犲叆甯冮槻妯″紡杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class ZoneJoinModeResponseAllData
+ public class ZoneJoinModeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
///闃插尯鍔犲叆甯冮槻妯″紡杩斿洖鐨勬暟鎹�
/// </summary>
@@ -2288,7 +2164,7 @@
///<para>2锛氬け璐ワ紝闃插尯宸插湪妯″紡涓瓨鍦�</para>
///<para>3锛氬け璐ワ紝闃插尯涓�24灏忔椂锛堥潤闊筹級闃插尯绫诲瀷銆�</para>
/// </summary>
- public int Status=999;
+ public int Status = 999;
/// <summary>
/// 闃插尯ID
/// </summary>
@@ -2357,8 +2233,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2372,8 +2247,7 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new RemoveZoneFromModeResponseAllData { };
if (temp == null)
@@ -2398,16 +2272,15 @@
if (topic == gatewayID + "/" + "Security/RemoveZoneFromMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
var modeId = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["ModeId"].ToString());
if (result == 0)
{
- security.removeZoneFromModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveZoneFromModeResponseData>(jobject["Data"].ToString());
- if (security.removeZoneFromModeResponseData != null)
+ var removeZoneFromModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveZoneFromModeResponseData>(jobject["Data"].ToString());
+ if (removeZoneFromModeResponseData != null)
{
- d = new RemoveZoneFromModeResponseAllData { removeZoneFromModeResponseData = security.removeZoneFromModeResponseData };
+ d = new RemoveZoneFromModeResponseAllData { removeZoneFromModeResponseData = removeZoneFromModeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -2423,7 +2296,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/RemoveZoneFromMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
if (removeZoneFromModeData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4006 } };
@@ -2476,17 +2350,8 @@
/// 浠庡竷闃叉ā寮忎腑绉婚櫎闃插尯杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class RemoveZoneFromModeResponseAllData
+ public class RemoveZoneFromModeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
///浠庡竷闃叉ā寮忎腑绉婚櫎闃插尯杩斿洖鐨勬暟鎹�
/// </summary>
@@ -2589,8 +2454,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2604,8 +2468,7 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new AddModeActonResponAllData { };
if (temp == null)
@@ -2631,23 +2494,22 @@
if (topic == gatewayID + "/" + "Security/AddModeActon_Respon")
{
dateTime = DateTime.Now;
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
var modeId = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["ModeId"].ToString());
var actionType = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["ActionType"].ToString());
if (result == 0)
{
- security.addModeActonResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddModeActonResponData>(jobject["Data"].ToString());
- if (security.addModeActonResponData != null)
+ var addModeActonResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddModeActonResponData>(jobject["Data"].ToString());
+ if (addModeActonResponData != null)
{
- d = new AddModeActonResponAllData { addModeActonResponData = security.addModeActonResponData };
+ d = new AddModeActonResponAllData { addModeActonResponData = addModeActonResponData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
else
{
- d = new AddModeActonResponAllData {};
+ d = new AddModeActonResponAllData { };
var r = new AddModeActonResponData();
r.Result = result;
r.ModeId = modeId;
@@ -2658,53 +2520,54 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/AddModeActon_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
- if (addModeActonData != null)
+ try
{
- var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4007 } };
- var acList = new JArray { };
- foreach (var act in addModeActonData.Actions)
+ if (addModeActonData != null)
{
- if (act.Type == 0)
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4007 } };
+ var acList = new JArray { };
+ foreach (var act in addModeActonData.Actions)
{
- var taskList = new JArray { };
- foreach (var taskInfo in act.TaskList)
+ if (act.Type == 0)
{
- var tInfo = new JObject{
+ var taskList = new JArray { };
+ foreach (var taskInfo in act.TaskList)
+ {
+ var tInfo = new JObject{
{ "TaskType", taskInfo.TaskType},
{ "Data1", taskInfo.Data1},
{ "Data2",taskInfo.Data2}
};
- taskList.Add(tInfo);
- }
+ taskList.Add(tInfo);
+ }
- var a = new JObject {
+ var a = new JObject {
{ "Type",act.Type},
{ "DeviceAddr", act.DeviceAddr} ,
{ "Epoint",act.Epoint} ,
{ "TaskList", taskList}
};
- acList.Add(a);
- }
- else if (act.Type == 1)
- {
- var b = new JObject {
+ acList.Add(a);
+ }
+ else if (act.Type == 1)
+ {
+ var b = new JObject {
{ "Type",act.Type},
{ "ScenesId", act.ScenesId}
};
- acList.Add(b);
+ acList.Add(b);
+ }
}
- }
- var data = new JObject {
+ var data = new JObject {
{ "ModeId",addModeActonData.ModeId},
{ "ActionType", addModeActonData.ActionType} ,
{ "Actions", acList},
{ "LoginToken", addModeActonData.LoginToken}
};
- jObject.Add("Data", data);
- mainGateway.Send(("Security/AddModeActon"), jObject.ToString());
- }
+ jObject.Add("Data", data);
+ mainGateway.Send(("Security/AddModeActon"), jObject.ToString());
+ }
}
catch { }
@@ -2727,17 +2590,8 @@
/// 瀹夐槻妯″紡瑙﹀彂鍔ㄤ綔娣诲姞鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AddModeActonResponAllData
+ public class AddModeActonResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 瀹夐槻妯″紡瑙﹀彂鍔ㄤ綔娣诲姞鐨勬暟鎹�
/// </summary>
@@ -2758,7 +2612,7 @@
/// 0锛氶粯璁�
///<para>1锛氬け璐ワ紝妯″紡涓嶅瓨鍦ㄣ��</para>
/// </summary>
- public int Result=999;
+ public int Result = 999;
/// <summary>
/// 瑕佷慨鏀圭殑甯冮槻妯″紡ID銆�
@@ -2791,7 +2645,7 @@
///<para>0锛氭垚鍔�</para>
///<para>1锛氬け璐ワ紝璁惧鎴栧満鏅笉瀛樺湪</para>
/// </summary>
- public int Status=999;
+ public int Status = 999;
/// <summary>
/// 鍔ㄤ綔绫诲瀷
@@ -2848,7 +2702,7 @@
///<para>2锛氬竷闃插け璐ユ寚绀哄姩浣�</para>
///<para>3锛氭挙闃叉垚鍔熸寚绀哄姩浣�</para>
///<para>4锛氭挙闃插け璐ユ寚绀哄姩浣�</para>
- /// </summary>
+ /// </summary>
public int ActionType;
/// <summary>
@@ -2972,8 +2826,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2987,10 +2840,9 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
- d = new RemoveActionFromModeAllData {};
+ d = new RemoveActionFromModeAllData { };
if (temp == null)
{
d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
@@ -3006,32 +2858,32 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/RemoveActonFromMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.removeActonFromModeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveActionFromModeResponData>(jobject["Data"].ToString());
- if (security.removeActonFromModeResponData != null)
+ var removeActonFromModeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveActionFromModeResponData>(jobject["Data"].ToString());
+ if (removeActonFromModeResponData != null)
{
- d = new RemoveActionFromModeAllData { removeActonFromModeResponData = security.removeActonFromModeResponData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
+ d = new RemoveActionFromModeAllData { removeActonFromModeResponData = removeActonFromModeResponData };
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
else
{
- d = new RemoveActionFromModeAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
+ d = new RemoveActionFromModeAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
}
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/RemoveActonFromMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
if (removeActonFromModeData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4008 } };
@@ -3066,7 +2918,8 @@
mainGateway.Send(("Security/RemoveActonFromMode"), jObject.ToString());
}
}
- catch{
+ catch
+ {
}
@@ -3098,17 +2951,8 @@
/// 灏嗗姩浣滀粠甯冮槻妯″紡涓Щ闄ょ殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class RemoveActionFromModeAllData
+ public class RemoveActionFromModeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 灏嗗姩浣滀粠甯冮槻妯″紡涓Щ闄ょ殑鍥炲鏁版嵁
/// </summary>
@@ -3158,7 +3002,7 @@
///<para>0锛氭垚鍔�</para>
///<para>1锛氬け璐ワ紝璁惧鎴栧満鏅笉瀛樺湪</para>
/// </summary>
- public int Status=999;
+ public int Status = 999;
/// <summary>
/// 鍔ㄤ綔绫诲瀷
@@ -3205,7 +3049,7 @@
///<para>2锛氬竷闃插け璐ユ寚绀哄姩浣�</para>
///<para>3锛氭挙闃叉垚鍔熸寚绀哄姩浣�</para>
///<para>4锛氭挙闃插け璐ユ寚绀哄姩浣�</para>
- /// </summary>
+ /// </summary>
public int ActionType;
/// <summary>
@@ -3270,8 +3114,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -3285,29 +3128,30 @@
if (topic == gatewayID + "/" + "Security/GetModeList_Repon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.getModeListData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetModeListData>(jobject["Data"].ToString());
- if (security.getModeListData == null)
+ var getModeListData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetModeListData>(jobject["Data"].ToString());
+ if (getModeListData == null)
{
d = new GetModeListAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new GetModeListAllData { getModeListData = security.getModeListData };
+ d = new GetModeListAllData { getModeListData = getModeListData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/GetModeList_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4009 }
};
mainGateway.Send("Security/GetModeList", jObject.ToString());
- }catch{ }
+ }
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
@@ -3337,17 +3181,8 @@
/// 鑾峰彇甯冮槻妯″紡鍒楄〃杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetModeListAllData
+ public class GetModeListAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鑾峰彇甯冮槻妯″紡鍒楄〃杩斿洖鐨勬暟鎹�
/// </summary>
@@ -3389,14 +3224,14 @@
/// 甯冮槻妯″紡鍚嶇О 锛屾渶澶�32涓瓧绗�
/// </summary>
public string ModeName;
-
+
/// <summary>
/// 鍏佽澶辫兘銆�
///<para>0锛氫笉鍏佽澶辫兘銆�</para>
///<para>1锛氬厑璁稿け鑳�</para>
/// </summary>
public string AllowDisable;
-
+
/// <summary>
/// 妯″紡褰撳墠甯冩挙闃茬姸鎬�
///<para>0锛氭挙闃�</para>
@@ -3417,7 +3252,7 @@
{
return await System.Threading.Tasks.Task.Run(async () =>
{
- GetModeInfoByIdResponAllData d =null;
+ GetModeInfoByIdResponAllData d = null;
var mainGateway = ZbGateway.MainGateWay;
if (mainGateway == null)
{
@@ -3432,8 +3267,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -3446,7 +3280,6 @@
}
if (topic == gatewayID + "/" + "Security/GetModeInfoById_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
@@ -3456,7 +3289,7 @@
d = new GetModeInfoByIdResponAllData { getModeInfoByIdResponData = getModeInfoByIdResponData };
}
System.Console.WriteLine("宸叉敹鍒伴�氱煡杩斿洖");
- }
+ }
else
{
d = new GetModeInfoByIdResponAllData { };
@@ -3469,7 +3302,8 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/GetModeInfoById_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4010 }
@@ -3478,8 +3312,8 @@
jObject.Add("Data", data);
mainGateway.Send("Security/GetModeInfoById", jObject.ToString());
}
- catch {}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -3491,7 +3325,7 @@
}
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- d = new GetModeInfoByIdResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new GetModeInfoByIdResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
System.Console.WriteLine("Security/GetModeInfoById_Actions 閫�鍑�" + System.DateTime.Now.ToString());
@@ -3508,17 +3342,8 @@
/// 閫氳繃甯冮槻妯″紡ID鏌ョ湅妯″紡淇℃伅鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetModeInfoByIdResponAllData
+ public class GetModeInfoByIdResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 閫氳繃甯冮槻妯″紡ID鏌ョ湅妯″紡淇℃伅杩斿洖鐨勬暟鎹�
/// </summary>
@@ -3539,7 +3364,7 @@
/// 0锛氶粯璁�
///<para>1锛氬け璐ワ紝甯冮槻妯″紡涓嶅瓨鍦�</para>
/// </summary>
- public int Result=999;
+ public int Result = 999;
/// <summary>
/// 甯冮槻妯″紡ID
@@ -3550,7 +3375,7 @@
/// 甯冮槻妯″紡鍚嶇О 锛屾渶澶�32涓瓧绗�
///<para> (Result=0鏃跺�兼湁鏁�)</para>
/// </summary>
- public string ModeName;
+ public string ModeName;
/// <summary>
/// 鍏佽澶辫兘銆�
@@ -3558,7 +3383,7 @@
///<para>1锛氬厑璁稿け鑳�</para>
///<para> (Result=0鏃跺�兼湁鏁�)</para>
/// </summary>
- public int AllowDisable = 100;
+ public int AllowDisable = 100;
/// <summary>
/// 妯″紡褰撳墠甯冩挙闃茬姸鎬�
@@ -3603,8 +3428,8 @@
///<para> (Result=0鏃跺�兼湁鏁�)</para>
/// </summary>
public List<ActionsInfo> WithdrawFailActions = new List<ActionsInfo>();
-
- }
+
+ }
/// <summary>
/// 鍔犲叆鎴愬姛鐨勯槻鍖哄垪琛ㄧ殑鏁版嵁
@@ -3688,8 +3513,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -3703,7 +3527,6 @@
if (topic == gatewayID + "/" + "Security/GetModeUsing_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
@@ -3716,7 +3539,7 @@
}
else
{
- d = new GetModeUsingResponseAllData {};
+ d = new GetModeUsingResponseAllData { };
var r = new GetModeUsingResponseData();
r.Result = result;
d.getModeUsingResponseData = r;
@@ -3726,15 +3549,16 @@
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/GetModeUsing_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4011}
};
mainGateway.Send("Security/GetModeUsing", jObject.ToString());
}
- catch {}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -3746,7 +3570,7 @@
}
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- d = new GetModeUsingResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new GetModeUsingResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
System.Console.WriteLine("Security/GetModeUsing_Actions 閫�鍑�" + System.DateTime.Now.ToString());
@@ -3763,17 +3587,8 @@
/// 鏌ョ湅褰撳墠姝ｅ湪浣跨敤鐨勫竷闃叉ā寮忚繑鍥炵殑鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetModeUsingResponseAllData
+ public class GetModeUsingResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅褰撳墠姝ｅ湪浣跨敤鐨勫竷闃叉ā寮忚繑鍥炵殑鏁版嵁
/// </summary>
@@ -3796,7 +3611,7 @@
/// 0锛氶粯璁�
/// <para>1锛氱郴缁熷綋鍓嶆病鏈夎繘琛屽竷闃�</para>
/// </summary>
- public int Result=999;
+ public int Result = 999;
/// <summary>
/// 鍚敤鐨勫竷闃叉ā寮廼d
@@ -3813,7 +3628,7 @@
/// <para>3锛氬け鑳戒竴娆★紝绗竴娆¤婵�娲讳笉璀﹀憡涓嶈Е鍙戝姩浣溿��</para>
/// </summary>
public int Setting;
-
+
}
#endregion
@@ -3828,7 +3643,7 @@
{
EnableModeResponAllData d = null;
var mainGateway = ZbGateway.MainGateWay;
- if (mainGateway == null)
+ if (mainGateway == null)
{
d = new EnableModeResponAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
return d;
@@ -3841,8 +3656,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -3855,17 +3669,16 @@
}
if (topic == gatewayID + "/" + "Security/EnableMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
var modeId = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["ModeId"].ToString());
- security.enableModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<EnableModeResponseData>(jobject["Data"].ToString());
- if (security.enableModeResponseData == null)
+ var enableModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<EnableModeResponseData>(jobject["Data"].ToString());
+ if (enableModeResponseData == null)
{
d = new EnableModeResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new EnableModeResponAllData { enableModeResponseData = security.enableModeResponseData };
+ d = new EnableModeResponAllData { enableModeResponseData = enableModeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
@@ -3873,7 +3686,8 @@
mainGateway.Actions += action;
System.Console.WriteLine("Security/EnableMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
if (enableModeData != null)
{
var jObject = new Newtonsoft.Json.Linq.JObject() {
@@ -3892,7 +3706,7 @@
mainGateway.Send("Security/EnableMode", jObject.ToString());
}
}
- catch{}
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
@@ -3922,17 +3736,8 @@
/// 甯冮槻杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class EnableModeResponAllData
+ public class EnableModeResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 甯冮槻杩斿洖鐨勬暟鎹�
/// </summary>
@@ -3957,7 +3762,7 @@
///<para>4锛氬竷闃插け璐ワ紝鏈夊叾浠栧竷闃叉ā寮忔鍦ㄥ惎鐢紙鍙兘浣跨敤涓�绉嶅竷闃叉ā寮忥紝闇�灏嗘鍦ㄥ惎鐢ㄧ殑甯冮槻妯″紡鎾ら槻鎵嶈兘甯冮槻鏂版ā寮忥級銆�</para>
///<para>5锛氬け璐ワ紝妯″紡灞炴�т笉鍏佽澶辫兘锛堝鏋滄柊寤哄竷闃叉ā寮忔椂锛孉llowDisable璁剧疆涓�0锛屽垯甯冮槻Setting鍊间笉鑳戒负2鎴�3锛屽惁鍒欏皢鎶ュ憡璇ラ敊璇級</para>
/// </summary>
- public int Result=999;
+ public int Result = 999;
/// <summary>
/// 鍚敤鐨勫竷闃叉ā寮廼d
@@ -3974,7 +3779,7 @@
/// <para>3锛氬け鑳戒竴娆★紝绗竴娆¤婵�娲讳笉璀﹀憡涓嶈Е鍙戝姩浣溿��</para>
/// </summary>
public int Setting;
-
+
/// <summary>
///褰撳墠姝ｅ湪鍚敤鐨勫竷闃叉ā寮廔D锛堝綋Result = 4鏃跺瓨鍦ㄣ�傦級
/// </summary>
@@ -4037,7 +3842,7 @@
///<para>1锛氭鏌�</para>
/// </summary>
public int CheckIASStatus;
-
+
/// <summary>
///鐢ㄦ埛瀵嗙爜锛屾渶澶�32涓瓧绗�
/// </summary>
@@ -4069,8 +3874,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -4084,15 +3888,14 @@
if (topic == gatewayID + "/" + "Security/WithdrawMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.withdrawModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<WithdrawModeResponseData>(jobject["Data"].ToString());
- if (security.withdrawModeResponseData == null)
+ var withdrawModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<WithdrawModeResponseData>(jobject["Data"].ToString());
+ if (withdrawModeResponseData == null)
{
d = new WithdrawModeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new WithdrawModeResponseAllData { withdrawModeResponseData = security.withdrawModeResponseData };
+ d = new WithdrawModeResponseAllData { withdrawModeResponseData = withdrawModeResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
@@ -4100,7 +3903,8 @@
mainGateway.Actions += action;
System.Console.WriteLine("Security/WithdrawMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4013}
@@ -4113,8 +3917,8 @@
mainGateway.Send("Security/WithdrawMode", jObject.ToString());
}
- catch {}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -4143,23 +3947,14 @@
/// 鎾ら槻杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class WithdrawModeResponseAllData
+ public class WithdrawModeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鎾ら槻杩斿洖鐨勬暟鎹�
/// </summary>
public WithdrawModeResponseData withdrawModeResponseData;
- }
+ }
/// <summary>
/// 鎾ら槻杩斿洖鐨勬暟鎹�
@@ -4177,7 +3972,7 @@
///<para>2锛氭挙闃插け璐ワ紝瀵嗙爜閿欒銆�</para>
///<para>3锛氭挙闃插け璐ワ紝妯″紡涓嶅彲鎾ら槻銆傦紙鏂板缓妯″紡鏃讹紝妯″紡灞炴�ц涓轰笉鍙挙闃插垯甯冮槻鍚庡皢涓嶈兘鎾ら槻锛�</para>
/// </summary>
- public int Result=999;
+ public int Result = 999;
/// <summary>
/// 琚挙闃茬殑妯″紡
@@ -4207,7 +4002,7 @@
{
RemoveModeResponseAllData d = null;
var mainGateway = ZbGateway.MainGateWay;
- if (mainGateway == null)
+ if (mainGateway == null)
{
d = new RemoveModeResponseAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
return d;
@@ -4220,8 +4015,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -4235,8 +4029,7 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new RemoveModeResponseAllData { };
if (temp == null)
{
@@ -4253,29 +4046,29 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/RemoveMode_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.removeModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveModeResponseData>(jobject["Data"].ToString());
- if (security.removeModeResponseData == null)
+ var removeModeResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveModeResponseData>(jobject["Data"].ToString());
+ if (removeModeResponseData == null)
{
d = new RemoveModeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new RemoveModeResponseAllData { removeModeResponseData = security.removeModeResponseData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
+ d = new RemoveModeResponseAllData { removeModeResponseData = removeModeResponseData };
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
};
mainGateway.Actions += action;
System.Console.WriteLine("Security/RemoveMode_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4014}
@@ -4288,8 +4081,8 @@
mainGateway.Send("Security/RemoveMode", jObject.ToString());
}
- catch {}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -4318,17 +4111,8 @@
/// 鍒犻櫎甯冮槻妯″紡杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class RemoveModeResponseAllData
+ public class RemoveModeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒犻櫎甯冮槻妯″紡杩斿洖鐨勬暟鎹�
/// </summary>
@@ -4352,7 +4136,7 @@
///<para>1锛氬け璐ワ紝涓嶅瓨鍦ㄨ甯冮槻妯″紡銆�</para>
///<para>2锛氬垹闄ゅけ璐ワ紝涓嶅厑璁稿垹闄ゃ�傦紙褰揗odeId涓�1鎴�2鏃讹紝绂诲甯冮槻鍜屽湪瀹跺竷闃叉ā寮忎笉鍏佽鍒犻櫎锛�</para>
/// </summary>
- public int Result=999;
+ public int Result = 999;
/// <summary>
/// 妯″紡id
@@ -4365,152 +4149,6 @@
/// <summary>鈥� /// 鐧婚檰鏍囪瘑锛屾渶澶�32涓瓧绗︺�傜敱app鑷姩鐢熸垚鐨勫敮涓�鏍囪瘑銆備笌绠＄悊鍛樼櫥闄嗘寚浠ょ殑鈥淟oginToken鈥濅竴鑷达紝鍚﹀垯灏嗚繑鍥炩�淪ecurity/Error_Respon鈥濋敊璇�傗�� /// </summary>鈥� public string LoginToken;鈥�
}
#endregion
-
- //#region 鍒犻櫎闃插尯.
- /////<summary >
- ///// 鍒犻櫎闃插尯.(浠呯敤浜庝富缃戝叧鎺ュ彛锛�.
- ///// </summary>
- //public static async System.Threading.Tasks.Task<RemoveZoneResponseAllData> RemoveZoneAsync(int zoneId)
- //{
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // var d = new RemoveZoneResponseAllData { };
- // if (ZbGateway.MainGateWay == null)
- // {
- // d.errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�";
- // return d;
- // }
-
- // Action<string, string> action = (topic, message) =>
- // {
- // var gatewayID = topic.Split('/')[0];
- // var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
-
- // if (topic == gatewayID + "/" + "Error_Respon")
- // {
- // var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
-
- // if (temp == null)
- // {
- // d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
- // }
- // else
- // {
- // d.errorResponData = temp;
- // d.errorMessageBase = ErrorMess(temp.Error);
- // }
- // }
-
- // if (topic == gatewayID + "/" + "Security/RemoveZone_Respon")
- // {
- // var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = ZbGateway.MainGateWay.CurrentGateWayId };
- // var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
- // if (result == 0)
- // {
- // security.removeZoneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveZoneResponseData>(jobject["Data"].ToString());
- // if (security.removeZoneResponseData != null)
- // {
- // d.removeZoneResponseData = security.removeZoneResponseData;
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- // }
- // }
- // else
- // {
- // var r = new RemoveZoneResponseData();
- // r.Result = result;
- // d.removeZoneResponseData = r;
- // System.Console.WriteLine($"鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- // }
- // }
- // };
- // ZbGateway.MainGateWay.Actions += action;
- // System.Console.WriteLine("Security/RemoveZone_Actions 鍚姩" + System.DateTime.Now.ToString());
-
- // var jObject = new Newtonsoft.Json.Linq.JObject() {
- // { "Cluster_ID", 0 },
- // { "Command", 4015}
- // };
- // var data = new JObject
- // {
- // { "ZoneId", zoneId}
- // };
- // jObject.Add("Data", data);
- // ZbGateway.MainGateWay?.Send("Security/RemoveZone", jObject.ToString());
-
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 1000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (d.removeZoneResponseData != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > 10000)
- // {
- // d.errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔";
- // }
- // ZbGateway.MainGateWay.Actions -= action;
- // System.Console.WriteLine("Security/RemoveZone_Actions 閫�鍑�" + System.DateTime.Now.ToString());
-
- // return d;
- // });
- //}
-
- ///// <summary>
- ///// 鍒犻櫎闃插尯,缃戝叧鍙嶉淇℃伅
- ///// </summary>
- //public RemoveZoneResponseAllData removeZoneResponseAllData;
- ///// <summary>
- ///// 鍒犻櫎闃插尯,缃戝叧鍙嶉淇℃伅
- ///// </summary>
- //[System.Serializable]
- //public class RemoveZoneResponseAllData
- //{
- // /// <summary>
- // /// 閿欒淇℃伅
- // /// </summary>
- // public string errorMessageBase;
- // /// <summary>
- // /// 缃戝叧淇℃伅閿欒鍙嶉
- // /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- // /// </summary>
- // public ErrorResponData errorResponData;
- // /// <summary>
- // /// 鍒犻櫎闃插尯杩斿洖鐨勬暟鎹�
- // /// </summary>
- // public RemoveZoneResponseData removeZoneResponseData;
-
- //}
-
-
- ///// <summary>
- ///// 鍒犻櫎闃插尯杩斿洖鐨勬暟鎹�
- ///// </summary>
- //public RemoveZoneResponseData removeZoneResponseData;
- ///// <summary>
- ///// 鍒犻櫎闃插尯杩斿洖鐨勬暟鎹�
- ///// </summary>
- //[System.Serializable]
- //public class RemoveZoneResponseData
- //{
- // /// <summary>
- // /// 0锛氬垹闄ゆ垚鍔熴��
- // ///<para>1锛氬け璐ワ紝闃插尯涓嶅瓨鍦ㄣ��</para>
- // /// </summary>
- // public int Result = 999;
-
- // /// <summary>
- // /// 闃插尯id
- // /// </summary>
- // public int ZoneId;
- // /// <summary>
- // /// 闃插尯鍚嶇О锛屽綋Result=0鏃跺瓨鍦ㄣ��
- // /// </summary>
- // public string ZoneName;
- //}
- //#endregion
#region *14灏嗚澶囦粠闃插尯涓Щ闄�.
/// <summary>
@@ -4536,8 +4174,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -4551,8 +4188,7 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new RemoveDeviceToZoneAllData { };
if (temp == null)
@@ -4570,20 +4206,19 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/RemoveEqToZone_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.removeDeviceToZoneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveDeviceToZoneResponseData>(jobject["Data"].ToString());
- if (security.removeDeviceToZoneResponseData != null)
+ var removeDeviceToZoneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveDeviceToZoneResponseData>(jobject["Data"].ToString());
+ if (removeDeviceToZoneResponseData != null)
{
- d = new RemoveDeviceToZoneAllData { removeDeviceToZoneResponseData = security.removeDeviceToZoneResponseData };
+ d = new RemoveDeviceToZoneAllData { removeDeviceToZoneResponseData = removeDeviceToZoneResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
@@ -4600,7 +4235,8 @@
mainGateway.Actions += action;
System.Console.WriteLine($"Security/RemoveEqToZone_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
+ try
+ {
if (removeEqToZoneData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4016 } };
@@ -4623,7 +4259,7 @@
mainGateway.Send(("Security/RemoveEqToZone_Actions 鍚姩"), jObject.ToString());
}
}
- catch{}
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
@@ -4634,9 +4270,9 @@
break;
}
}
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime )
+ if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- d = new RemoveDeviceToZoneAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new RemoveDeviceToZoneAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
@@ -4653,17 +4289,8 @@
/// 灏嗚澶囦粠闃插尯涓Щ闄ょ殑杩斿洖鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class RemoveDeviceToZoneAllData
+ public class RemoveDeviceToZoneAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 灏嗚澶囦粠闃插尯涓Щ闄ょ殑杩斿洖鏁版嵁
/// </summary>
@@ -4686,7 +4313,7 @@
/// <para>1锛氭坊鍔犲け璐ャ�傦紙灞�閮ㄥ竷闃插垪琛╥d涓嶅瓨鍦級</para>
/// </summary>
public int Result = 999;
-
+
/// <summary>
/// 瀹夐槻璁惧鍒楄〃(Result=0鏃跺瓨鍦�)
/// </summary>
@@ -4776,7 +4403,7 @@
// if (topic == gatewayID + "/" + "Error_Respon")
// {
// var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = ZbGateway.MainGateWay.getGatewayBaseInfo.gwID };
- // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ // var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
// if (temp == null)
// {
@@ -4948,8 +4575,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -4962,14 +4588,13 @@
}
if (topic == gatewayID + "/" + "Security/GetZoneDeviceListById_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.getZoneDeviceListByIdResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetZoneDeviceListByIdResponData>(jobject["Data"].ToString());
- if (security.getZoneDeviceListByIdResponData != null)
+ var getZoneDeviceListByIdResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<GetZoneDeviceListByIdResponData>(jobject["Data"].ToString());
+ if (getZoneDeviceListByIdResponData != null)
{
- d = new GetZoneDeviceListByIdResponAllData { getZoneDeviceListByIdResponData = security.getZoneDeviceListByIdResponData };
+ d = new GetZoneDeviceListByIdResponAllData { getZoneDeviceListByIdResponData = getZoneDeviceListByIdResponData };
}
System.Console.WriteLine($"UI宸叉敹鍒伴�氱煡鐨勪富棰榑{topic}");
}
@@ -4995,7 +4620,7 @@
jObject.Add("Data", data);
mainGateway.Send("Security/GetZoneDeviceListById", jObject.ToString());
}
- catch { }
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
@@ -5008,7 +4633,7 @@
}
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- d = new GetZoneDeviceListByIdResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new GetZoneDeviceListByIdResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
System.Console.WriteLine("Security/GetZoneDeviceListById_Actions 閫�鍑�" + System.DateTime.Now.ToString());
@@ -5025,17 +4650,8 @@
/// 閫氳繃甯冮槻妯″紡ID鏌ョ湅妯″紡淇℃伅鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetZoneDeviceListByIdResponAllData
+ public class GetZoneDeviceListByIdResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 閫氳繃甯冮槻妯″紡ID鏌ョ湅妯″紡淇℃伅杩斿洖鐨勬暟鎹�
/// </summary>
@@ -5116,7 +4732,7 @@
///<para>0锛氫笉鏃佽矾</para>
///<para>1锛氭梺璺�</para>
/// </summary>
- public int IsBypass=999;
+ public int IsBypass = 999;
}
#endregion
@@ -5132,7 +4748,7 @@
///<para>4锛氭挙闃插け璐ユ寚绀哄姩浣�</para>
///<para>loginToken:鐧婚檰鏍囪瘑锛屾渶澶�32涓瓧绗︺�傜敱app鑷姩鐢熸垚鐨勫敮涓�鏍囪瘑銆備笌绠＄悊鍛樼櫥闄嗘寚浠ょ殑鈥淟oginToken鈥濅竴鑷达紝鍚﹀垯灏嗚繑鍥炩�淪ecurity/Error_Respon鈥濋敊璇��</para>
///</summary>
- public static async System.Threading.Tasks.Task<ActionTestResponseAllData> ActionTestAsync(int modeId, int actionType,string loginToken)
+ public static async System.Threading.Tasks.Task<ActionTestResponseAllData> ActionTestAsync(int modeId, int actionType, string loginToken)
{
return await System.Threading.Tasks.Task.Run(async () =>
{
@@ -5151,8 +4767,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -5161,13 +4776,13 @@
else
{
d = new ActionTestResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
+ }
}
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new ActionTestResponseAllData { };
if (temp == null)
{
@@ -5184,17 +4799,16 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/ActionTest_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.actionTestResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ActionTestResponseData>(jobject["Data"].ToString());
- if (security.actionTestResponseData != null)
+ var actionTestResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ActionTestResponseData>(jobject["Data"].ToString());
+ if (actionTestResponseData != null)
{
- d = new ActionTestResponseAllData { actionTestResponseData = security.actionTestResponseData };
+ d = new ActionTestResponseAllData { actionTestResponseData = actionTestResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
@@ -5208,7 +4822,8 @@
mainGateway.Actions += action;
System.Console.WriteLine("Security/ActionTest_Actions 鍚姩" + System.DateTime.Now.ToString());
- try{
+ try
+ {
var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4027}
@@ -5222,8 +4837,8 @@
jObject.Add("Data", data);
mainGateway.Send("Security/ActionTest", jObject.ToString());
}
- catch {}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -5252,17 +4867,8 @@
/// 鎵ц瀹夐槻妯″紡鍔ㄤ綔杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class ActionTestResponseAllData
+ public class ActionTestResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鎵ц瀹夐槻妯″紡鍔ㄤ綔杩斿洖鐨勬暟鎹�
/// </summary>
@@ -5401,7 +5007,7 @@
/// 鎶ヨ鏃舵渶鍚庤婵�娲荤殑闃插尯
/// </summary>
public int ZoneId;
-
+
/// <summary>
/// 鏄惁涓哄己杩瘑鐮佹挙闃茶Е鍙戦潤闊抽槻鍖�
///<para>0锛氫笉鏄�</para>
@@ -5429,8 +5035,8 @@
/// <summary>
/// 淇℃伅鎺ㄩ�佺洰鏍�
/// </summary>
- public List<PushTargetInfo> PushTarget=new List<PushTargetInfo>();
-
+ public List<PushTargetInfo> PushTarget = new List<PushTargetInfo>();
+
}
#endregion
@@ -5490,23 +5096,21 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
- {
+ {
d = new EqByPassAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
+ }
else
- {
- d = new EqByPassAllData { errorMessageBase = ErrorMess(temp.Error) , errorResponData = temp };
- }
+ {
+ d = new EqByPassAllData { errorMessageBase = ErrorMess(temp.Error), errorResponData = temp };
+ }
}
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new EqByPassAllData { };
if (temp == null)
{
@@ -5523,21 +5127,20 @@
d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/EqByPass_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
if (result == 0)
{
- security.eqByPassResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<EqByPassResponseData>(jobject["Data"].ToString());
- if (security.eqByPassResponseData != null)
+ var eqByPassResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<EqByPassResponseData>(jobject["Data"].ToString());
+ if (eqByPassResponseData != null)
{
- d = new EqByPassAllData { eqByPassResponseData = security.eqByPassResponseData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
+ d = new EqByPassAllData { eqByPassResponseData = eqByPassResponseData };
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
else
@@ -5545,7 +5148,7 @@
var r = new EqByPassResponseData();
r.Result = result;
d = new EqByPassAllData { eqByPassResponseData = r };
-
+
System.Console.WriteLine("宸叉敹鍒伴�氱煡杩斿洖");
}
}
@@ -5553,7 +5156,8 @@
mainGateway.Actions += action;
System.Console.WriteLine($"Security/EqByPass_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
+ try
+ {
if (eqByPassData != null)
{
var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4029 } };
@@ -5570,8 +5174,8 @@
mainGateway.Send(("Security/EqByPass"), jObject.ToString());
}
}
- catch{}
-
+ catch { }
+
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -5583,7 +5187,7 @@
}
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
- d = new EqByPassAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new EqByPassAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
mainGateway.Actions -= action;
@@ -5600,17 +5204,8 @@
/// 瀵归槻鍖哄畨闃茶澶囪繘琛屾梺璺垨鎾ら攢鏃佽矾鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class EqByPassAllData
+ public class EqByPassAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 瀵归槻鍖哄畨闃茶澶囪繘琛屾梺璺垨鎾ら攢鏃佽矾鐨勮繑鍥炴暟鎹�
/// </summary>
@@ -5659,7 +5254,7 @@
/// </summary>
public int IsByPass;
- }
+ }
/// <summary>
/// 瀵归槻鍖哄畨闃茶澶囪繘琛屾梺璺垨鎾ら攢鏃佽矾鐨勬暟鎹�
@@ -5693,7 +5288,7 @@
/// 0锛氫笉鏃佽矾
///<para>1锛氭梺璺澶�</para>
/// </summary>
- public int IsByPass=999;
+ public int IsByPass = 999;
/// <summary>鈥� /// 鐧婚檰鏍囪瘑锛屾渶澶�32涓瓧绗︺�傜敱app鑷姩鐢熸垚鐨勫敮涓�鏍囪瘑銆備笌绠＄悊鍛樼櫥闄嗘寚浠ょ殑鈥淟oginToken鈥濅竴鑷达紝鍚﹀垯灏嗚繑鍥炩�淪ecurity/Error_Respon鈥濋敊璇�傗�� /// </summary>鈥� public string LoginToken;
}
#endregion
@@ -5710,9 +5305,9 @@
var mainGateway = ZbGateway.MainGateWay;
if (mainGateway == null)
- {
+ {
d = new AddZoneActionAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
- return d;
+ return d;
}
Action<string, string> action = (topic, message) =>
{
@@ -5721,8 +5316,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -5736,41 +5330,41 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new AddZoneActionAllData { };
if (temp == null)
{
- d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
if (temp.Error == 1)
{
- d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��" ;
+ d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
else if (temp.Error == 2)
{
- d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��" ;
+ d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp ;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/AddZoneAction_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.addZoneActionResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddZoneActionResponseData>(jobject["Data"].ToString());
- if (security.addZoneActionResponseData != null)
+ var addZoneActionResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddZoneActionResponseData>(jobject["Data"].ToString());
+ if (addZoneActionResponseData != null)
{
- d = new AddZoneActionAllData { addZoneActionResponseData = security.addZoneActionResponseData };
- System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- }else{
+ d = new AddZoneActionAllData { addZoneActionResponseData = addZoneActionResponseData };
+ System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
+ }
+ else
+ {
d = new AddZoneActionAllData { errorMessageBase = "缃戝叧鍥炲鏁版嵁鏄┖" };
- }
- }
+ }
+ }
};
mainGateway.Actions += action;
System.Console.WriteLine($"Security/AddZoneAction_Actions鍚姩_{System.DateTime.Now.ToString()}");
@@ -5822,7 +5416,8 @@
jObject.Add("Data", data);
mainGateway.Send(("Security/AddZoneAction"), jObject.ToString());
}
- }catch{}
+ }
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
{
@@ -5835,7 +5430,7 @@
if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
{
d = new AddZoneActionAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
-
+
}
mainGateway.Actions -= action;
@@ -5852,17 +5447,8 @@
/// 娣诲姞闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AddZoneActionAllData
+ public class AddZoneActionAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 娣诲姞闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�
/// </summary>
@@ -5941,8 +5527,8 @@
/// <summary>
/// 璁惧鎴栧満鏅悕绉帮紝Status = 0鏃跺瓨鍦�
/// </summary>
- public string ESName;
- }
+ public string ESName;
+ }
/// <summary>
/// 娣诲姞闃插尯鎶ヨ鐩爣鐨勬暟鎹�
@@ -6001,8 +5587,8 @@
/// <summary>
/// 鍦烘櫙ID 銆傚綋Type=1鏃跺瓨鍦�
/// </summary>
- public int ScenesId;
- }
+ public int ScenesId;
+ }
#endregion
@@ -6028,8 +5614,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -6043,18 +5628,17 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new DelZoneActionResposeAllData { };
if (temp == null)
{
- d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
if (temp.Error == 1)
{
- d .errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��" ;
+ d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
else if (temp.Error == 2)
{
@@ -6068,11 +5652,10 @@
if (topic == gatewayID + "/" + "Security/DelZoneAction_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.delZoneActionResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelZoneActionResponseData>(jobject["Data"].ToString());
- if (security.delZoneActionResponseData != null)
+ var delZoneActionResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelZoneActionResponseData>(jobject["Data"].ToString());
+ if (delZoneActionResponseData != null)
{
- d = new DelZoneActionResposeAllData { delZoneActionResponseData = security.delZoneActionResponseData };
+ d = new DelZoneActionResposeAllData { delZoneActionResponseData = delZoneActionResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -6119,7 +5702,8 @@
jObject.Add("Data", data);
mainGateway.Send(("Security/DelZoneAction"), jObject.ToString());
}
- }catch{}
+ }
+ catch { }
var dateTime = DateTime.Now;
while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
@@ -6149,17 +5733,8 @@
/// 鍒犻櫎闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class DelZoneActionResposeAllData
+ public class DelZoneActionResposeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒犻櫎闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�
/// </summary>
@@ -6211,7 +5786,7 @@
/// 鍔ㄤ綔绫诲瀷
///<para>0锛氳妭鐐硅澶囧姩浣�</para>
///<para>1锛氭墦寮�鍦烘櫙</para>
- /// </summary>
+ /// </summary>
public string Type;
/// <summary>
/// 璁惧mac鍦板潃 锛�
@@ -6223,13 +5798,13 @@
/// 璁惧绔彛鍙�
///<para>璁惧绔彛鍙� 鍜宮ac鍦板潃鍏卞悓鏍囪瘑鍞竴鐨剒igbee璁惧 鏁板�艰寖鍥�0-255銆� 褰揟ype=0鏃跺瓨鍦ㄣ��</para>
/// </summary>
- public int Epoint;
+ public int Epoint;
/// <summary>
/// 鍦烘櫙ID 銆傚綋Type=1鏃跺瓨鍦�
/// </summary>
- public int ScenesId;
- }
+ public int ScenesId;
+ }
/// <summary>
/// 鍒犻櫎闃插尯鎶ヨ鐩爣鐨勬暟鎹�
@@ -6277,13 +5852,13 @@
/// 璁惧绔彛鍙�
///<para>璁惧绔彛鍙� 鍜宮ac鍦板潃鍏卞悓鏍囪瘑鍞竴鐨剒igbee璁惧 鏁板�艰寖鍥�0-255銆� 褰揟ype=0鏃跺瓨鍦ㄣ��</para>
/// </summary>
- public int Epoint;
+ public int Epoint;
/// <summary>
/// 鍦烘櫙ID 銆傚綋Type=1鏃跺瓨鍦�
/// </summary>
- public int ScenesId;
- }
+ public int ScenesId;
+ }
#endregion
#region 29鏌ョ湅闃插尯鎶ヨ鐩爣;
@@ -6311,8 +5886,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateWay.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -6326,11 +5900,10 @@
if (topic == gatewayID + "/" + "Security/CatZoneAction_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateWay.CurrentGateWayId };
- security.catZoneActionResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatZoneActionResponseData>(jobject["Data"].ToString());
- if (security.catZoneActionResponseData != null)
+ var catZoneActionResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatZoneActionResponseData>(jobject["Data"].ToString());
+ if (catZoneActionResponseData != null)
{
- d = new CatZoneActionResposeAllData { catZoneActionResponseData = security.catZoneActionResponseData };
+ d = new CatZoneActionResposeAllData { catZoneActionResponseData = catZoneActionResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -6341,17 +5914,18 @@
};
mainGateWay.Actions += action;
System.Console.WriteLine($"Security/CatZoneAction_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
- var jObject = new Newtonsoft.Json.Linq.JObject() {
+ try
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4032 }
};
- var data = new JObject
+ var data = new JObject
{
{ "ActionType", actionType }
};
- jObject.Add("Data", data);
- mainGateWay.Send("Security/CatZoneAction", jObject.ToString());
+ jObject.Add("Data", data);
+ mainGateWay.Send("Security/CatZoneAction", jObject.ToString());
}
catch { }
@@ -6383,17 +5957,8 @@
/// 鏌ョ湅闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class CatZoneActionResposeAllData
+ public class CatZoneActionResposeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�
/// </summary>
@@ -6449,7 +6014,7 @@
/// 鍔ㄤ綔绫诲瀷
///<para>0锛氳妭鐐硅澶囧姩浣�</para>
///<para>1锛氭墦寮�鍦烘櫙</para>
- /// </summary>
+ /// </summary>
public int Type;
/// <summary>
/// 璁惧mac鍦板潃 锛�
@@ -6478,7 +6043,7 @@
/// 璁惧鎴栧満鏅悕绉�(褰揟ype=0 鎴朤ype=1鏃跺瓨鍦ㄣ��)
/// </summary>
public string ESName;
- }
+ }
#endregion
@@ -6504,8 +6069,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -6519,36 +6083,34 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new SetCoercePhoneNumberAllResponseData { };
if (temp == null)
{
- d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
if (temp.Error == 1)
{
- d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��" ;
+ d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
else if (temp.Error == 2)
{
- d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��" ;
+ d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp ;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/AddZoneAction_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.setCoercePhoneNumberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetCoercePhoneNumberResponseData>(jobject["Data"].ToString());
- if (security.setCoercePhoneNumberResponseData != null)
+ var setCoercePhoneNumberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetCoercePhoneNumberResponseData>(jobject["Data"].ToString());
+ if (setCoercePhoneNumberResponseData != null)
{
- d = new SetCoercePhoneNumberAllResponseData { setCoercePhoneNumberResponseData = security.setCoercePhoneNumberResponseData };
+ d = new SetCoercePhoneNumberAllResponseData { setCoercePhoneNumberResponseData = setCoercePhoneNumberResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -6559,39 +6121,40 @@
};
mainGateway.Actions += action;
System.Console.WriteLine($"Security/AddZoneAction(璁剧疆鑳佽揩鐘舵�佷笅鐨勭數璇濆彿鐮侊級_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
- if (setCoercePhoneNumberData != null)
+ try
{
- var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4030 } };
- var actionsList = new JArray { };
- foreach (var act in setCoercePhoneNumberData.Actions)
- {
- if (act.Type == 2)
+ if (setCoercePhoneNumberData != null)
+ {
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4030 } };
+ var actionsList = new JArray { };
+ foreach (var act in setCoercePhoneNumberData.Actions)
{
- var pushTargetList = new JArray { };
- foreach (var pushInfo in act.PushTarget)
+ if (act.Type == 2)
{
- var pInfo = new JObject{
+ var pushTargetList = new JArray { };
+ foreach (var pushInfo in act.PushTarget)
+ {
+ var pInfo = new JObject{
{ "PushNumber", pushInfo.PushNumber}
};
- pushTargetList.Add(pInfo);
- }
- var c = new JObject {
+ pushTargetList.Add(pInfo);
+ }
+ var c = new JObject {
{ "Type",act.Type},
{ "PushTarget", pushTargetList}
};
- actionsList.Add(c);
+ actionsList.Add(c);
+ }
}
- }
- var data = new JObject
+ var data = new JObject
{
{ "ActionType", 253},
{ "Actions", actionsList},
{ "LoginToken", setCoercePhoneNumberData.LoginToken}
};
- jObject.Add("Data", data);
- mainGateway.Send(("Security/AddZoneAction"), jObject.ToString());
- }
+ jObject.Add("Data", data);
+ mainGateway.Send(("Security/AddZoneAction"), jObject.ToString());
+ }
}
catch { }
var dateTime = DateTime.Now;
@@ -6621,7 +6184,7 @@
/// <param name="strPhone">鍦板尯鐮�-鑱旂郴鏂瑰紡</param>
/// <param name="strNote">澶囨敞,鏈�澶�63byte</param>
/// <returns></returns>
- public static async System.Threading.Tasks.Task<SetCoercePhoneNumberResponseData> SetCoercePhoneNumberNoteAsync(string strPhone,string strNote)
+ public static async System.Threading.Tasks.Task<SetCoercePhoneNumberResponseData> SetCoercePhoneNumberNoteAsync(string strPhone, string strNote)
{
SetCoercePhoneNumberResponseData d = null;
var mainGateway = ZbGateway.MainGateWay;
@@ -6681,17 +6244,8 @@
/// 璁剧疆鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑杩斿洖鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class SetCoercePhoneNumberAllResponseData
+ public class SetCoercePhoneNumberAllResponseData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 璁剧疆鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑杩斿洖鏁版嵁
/// </summary>
@@ -6711,7 +6265,7 @@
/// <summary>
/// 杩斿洖缁撴灉
/// <para>0锛氶粯璁�</para>
- /// </summary>
+ /// </summary>
public int Result = 999;
/// <summary>
@@ -6730,13 +6284,13 @@
/// </summary>
[System.Serializable]
public class PushTargetActionResponseObj
- {
+ {
/// <summary>
/// 鍔ㄤ綔绫诲瀷
///<para>2锛氫俊鎭帹閫�</para>
/// </summary>
public string Type;
-
+
/// <summary>
/// 淇℃伅鎺ㄩ�佺洰鏍�,褰揟ype=2鏃跺瓨鍦ㄣ��
/// </summary>
@@ -6795,7 +6349,7 @@
///<para>2锛氫俊鎭帹閫�</para>
/// </summary>
public int Type;
-
+
/// <summary>
/// 淇℃伅鎺ㄩ�佺洰鏍�,褰揟ype=2鏃跺瓨鍦ㄣ��
/// </summary>
@@ -6825,8 +6379,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -6840,36 +6393,34 @@
if (topic == gatewayID + "/" + "Security/Error_Respon")
{
- var securityTemp = new Safeguard() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
d = new DelCoercePhoneNumberAllResponseData { };
if (temp == null)
{
- d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" ;
+ d.errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖";
}
else
{
if (temp.Error == 1)
{
- d .errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��" ;
+ d.errorMessageBase = "缃戝叧涓嶆槸涓荤綉鍏筹紝鏃犳硶杩涜璇ユ搷浣溿��";
}
else if (temp.Error == 2)
{
- d. errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��" ;
+ d.errorMessageBase = "璇ユ搷浣滈渶瑕佸畨闃茬鐞嗗憳鏉冮檺锛岄渶鍏堜互绠＄悊鍛樿韩浠借繘琛岀櫥闄嗐��";
}
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
- d.errorResponData = temp ;
+ d.errorResponData = temp;
}
}
if (topic == gatewayID + "/" + "Security/DelZoneAction_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.delCoercePhoneNumberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelCoercePhoneNumberResponseData>(jobject["Data"].ToString());
- if (security.delCoercePhoneNumberResponseData != null)
+ var delCoercePhoneNumberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DelCoercePhoneNumberResponseData>(jobject["Data"].ToString());
+ if (delCoercePhoneNumberResponseData != null)
{
- d = new DelCoercePhoneNumberAllResponseData { delCoercePhoneNumberResponseData = security.delCoercePhoneNumberResponseData };
+ d = new DelCoercePhoneNumberAllResponseData { delCoercePhoneNumberResponseData = delCoercePhoneNumberResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -6880,39 +6431,40 @@
};
mainGateway.Actions += action;
System.Console.WriteLine($"Security/AddZoneAction(鍒犻櫎鑳佽揩鐘舵�佷笅鐨勭數璇濆彿鐮侊級_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
- if (delCoercePhoneNumberData != null)
+ try
{
- var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4031 } };
- var actionsList = new JArray { };
- foreach (var act in delCoercePhoneNumberData.Actions)
+ if (delCoercePhoneNumberData != null)
{
- if (act.Type == 2)
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4031 } };
+ var actionsList = new JArray { };
+ foreach (var act in delCoercePhoneNumberData.Actions)
{
- var pushTargetList = new JArray { };
- foreach (var pushInfo in act.PushTarget)
+ if (act.Type == 2)
{
- var pInfo = new JObject{
+ var pushTargetList = new JArray { };
+ foreach (var pushInfo in act.PushTarget)
+ {
+ var pInfo = new JObject{
{ "PushNumber", pushInfo.PushNumber}
};
- pushTargetList.Add(pInfo);
- }
- var c = new JObject {
+ pushTargetList.Add(pInfo);
+ }
+ var c = new JObject {
{ "Type",act.Type},
{ "PushTarget", pushTargetList}
};
- actionsList.Add(c);
+ actionsList.Add(c);
+ }
}
- }
- var data = new JObject
+ var data = new JObject
{
{ "ActionType", 253},
{ "Actions", actionsList},
{ "LoginToken", delCoercePhoneNumberData.LoginToken}
};
- jObject.Add("Data", data);
- mainGateway.Send(("Security/DelZoneAction"), jObject.ToString());
- }
+ jObject.Add("Data", data);
+ mainGateway.Send(("Security/DelZoneAction"), jObject.ToString());
+ }
}
catch { }
var dateTime = DateTime.Now;
@@ -6944,17 +6496,8 @@
/// 鍒犻櫎鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑杩斿洖鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class DelCoercePhoneNumberAllResponseData
+ public class DelCoercePhoneNumberAllResponseData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒犻櫎鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑杩斿洖鏁版嵁
/// </summary>
@@ -6986,7 +6529,7 @@
/// </summary>
public List<PushTargetActionResponseObj> Actions = new List<PushTargetActionResponseObj>();
- }
+ }
/// <summary>
/// 鍒犻櫎鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑鏁版嵁
/// </summary>
@@ -7034,8 +6577,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -7049,11 +6591,10 @@
if (topic == gatewayID + "/" + "Security/CatZoneAction_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.checkCoercePhoneNumberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CheckCoercePhoneNumberResponseData>(jobject["Data"].ToString());
- if (security.checkCoercePhoneNumberResponseData != null)
+ var checkCoercePhoneNumberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CheckCoercePhoneNumberResponseData>(jobject["Data"].ToString());
+ if (checkCoercePhoneNumberResponseData != null)
{
- d = new CheckCoercePhoneNumberAllResponseData { checkCoercePhoneNumberResponseData = security.checkCoercePhoneNumberResponseData };
+ d = new CheckCoercePhoneNumberAllResponseData { checkCoercePhoneNumberResponseData = checkCoercePhoneNumberResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -7064,15 +6605,16 @@
};
mainGateway.Actions += action;
System.Console.WriteLine($"Security/CatZoneAction(鏌ョ湅鑳佽揩鐘舵�佷笅鐨勭數璇濆彿鐮侊級_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
- var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4032 } };
- var actionsList = new JArray { };
- var data = new JObject
+ try
+ {
+ var jObject = new JObject { { "Cluster_ID", 0 }, { "Command", 4032 } };
+ var actionsList = new JArray { };
+ var data = new JObject
{
{ "ActionType", actionType }
};
- jObject.Add("Data", data);
- mainGateway.Send(("Security/CatZoneAction"), jObject.ToString());
+ jObject.Add("Data", data);
+ mainGateway.Send(("Security/CatZoneAction"), jObject.ToString());
}
catch { }
@@ -7105,17 +6647,8 @@
/// 鏌ョ湅鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑杩斿洖鏁版嵁,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class CheckCoercePhoneNumberAllResponseData
+ public class CheckCoercePhoneNumberAllResponseData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅鑳佽揩鐘舵�佷笅琚�氱煡鐨勮仈绯诲彿鐮佺殑杩斿洖鏁版嵁
/// </summary>
@@ -7207,8 +6740,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -7222,11 +6754,10 @@
if (topic == gatewayID + "/" + "Security/DisablePushMessage_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.disablePushMessageResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DisablePushMessageResponseData>(jobject["Data"].ToString());
- if (security.disablePushMessageResponseData != null)
+ var disablePushMessageResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<DisablePushMessageResponseData>(jobject["Data"].ToString());
+ if (disablePushMessageResponseData != null)
{
- d = new DisablePushMessageResposeAllData { disablePushMessageResponseData = security.disablePushMessageResponseData };
+ d = new DisablePushMessageResposeAllData { disablePushMessageResponseData = disablePushMessageResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -7237,18 +6768,19 @@
};
mainGateway.Actions += action;
System.Console.WriteLine($"Security/DisablePushMessage_Actions鍚姩_{System.DateTime.Now.ToString()}");
- try{
- var jObject = new Newtonsoft.Json.Linq.JObject() {
+ try
+ {
+ var jObject = new Newtonsoft.Json.Linq.JObject() {
{ "Cluster_ID", 0 },
{ "Command", 4034 }
};
- var data = new JObject
+ var data = new JObject
{
{ "ZoneType", zoneType },
{ "IsDisablePushMessage", isDisablePushMessage }
};
- jObject.Add("Data", data);
- mainGateway.Send(("Security/DisablePushMessage"), jObject.ToString());
+ jObject.Add("Data", data);
+ mainGateway.Send(("Security/DisablePushMessage"), jObject.ToString());
}
catch { }
@@ -7280,17 +6812,8 @@
/// 鏌ョ湅闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class DisablePushMessageResposeAllData
+ public class DisablePushMessageResposeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅闃插尯鎶ヨ鐩爣鐨勮繑鍥炴暟鎹�
/// </summary>
@@ -7354,8 +6877,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -7369,11 +6891,10 @@
if (topic == gatewayID + "/" + "Security/AdminLogOut_Respon")
{
- var security = new Safeguard() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- security.adminLogOutResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AdminLogOutResponseData>(jobject["Data"].ToString());
- if (security.adminLogOutResponseData != null)
+ var adminLogOutResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<AdminLogOutResponseData>(jobject["Data"].ToString());
+ if (adminLogOutResponseData != null)
{
- d = new AdminLogOutResposeAllData {adminLogOutResponseData = security.adminLogOutResponseData };
+ d = new AdminLogOutResposeAllData { adminLogOutResponseData = adminLogOutResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
else
@@ -7427,17 +6948,8 @@
/// 閫�鍑虹鐞嗗憳鐧婚檰鐨勮繑鍥炴暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AdminLogOutResposeAllData
+ public class AdminLogOutResposeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 閫�鍑虹鐞嗗憳鐧婚檰鐨勮繑鍥炴暟鎹�
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs
index 7006480..ad523d5 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/Scene.cs
@@ -36,35 +36,6 @@
}
/// <summary>
- /// 缃戝叧涓満鏅澶囧垪琛�
- /// </summary>
- //[Newtonsoft.Json.JsonIgnore]
- //public List<GetSceneDeviceListInfo> SceneDeviceList = new List<GetSceneDeviceListInfo>();
-
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- ErrorResponData errResponData;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- [System.Serializable]
- public class ErrorResponData
- {
- /// <summary>
- /// Error鍙傛暟鍚箟
- ///<para>1锛氱綉鍏虫棤娉曡В鏋愬懡浠ゆ暟鎹��</para>
- ///<para>2锛氬崗璋冨櫒姝ｅ湪鍗囩骇鎴栧浠�/鎭㈠鏁版嵁
- ///<para>3锛氭搷浣滆澶�/缁�/鍦烘櫙涓嶅瓨鍦�</para>
- ///<para>4锛氬叾浠栭敊璇�</para>
- ///<para>5锛氭暟鎹紶杈撻敊璇紙鍦ㄦ煇娆″鎴风鍚戠綉鍏冲彂閫佹暟鎹殑杩囩▼涓紝缃戝叧鍦ㄥ悎鐞嗘椂闂磋寖鍥村唴鎺ユ敹瀹㈡埛绔暟鎹笉瀹屾暣瀵艰嚧璇ラ敊璇彂鐢熴�傚瀹㈡埛绔悜缃戝叧涓�娆″彂閫�100涓瓧鑺傜殑鏁版嵁锛屼絾缃戝叧绛夊緟鎺ユ敹浜嗕竴绉掑彧鎺ユ敹浜�80涓瓧鑺傘�傚彂鐢熻閿欒锛岀綉鍏冲皢涓诲姩鍏抽棴瀹㈡埛绔繛鎺ワ級</para>
- /// </summary>
- public int Error;
- }
-
- /// <summary>
/// 绛夊緟浠庣綉鍏虫帴鏀舵暟鎹殑鏃堕棿
/// </summary>
/// <value>The wait receive data time.</value>
@@ -160,8 +131,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -175,16 +145,15 @@
if (topic == gatewayID + "/" + "Scene/GetNewId_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.getSceneIdData = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene.GetSceneIdData>(jobject["Data"].ToString());
- if (scene.getSceneIdData == null)
+ var getSceneIdData = Newtonsoft.Json.JsonConvert.DeserializeObject<Scene.GetSceneIdData>(jobject["Data"].ToString());
+ if (getSceneIdData == null)
{
d = new GetSceneIdAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
GetSceneAllInfoAsync();
- d = new GetSceneIdAllData { getSceneIdData = scene.getSceneIdData };
+ d = new GetSceneIdAllData { getSceneIdData = getSceneIdData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -239,17 +208,8 @@
/// 鍒涘缓涓�涓┖鍦烘櫙杩斿洖鐨勬暟鎹�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetSceneIdAllData
+ public class GetSceneIdAllData:CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒涘缓涓�涓┖鍦烘櫙杩斿洖鐨勬暟鎹�
/// </summary>
@@ -291,7 +251,7 @@
d = new GetSceneAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
return d;
}
- ZbGateway.AllSceneList.Clear();
+
var dateTime = DateTime.Now;
Action<string, string> action = (topic, message) => {
var gatewayID = topic.Split('/')[0];
@@ -299,8 +259,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -315,31 +274,15 @@
if (topic == gatewayID + "/" + "Scene/GetAllInfo_Respon")
{
dateTime = DateTime.Now;
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneAllInfo>(jobject["Data"].ToString());
+ var sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneAllInfo>(jobject["Data"].ToString());
- if (scene.sceneGetAllInfo == null)
+ if (sceneGetAllInfo == null)
{
d = new GetSceneAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- var info = ZbGateway.AllSceneList.Find(obj => obj.ScenesId == scene.sceneGetAllInfo.ScenesId);
- if (info == null)
- {
- ZbGateway.AllSceneList.Add(scene.sceneGetAllInfo);
- }
- else
- {
- info.DeviceList = scene.sceneGetAllInfo.DeviceList;
- info.DeviceSum = scene.sceneGetAllInfo.DeviceSum;
- info.IsOpen = scene.sceneGetAllInfo.IsOpen;
- info.ScenesId = scene.sceneGetAllInfo.ScenesId;
- info.ScenesName = scene.sceneGetAllInfo.ScenesName;
- info.ScenesNum = scene.sceneGetAllInfo.ScenesNum;
- info.ScenesSum = scene.sceneGetAllInfo.ScenesSum;
- }
- d = new GetSceneAllData { getSceneAllInfo = scene.sceneGetAllInfo };
+ d = new GetSceneAllData { getSceneAllInfo = sceneGetAllInfo };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -372,17 +315,8 @@
/// 鑾峰彇鎵�鏈夊満鏅殑鎵�鏈変俊鎭�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetSceneAllData
+ public class GetSceneAllData:CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鑾峰彇鎵�鏈夊満鏅殑鎵�鏈変俊鎭�
/// </summary>
@@ -448,7 +382,6 @@
///<para>2锛氬欢鏃舵垚鍛�</para>
/// </summary>
public int Type;
-
/// <summary>
/// 璁惧mac鍦板潃 锛�
///<para>褰揟ype=0鏃跺瓨鍦ㄣ��</para>
@@ -460,21 +393,15 @@
/// </summary>
public int Epoint;
/// <summary>
- /// 璁惧鍚嶇О
- /// </summary>
- public string DeviceName;
- /// <summary>
/// 璁惧鍒楄〃
/// 褰揟ype=0鏃跺瓨鍦�
/// </summary>
public List<Safeguard.TaskListInfo> TaskList = new List<Safeguard.TaskListInfo>();
-
/// <summary>
/// 鍦烘櫙鎴愬憳鐨勫満鏅痠d
/// <para>褰揟ype=1鏃跺瓨鍦�</para>
/// </summary>
public int ElseScenesId;
-
/// <summary>
///寤舵椂鎵ц鏃堕棿锛屽崟浣嶇銆�
/// </summary>
@@ -493,7 +420,6 @@
///</summary>
public static async System.Threading.Tasks.Task<List<GetSceneAllInfo>> GetSceneListAsync()
{
- ZbGateway.AllSceneList.Clear();
return await System.Threading.Tasks.Task.Run(async () => {
var dateTime = DateTime.Now;
GetSceneAllData d = null;
@@ -503,6 +429,8 @@
d = new GetSceneAllData { errorMessageBase = "褰撳墠娌℃湁涓荤綉鍏�" };
return null;
}
+
+ var listScene = new List<GetSceneAllInfo>();
Action<string, string> action = (topic, message) =>
{
var gatewayID = topic.Split('/')[0];
@@ -511,24 +439,9 @@
if (topic == gatewayID + "/" + "Scene/GetAllInfo_Respon")
{
dateTime = DateTime.Now;
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneAllInfo>(jobject["Data"].ToString());
+ var sceneGetAllInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneAllInfo>(jobject["Data"].ToString());
+ listScene.Add(sceneGetAllInfo);
- var info = ZbGateway.AllSceneList.Find(obj => obj.ScenesId == scene.sceneGetAllInfo.ScenesId);
- if (info == null)
- {
- ZbGateway.AllSceneList.Add(scene.sceneGetAllInfo);
- }
- else
- {
- info.DeviceList = scene.sceneGetAllInfo.DeviceList;
- info.DeviceSum = scene.sceneGetAllInfo.DeviceSum;
- info.IsOpen = scene.sceneGetAllInfo.IsOpen;
- info.ScenesId = scene.sceneGetAllInfo.ScenesId;
- info.ScenesName = scene.sceneGetAllInfo.ScenesName;
- info.ScenesNum = scene.sceneGetAllInfo.ScenesNum;
- info.ScenesSum = scene.sceneGetAllInfo.ScenesSum;
- }
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
};
@@ -549,7 +462,7 @@
mainGateway.Actions -= action;
System.Console.WriteLine("Scene/GetAllInfo_Actions 閫�鍑�" + System.DateTime.Now.ToString());
- return ZbGateway.AllSceneList;
+ return listScene;
});
}
#endregion
@@ -644,22 +557,9 @@
/// <summary>
///鑾峰彇鍦烘櫙淇℃伅,缃戝叧鍙嶉淇℃伅
/// </summary>
- GetOnlySceneAllData getOnlySceneAllData;
- /// <summary>
- ///鑾峰彇鍦烘櫙淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- class GetOnlySceneAllData
+ class GetOnlySceneAllData:CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鑾峰彇鍦烘櫙淇℃伅
/// </summary>
@@ -734,8 +634,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -749,26 +648,15 @@
if (topic == gatewayID + "/" + "Scene/GetDeviceList_Respon")
{
- var sceneTemp = new Scene() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.getGatewayBaseInfo.gwID };
- sceneTemp.sceneGetDeviceListObj = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneDeviceListInfo>(jobject["Data"].ToString());
+ var sceneGetDeviceListObj = Newtonsoft.Json.JsonConvert.DeserializeObject<GetSceneDeviceListInfo>(jobject["Data"].ToString());
- if (sceneTemp.sceneGetDeviceListObj == null)
+ if (sceneGetDeviceListObj == null)
{
d = new GetSceneDeviceListAllInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- var sDev = mainGateway.SceneDeviceList.Find(obj => obj.ScenesId == sceneTemp.sceneGetDeviceListObj.ScenesId);
- if (sDev == null)
- {
- ZbGateway.MainGateWay.SceneDeviceList.Add(sceneTemp.sceneGetDeviceListObj);
- }
- else
- {
- sDev.DeviceList = sceneTemp.sceneGetDeviceListObj.DeviceList;
- }
-
- d = new GetSceneDeviceListAllInfo { getSceneDeviceListInfo = sceneTemp.sceneGetDeviceListObj };
+ d = new GetSceneDeviceListAllInfo { getSceneDeviceListInfo = sceneGetDeviceListObj };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -815,17 +703,8 @@
///鑾峰彇鍦烘櫙鐨勮澶囧垪琛ㄤ俊鎭�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class GetSceneDeviceListAllInfo
+ public class GetSceneDeviceListAllInfo : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鑾峰彇鍦烘櫙鐨勮澶囧垪琛ㄤ俊鎭�
/// </summary>
@@ -893,8 +772,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -908,16 +786,15 @@
if (topic == gatewayID + "/" + "Scene/AddMember_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.addSceneMemberData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddSceneMemberResponseData>(jobject["Data"].ToString());
+ var addSceneMemberData = Newtonsoft.Json.JsonConvert.DeserializeObject<AddSceneMemberResponseData>(jobject["Data"].ToString());
- if (scene.addSceneMemberData == null)
+ if (addSceneMemberData == null)
{
d = new AddSceneMemberResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new AddSceneMemberResponseAllData { addSceneMemberResponseData = scene.addSceneMemberData };
+ d = new AddSceneMemberResponseAllData { addSceneMemberResponseData = addSceneMemberData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -1010,17 +887,8 @@
/// 鑾峰彇鍦烘櫙涓坊鍔犵殑鎴愬憳,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class AddSceneMemberResponseAllData
+ public class AddSceneMemberResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鑾峰彇鍦烘櫙涓坊鍔犵殑鎴愬憳
/// </summary>
@@ -1166,8 +1034,7 @@
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1180,16 +1047,15 @@
}
if (topic == gatewayID + "/" + "Scene/RemoveMember_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.removeSceneMemberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveSceneMemberResponseData>(jobject["Data"].ToString());
+ var removeSceneMemberResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveSceneMemberResponseData>(jobject["Data"].ToString());
- if (scene.removeSceneMemberResponseData == null)
+ if (removeSceneMemberResponseData == null)
{
d = new RemoveSceneMemberResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new RemoveSceneMemberResponseAllData { removeSceneMemberResponseData = scene.removeSceneMemberResponseData };
+ d = new RemoveSceneMemberResponseAllData { removeSceneMemberResponseData = removeSceneMemberResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -1341,17 +1207,8 @@
/// 绉婚櫎鍦烘櫙鎴愬憳淇℃伅鍙嶉,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class RemoveSceneMemberResponseAllData
+ public class RemoveSceneMemberResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 绉婚櫎鍦烘櫙鎴愬憳淇℃伅鍙嶉
/// </summary>
@@ -1442,8 +1299,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1457,16 +1313,15 @@
if (topic == gatewayID + "/" + "Scene/Rename_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("DataID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.sceneRenameResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SceneRenameResponseData>(jobject["Data"].ToString());
+ var sceneRenameResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<SceneRenameResponseData>(jobject["Data"].ToString());
- if (scene.sceneRenameResponseData == null)
+ if (sceneRenameResponseData == null)
{
d = new SceneRenameResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new SceneRenameResponseAllData { sceneRenameResponseData = scene.sceneRenameResponseData };
+ d = new SceneRenameResponseAllData { sceneRenameResponseData = sceneRenameResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -1510,17 +1365,8 @@
/// 淇敼鍦烘櫙鍚嶇О
/// </summary>
[System.Serializable]
- public class SceneRenameResponseAllData
+ public class SceneRenameResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇敼鍦烘櫙鍚嶇О
/// </summary>
@@ -1582,8 +1428,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1597,26 +1442,15 @@
if (topic == gatewayID + "/" + "Scene/Remove_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.removeSceneData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveSceneData>(jobject["Data"].ToString());
- if (scene.removeSceneData == null)
+ var removeSceneData = Newtonsoft.Json.JsonConvert.DeserializeObject<RemoveSceneData>(jobject["Data"].ToString());
+ if (removeSceneData == null)
{
d = new RemoveSceneAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
return;
}
else
{
- for (int listCount = 0; listCount < ZigBee.Device.ZbGateway.AllSceneList.Count; listCount++)
- {
- var sc = ZbGateway.AllSceneList[listCount];
-
- if (scene.removeSceneData.ScenesId == sc.ScenesId)
- {
- ZigBee.Device.ZbGateway.AllSceneList.RemoveAt(listCount);
- listCount--;
- }
- }
- d = new RemoveSceneAllData { removeSceneData = scene.removeSceneData };
+ d = new RemoveSceneAllData { removeSceneData = removeSceneData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -1660,17 +1494,8 @@
/// 绉婚櫎鍦烘櫙,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class RemoveSceneAllData
+ public class RemoveSceneAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 绉婚櫎鍦烘櫙
/// </summary>
@@ -1724,8 +1549,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1739,15 +1563,14 @@
if (topic == gatewayID + "/" + "Scene/Open_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.sceneOpen = Newtonsoft.Json.JsonConvert.DeserializeObject<SceneOpenData>(jobject["Data"].ToString());
- if (scene.sceneOpen == null)
+ var sceneOpen = Newtonsoft.Json.JsonConvert.DeserializeObject<SceneOpenData>(jobject["Data"].ToString());
+ if (sceneOpen == null)
{
d = new SceneOpenAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new SceneOpenAllData { sceneOpenData = scene.sceneOpen };
+ d = new SceneOpenAllData { sceneOpenData = sceneOpen };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
@@ -1793,17 +1616,8 @@
/// 璋冪敤鍦烘櫙,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class SceneOpenAllData
+ public class SceneOpenAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 璋冪敤鍦烘櫙
/// </summary>
@@ -1861,8 +1675,7 @@
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = mainGateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1875,16 +1688,15 @@
}
if (topic == gatewayID + "/" + "Scene/CatDelayScene_Respon")
{
- var scene = new Scene() { DataID = jobject.Value<int>("Data_ID"), GateWayId = mainGateway.CurrentGateWayId };
- scene.catDelaySceneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatDelaySceneResponseData>(jobject["Data"].ToString());
+ var catDelaySceneResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CatDelaySceneResponseData>(jobject["Data"].ToString());
- if (scene.catDelaySceneResponseData == null)
+ if (catDelaySceneResponseData == null)
{
d = new CatDelaySceneResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new CatDelaySceneResponseAllData { catDelaySceneResponseData = scene.catDelaySceneResponseData };
+ d = new CatDelaySceneResponseAllData { catDelaySceneResponseData = catDelaySceneResponseData };
System.Console.WriteLine($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -1924,17 +1736,8 @@
/// 鏌ョ湅姝ｅ湪寤舵椂鐨勫満鏅俊鎭弽棣�,缃戝叧鍙嶉淇℃伅
/// </summary>
[System.Serializable]
- public class CatDelaySceneResponseAllData
+ public class CatDelaySceneResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅姝ｅ湪寤舵椂鐨勫満鏅俊鎭俊鎭弽棣�
/// </summary>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ThirdPartyModuleUpgrade.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ThirdPartyModuleUpgrade.cs
deleted file mode 100755
index 489ce45..0000000
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ThirdPartyModuleUpgrade.cs
+++ /dev/null
@@ -1,247 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-
-namespace ZigBee.Device
-{
- public class ThirdPartyModuleUpgrade : CommonDevice
- {
- #region 鑾峰彇浜戠(绗笁鏂规ā鍧楋級鍥轰欢淇℃伅
- /// <summary>
- /// 鑾峰彇浜戠鏈嶅姟鍣ㄤ腑鍥轰欢鐗堟湰淇℃伅
- /// </summary>
- /// <returns>The https app version async.</returns>
- public async System.Threading.Tasks.Task<ThirdPartyModuelInfoOBJ> RequestHttpsAcVersionAsync(string firewareName)
- {
- try
- {
- var requestOBJ = new GetFirmwareInfoOBJ
- {
- Name = firewareName,
- RequestVersion = "CodeIDString",//鎸夌収閮鎴愯鐨勫綋鍓峚pp鏄摢涓増鏈�
- FirmwareManaFirstType = 2
- };
- var requestJson = Newtonsoft.Json.JsonConvert.SerializeObject(requestOBJ);
- var result = await RequestHttpsZigbeeAsync("FirmwareMana/DetectionPlatformUploadFirmware", System.Text.Encoding.UTF8.GetBytes(requestJson));
- if (result == null)
- {
- return null;
- }
- if (result.StateCode.ToUpper() == "SUCCESS")
- {
- if (result.ResponseData == null)
- {
- return null;
- }
-
- var responeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ThirdPartyModuelInfoRes>(result.ResponseData.ToString());
- if (responeData == null || responeData.pageData == null)
- {
- return null;
- }
- // int MaxIndex = 0;
- //int NewID = 0;
- //for (int i = 0; i < responeData.pageData.Count; i++)
- //{
- //var moduleInfo = responeData.pageData[i];
- // if (int.Parse(moduleInfo.Id) > NewID)
- // {
- // NewID = int.Parse(moduleInfo.Id);
- // MaxIndex = i;
- // }
- //}
-
- return responeData.pageData[0];
- }
- return null;
- }
- catch (Exception ex)
- {
- return null;
- }
- }
-
- /// 涓嬭浇浜戠鍥轰欢鐨勬暟鎹�
- /// </summary>
- [Serializable]
- public class ThirdPartyModuelInfoOBJ
- {
- public string Name { get; set; }
- public string FirmwareVersion { get; set; }
- public string Remarks { get; set; }
- public string DistributedMark { get; set; }
- public string Id { get; set; }
- public string CreatedOnUtc { get; set; }
- }
-
- /// <summary>
- /// 鑾峰彇浜戠鍥轰欢鐨勬暟鎹�
- /// </summary>
- public class GetFirmwareInfoOBJ
- {
- public string RequestVersion;
- /// <summary>
- /// Name 鎼滅储鍥轰欢鍚嶇О(鍥轰欢鍚嶇О锛�
- /// </summary>
- public string Name;
- /// <summary>
- /// 鎼滅储绗竴绾у垎绫�(0:App 1:Zigbee缃戝叧 2:Zigbee 璁惧,3:Buspro锛�
- /// </summary>
- public int FirmwareManaFirstType;
- }
-
- //[Serializable]
- public class ThirdPartyModuelInfoRes
- {
- public int PageIndex;
- public int PageSize;
- public int TotalCount;
- public int TotalPages;
- public bool HasPreviousPage;
- public bool HasNextPage;
- public List<ThirdPartyModuelInfoOBJ> pageData = new List<ThirdPartyModuelInfoOBJ> { };
- }
-
- string RequestHttpsHost = "https://global.hdlcontrol.com/HangZhouHdlCloudApi";
- /// <summary>
- /// 璇锋眰鏈嶅姟鍣ㄦ柟娉�
- /// 鎸囧畾涓�涓猆rl,鍜岃姹傛柟娉曪紝鏁版嵁锛孋ookie锛屽緱鍒板搷搴旂殑鏁版嵁
- /// </summary>
- /// <param name="requestUrl">璇锋眰Url</param>
- /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
- /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<byte[]> RequestHttpsZigbeeBytesResultAsync(string requestUrl, byte[] byteData)
- {
- try
- {
- //鍒濆鍖栨柊鐨剋ebRequst
- //1锛� 鍒涘缓httpWebRequest瀵硅薄
- var webRequest = (System.Net.HttpWebRequest)System.Net.WebRequest.Create(new Uri($"{RequestHttpsHost}/{requestUrl}"));
- //2锛� 鍒濆鍖朒ttpWebRequest瀵硅薄
- webRequest.Method = "POST";
- webRequest.ContentType = "application/json";
- webRequest.ContentLength = byteData.Length;
- webRequest.Headers.Add(System.Net.HttpRequestHeader.Authorization, Shared.Common.Config.Instance.Token);
- //3锛� 闄勫姞瑕丳OST缁欐湇鍔″櫒鐨勬暟鎹埌HttpWebRequest瀵硅薄(闄勫姞POST鏁版嵁鐨勮繃绋嬫瘮杈冪壒娈婏紝瀹冨苟娌℃湁鎻愪緵涓�涓睘鎬х粰鐢ㄦ埛瀛樺彇锛岄渶瑕佸啓鍏ttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰銆�)
- var newStream = webRequest.GetRequestStream();//鍒涘缓涓�涓猄tream,璧嬪�兼槸鍐欏叆HttpWebRequest瀵硅薄鎻愪緵鐨勪竴涓猻tream閲岄潰
- newStream.Write(byteData, 0, byteData.Length);
- newStream.Flush();
- newStream.Close();
- //4锛� 璇诲彇鏈嶅姟鍣ㄧ殑杩斿洖淇℃伅
- var response = (System.Net.HttpWebResponse)webRequest.GetResponse();
- var stream = response.GetResponseStream();
- if (stream == null)
- {
- return null;
- }
- var result = new byte[stream.Length];
- //宸叉帴鏀剁殑闀垮害
- int receivedLength = 0;
- //娉ㄦ剰锛屽綋鏁版嵁姣旇緝澶ф椂锛屽彲鑳戒竴娆℃�ф病璇诲畬锛岄渶瑕侀噸澶嶈鍙�
- //褰撳畬鎴愭椂鍙兘杩斿洖鐨勭粨鏋滀负 0
- while (receivedLength < result.Length)
- {
- var rece = await stream.ReadAsync(result, receivedLength, result.Length - receivedLength);
- receivedLength += rece;
- if (rece == 0)
- {
- break;
- }
- }
- stream.Close();
- response.Close();
- return result;
- }
- catch (Exception e)
- {
- System.Console.WriteLine(e.Message);
- return null;
- }
- }
-
- /// <summary>
- /// 璇锋眰鏈嶅姟鍣ㄦ柟娉�
- /// 鎸囧畾涓�涓猆rl,鍜岃姹傛柟娉曪紝鏁版嵁锛孋ookie锛屽緱鍒板搷搴旂殑鏁版嵁
- /// </summary>
- /// <param name="requestUrl">璇锋眰Url</param>
- /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
- /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<string> RequestHttpsZigbeeResultAsync(string requestUrl, byte[] byteData)
- {
- var result = await RequestHttpsZigbeeBytesResultAsync(requestUrl, byteData);
- if (result != null)
- {
- return System.Text.Encoding.UTF8.GetString(result);
- }
- return null;
- }
-
- /// <summary>
- /// 璇锋眰鏈嶅姟鍣ㄦ柟娉�
- /// 鎸囧畾涓�涓猆rl,鍜岃姹傛柟娉曪紝鏁版嵁锛孋ookie锛屽緱鍒板搷搴旂殑鏁版嵁
- /// </summary>
- /// <param name="requestUrl">璇锋眰Url</param>
- /// <param name="byteData">璇锋眰鐨勭殑鏁版嵁</param>
- /// <returns>寰楀埌鍝嶅簲鐨勬暟鎹�</returns>
- public async System.Threading.Tasks.Task<Shared.Common.ResponseEntity.ResponsePack> RequestHttpsZigbeeAsync(string requestUrl, byte[] byteData)
- {
- string result = await this.RequestHttpsZigbeeResultAsync(requestUrl, byteData);
- if (result != null)
- {
- try
- {
- var data = Newtonsoft.Json.JsonConvert.DeserializeObject<Shared.Common.ResponseEntity.ResponsePack>(result);
- return data;
- }
- catch (Exception ex)
- {
- System.Console.WriteLine(ex.Message);
- }
- }
- return null;
- }
-
- /// <summary>
- /// 涓嬭浇Ac绋嬪簭
- /// </summary>
- /// <returns>The load apk async.</returns>
- /// <param name="requestUrl">璇锋眰閾炬帴</param>
- /// <param name="byteData">璇锋眰鍙傛暟</param>
- public System.Threading.Tasks.Task<byte[]> DownLoadAcAsync(string requestUrl, byte[] byteData)
- {
- try
- {
- var webClient = new System.Net.WebClient { };
- webClient.Headers.Add(System.Net.HttpRequestHeader.ContentType, "application/json");
- webClient.Headers.Add(System.Net.HttpRequestHeader.Authorization, Shared.Common.Config.Instance.Token);
- var result = webClient.UploadDataTaskAsync($"{RequestHttpsHost}/{requestUrl}", "POST", byteData);
- if (result == null)
- {
- return null;
- }
- return result;
- }
- catch (Exception ex)
- {
- return null;
- }
- finally
- {
- }
- }
- #endregion
-
- #region 涓嬭浇鍥轰欢绋嬪簭
- /// <summary>
- /// 涓嬭浇Ac鍥轰欢绋嬪簭
- /// </summary>
- public class DownLoadAcFireware
- {
- public string RequestVersion;
- /// <summary>
- /// 涓嬭浇鍥轰欢鐨勫敮涓�鏍囪瘑
- /// </summary>
- public string DistributedMark;
- }
- #endregion
- }
-}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
index 60c83d9..64b9859 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGateway.cs
@@ -22,14 +22,7 @@
[System.Serializable]
public class ZbGateway : ZbGatewayData
{
- public ZbGateway()
- {
- this.Type = DeviceType.ZbGateway;
- }
-
-
-
- #region 缃戝叧鐗规畩淇℃伅澶勭悊
+ #region 涓�鍫嗗彉閲�
/// <summary>
/// 涓荤綉鍏�
/// </summary>
@@ -71,20 +64,39 @@
/// </summary>
/// <value>The file path.</value>
[Newtonsoft.Json.JsonIgnore]
- public override string FilePath
+ public string FilePath
{
get
{
- var deviceType = Type.ToString();
- var fileName = "Gateway_" + deviceType + "_" + this.getGatewayBaseInfo?.gwID;
+ var fileName = "Gateway_" + DeviceType.ZbGateway.ToString() + "_" + this.getGatewayBaseInfo?.gwID;
return fileName;
+ }
+ }
+
+ /// <summary>
+ /// 绛夊緟浠庣綉鍏虫帴鏀舵暟鎹殑鏃堕棿
+ /// </summary>
+ /// <value>The wait receive data time.</value>
+ [Newtonsoft.Json.JsonIgnore]
+ public int WaitReceiveDataTime
+ {
+ get
+ {
+ if (Device.ZbGateway.RemoteMqttClient != null && Device.ZbGateway.RemoteMqttClient.IsConnected)
+ {
+ return 10000;
+ }
+ else
+ {
+ return 3000;
+ }
}
}
/// <summary>
/// 灞�鍩熺綉鍔犲瘑瀵嗙爜
/// </summary>
- string password;
+ private string password;
/// <summary>
/// 灞�鍩熺綉鍔犲瘑瀵嗛挜
/// </summary>
@@ -101,27 +113,6 @@
}
}
- #region variable
- /// <summary>
- /// 杩滅▼杩炴帴鎴愬姛鏃剁殑鏃堕棿
- /// </summary>
- public static DateTime LoginRemoteDateTime = DateTime.Now;
-
- /// <summary>
- /// 鍚屾鍒拌繙绋嬬殑褰撳墠鏃堕棿鎴�
- /// </summary>Re
- public static ulong CurrentTimeStamp
- {
- get
- {
- return RemoteTimeStamp + (ulong)(DateTime.Now - LoginRemoteDateTime).TotalSeconds;
- }
- }
-
- /// <summary>
- /// 杩滅▼杩炴帴鎴愬姛鏃剁殑鏃堕棿鎴�
- /// </summary>
- public static ulong RemoteTimeStamp;
/// <summary>
/// 缃戝叧鏄惁鍔犲瘑
/// </summary>
@@ -138,37 +129,6 @@
[Newtonsoft.Json.JsonIgnore]
public static List<ZbGateway> GateWayList = new List<ZbGateway>();
- //褰撳墠缃戝叧涓殑璁惧鍒楄〃
- [Newtonsoft.Json.JsonIgnore]
- public List<CommonDevice> DeviceList = new List<CommonDevice>();
-
- /// <summary>
- /// 缃戝叧涓満鏅垪琛�
- /// 涓�涓満鏅腑鍖呭惈鎵�鏈変俊鎭紝鍖呮嫭鍦烘櫙璁惧淇℃伅
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public static List<Scene.GetSceneAllInfo> AllSceneList = new List<Scene.GetSceneAllInfo>();
-
- /// <summary>
- /// 缃戝叧涓満鏅殑璁惧鍒楄〃
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public List<Scene.GetSceneDeviceListInfo> SceneDeviceList = new List<Scene.GetSceneDeviceListInfo>();
-
- #region action variable
- /// <summary>
- /// 鎺ユ敹鏁版嵁鍚庡洖璋�
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- Action<object> action;
- /// <summary>
- /// 璁剧疆鏁版嵁鍥炶皟
- /// </summary>
- public void SetAction(Action<object> action, int timeOut = 1000)
- {
- this.action = action;
- }
-
/// <summary>
/// 缃戝叧鎺ㄩ�佹暟鎹�
/// <para>绗竴涓弬鏁帮細濡傛灉涓� DeviceInComingRespon:璁惧鏂颁笂鎶�</para>
@@ -183,24 +143,15 @@
/// <para>绗竴涓弬鏁帮細濡傛灉涓� ZoneTriggerReport:闃插尯琚Е鍙戞椂鎶ュ憡</para>
/// <para>绗竴涓弬鏁帮細濡傛灉涓� LogicExecuteReport:閫昏緫琚皟鐢ㄥ弽棣�</para>
/// <para>绗竴涓弬鏁帮細濡傛灉涓� TimingWillArrive:鏃堕棿鐐规潯浠舵帹杩熸墽琛�</para>
- /// para>绗竴涓弬鏁帮細 濡傛灉涓� ModeTriggerReport:妯″紡瀹夐槻鍔ㄤ綔琚渶缁堟縺娲绘椂鍙戦�佹姤璀︿俊鎭�</para>
+ /// <para>绗竴涓弬鏁帮細 濡傛灉涓� ModeTriggerReport:妯″紡瀹夐槻鍔ㄤ綔琚渶缁堟縺娲绘椂鍙戦�佹姤璀︿俊鎭�</para>
/// <para>绗竴涓弬鏁帮細濡傛灉涓� EnOrWithdrawSucceedReport:閫氳繃澶栭儴鏂瑰紡甯冮槻鎾ら槻鎴愬姛鏃舵姤鍛婃伅</para>
/// <para>绗竴涓弬鏁帮細濡傛灉涓� PushTargetInfoReport:鑳佽揩瀵嗙爜鎾ら槻鏃剁煭淇℃帹閫�</para>
- /// <para>绗竴涓弬鏁帮細濡傛灉涓� DeviceDefaultAck:鑺傜偣璁惧榛樿鍙嶉</para>
/// <para>绗竴涓弬鏁帮細濡傛灉涓� DDevice/IsGetEpointInfo:鏈夋柊璁惧鍔犲叆zigbee缃戠粶鍙嶉</para>璁惧璇锋眰APP鑾峰彇鍗囩骇鏁版嵁
/// <para>绗竴涓弬鏁帮細濡傛灉涓� Device/DeviceJoinZbNet:鑾峰彇鏂拌澶囨墍鏈夌鐐逛俊鎭槸鍚︽垚鍔熷弽棣�</para>
/// <para>绗竴涓弬鏁帮細濡傛灉涓� DeviceRequestAcUpdateData: 璁惧璇锋眰绌鸿皟鍙戝崌绾ф暟鎹�</para>
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public Action<string, object> ReportAction;
- /// <summary>
- /// 浜戠閫氳閿欒鏁版嵁涓婃姤
- ///<para>"ForwardGatewayNoOnLine", "褰撳墠鎿嶄綔鐨勭綉鍏充笉鍦ㄧ嚎"</para>
- ///<para>"AppTimeOut", "浠庝簯绔幏鍙栨暟鎹秴鏃讹紝璇烽噸鏂拌幏鍙�"</para>
- ///<para>"AppNoLogin", "鐧诲綍杩囨湡锛岃閲嶆柊鐧诲綍"</para>
- /// </summary>
- [Newtonsoft.Json.JsonIgnore]
- public Action<string, string> CloudErrorAction;
/// <summary>
/// 缃戝叧鏂囦欢娴佸唴瀹归�氱煡
@@ -219,8 +170,7 @@
/// </summary>
[Newtonsoft.Json.JsonIgnore]
public Action<string, string> Actions;
- #endregion
- #endregion
+
#endregion
#region 缃戝叧API
@@ -241,8 +191,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -250,24 +199,21 @@
}
else
{
- d = new GetGwVersionAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new GetGwVersionAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "GetZbGwVersionRespon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- gatewayTemp.getGwVersion = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwVersionData>(jobject["Data"].ToString());
+ var getGwVersion = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwVersionData>(jobject["Data"].ToString());
- if (gatewayTemp.getGwVersion == null)
+ if (getGwVersion == null)
{
d = new GetGwVersionAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
}
else
{
- d = new GetGwVersionAllData { getGwVersion = gatewayTemp.getGwVersion };
- AppVersion = gatewayTemp.getGwVersion.AppVersion;
- ZigbeeVersion = gatewayTemp.getGwVersion.ZigbeeVersion;
+ d = new GetGwVersionAllData { getGwVersion = getGwVersion };
//Save();
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
@@ -319,16 +265,15 @@
if (topic == gatewayID + "/" + "GetZbGwInfo_Respon")
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- gatewayTemp.getGwInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwData>(jobject["Data"].ToString());
+ var getGwInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<GetGwData>(jobject["Data"].ToString());
- if (gatewayTemp.getGwInfo == null)
+ if (getGwInfo == null)
{
data = new GetGwAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- data = new GetGwAllData { getGwData = gatewayTemp.getGwInfo };
+ data = new GetGwAllData { getGwData = getGwInfo };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
@@ -373,8 +318,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -382,13 +326,12 @@
}
else
{
- d = new GetMacResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new GetMacResponData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGw/GetMac_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<MacAddrData>(jobject["Data"].ToString());
if (tempData == null)
@@ -443,8 +386,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -452,22 +394,21 @@
}
else
{
- d = new GwReNameAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new GwReNameAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "GwReName_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- gatewayTemp.gwRename = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwReNameData>(jobject["Data"].ToString());
+ var gwRename = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwReNameData>(jobject["Data"].ToString());
- if (gatewayTemp.gwRename == null)
+ if (gwRename == null)
{
d = new GwReNameAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new GwReNameAllData { gwReNameData = gatewayTemp.gwRename };
+ d = new GwReNameAllData { gwReNameData = gwRename };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -526,8 +467,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -535,21 +475,20 @@
}
else
{
- d = new GwSetHomeIdAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new GwSetHomeIdAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "GwSetHomeId_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- gatewayTemp.gwSetHomeId = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwSetHomeIdData>(jobject["Data"].ToString());
- if (gatewayTemp.gwSetHomeId == null)
+ var gwSetHomeId = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GwSetHomeIdData>(jobject["Data"].ToString());
+ if (gwSetHomeId == null)
{
d = new GwSetHomeIdAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new GwSetHomeIdAllData { gwSetHomeIdData = gatewayTemp.gwSetHomeId };
+ d = new GwSetHomeIdAllData { gwSetHomeIdData = gwSetHomeId };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -597,82 +536,6 @@
Actions -= action;
DebugPrintLog("GwReName_Actions 閫�鍑�" + System.DateTime.Now.ToString());
-
- return d;
- });
- }
- #endregion
-
- #region 鑾峰彇缃戝叧璁板綍鐨勮澶囧睘鎬х姸鎬�
- /// <summary>
- ///鑾峰彇缃戝叧璁板綍鐨勮澶囧睘鎬х姸鎬�
- /// </summary>
- public async System.Threading.Tasks.Task<GetStatusRecordAllInfo> GetStatusRecordAsync(string deviceAddr, int deviceEpoint)
- {
- return await System.Threading.Tasks.Task.Run(async () =>
- {
- GetStatusRecordAllInfo d = null;
- Action<string, string> action = (topic, message) =>
- {
- var gatewayID = topic.Split('/')[0];
- var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
-
- if (topic == gatewayID + "/" + "Error_Respon")
- {
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
-
- if (temp == null)
- {
- d = new GetStatusRecordAllInfo { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
- }
- else
- {
- d = new GetStatusRecordAllInfo { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
- }
- }
-
- if (topic == gatewayID + "/" + "GetStatusRecord_Respon")
- {
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- gatewayTemp.getStatusRecordInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.GetStatusRecordInfo>(jobject["Data"].ToString());
-
- if (gatewayTemp.getStatusRecordInfo == null)
- {
- d = new GetStatusRecordAllInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- }
- else
- {
- d = new GetStatusRecordAllInfo { getStatusRecordInfo = gatewayTemp.getStatusRecordInfo };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- }
- }
- };
- Actions += action;
- DebugPrintLog("GetStatusRecord_Actions 鍚姩" + System.DateTime.Now.ToString());
- try
- {
- var jObject = new JObject { { "DeviceAddr", deviceAddr }, { "Epoint", deviceEpoint }, { "Cluster_ID", 0 }, { "Command", 80 } };
- Send("GetStatusRecord", jObject.ToString());
-
- }
- catch { }
-
- var dateTime = DateTime.Now;
- while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
- {
- await System.Threading.Tasks.Task.Delay(10);
- if (d != null)
- {
- break;
- }
- }
- if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
- {
- d = new GetStatusRecordAllInfo { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- }
- Actions -= action;
- DebugPrintLog("GetStatusRecord_Actions 閫�鍑�" + System.DateTime.Now.ToString());
return d;
});
@@ -743,8 +606,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -752,13 +614,12 @@
}
else
{
- d = new GwLinuxResetResponData { errorMessageBase = ErrorMess(temp.Error) };
+ d = new GwLinuxResetResponData { errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "GwLinuxReset_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"].ToString());
if (result == null)
@@ -821,8 +682,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -830,13 +690,12 @@
}
else
{
- d = new GwRebootResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new GwRebootResponAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "GwReboot_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"].ToString());
if (result == null)
@@ -897,8 +756,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -906,22 +764,21 @@
}
else
{
- d = new SaveNVFileResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new SaveNVFileResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGwOperation/SaveNVFile_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.zbGwOperationSaveNVFileData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.SaveNVFileResponseData>(jobject["Data"].ToString());
+ var zbGwOperationSaveNVFileData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.SaveNVFileResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.zbGwOperationSaveNVFileData == null)
+ if (zbGwOperationSaveNVFileData == null)
{
d = new SaveNVFileResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new SaveNVFileResponseAllData { saveNVFileResponseData = gatewayTemp.zbGwOperationSaveNVFileData };
+ d = new SaveNVFileResponseAllData { saveNVFileResponseData = zbGwOperationSaveNVFileData };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -975,8 +832,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -984,14 +840,13 @@
}
else
{
- d = new RestoreNVAllDtta { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new RestoreNVAllDtta { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGwOperation/RestoreNV_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.RestoreNVDtta>(jobject["Data"].ToString());
if (tempData == null)
@@ -1055,21 +910,19 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
d = new GwGetChannelResponData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
}
else
{
- d = new GwGetChannelResponData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new GwGetChannelResponData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGw/GetChannel_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var channel = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Channel"].ToString());
d = new GwGetChannelResponData { channel = channel };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
@@ -1123,8 +976,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1132,13 +984,12 @@
}
else
{
- d = new ChangeChannelResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new ChangeChannelResponAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGw/ChangeChannel_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var tempInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<ChangeChannelResponData>(jobject["Data"].ToString());
if (tempInfo == null)
@@ -1217,8 +1068,11 @@
/// </summary>
public async System.Threading.Tasks.Task<Panel.PanelSwitchLevelInfo> ClientDataPassthroughBytesAsync(string deviceAddr, int devicePoint, long dataLength, byte[] passData)
{
+ var myDevice = Shared.Common.LocalDevice.Current.GetDevice(deviceAddr, devicePoint);
+
Panel.PanelSwitchLevelInfo result = null;
- if (Gateway == null)
+
+ if (myDevice.Gateway == null)
{
result = new Panel.PanelSwitchLevelInfo { errorMessageBase = "褰撳墠娌℃湁缃戝叧" };
return result;
@@ -1232,8 +1086,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = Gateway.getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1242,24 +1095,23 @@
else
{
- result = new Panel.PanelSwitchLevelInfo { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ result = new Panel.PanelSwitchLevelInfo { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthroughResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.clientDataPassthroughResponseData == null)
+ if (clientDataPassthroughResponseData == null)
{
result = new Panel.PanelSwitchLevelInfo { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- if (gatewayTemp.clientDataPassthroughResponseData?.PassData != null)
+ if (clientDataPassthroughResponseData?.PassData != null)
{
- var data = gatewayTemp.clientDataPassthroughResponseData.PassData;
+ var data = clientDataPassthroughResponseData.PassData;
if (data.Length == 14)
{
var command = data[4].ToString() + data[5].ToString() + data[2].ToString() + data[3].ToString();
@@ -1276,7 +1128,7 @@
}
};
- Gateway.Actions += action;
+ myDevice.Gateway.Actions += action;
System.Console.WriteLine("ClientDataPassthrough_Actions 鍚姩" + System.DateTime.Now.ToString());
try
@@ -1317,7 +1169,7 @@
{
result = new Panel.PanelSwitchLevelInfo { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
- Gateway.Actions -= action;
+ myDevice.Gateway.Actions -= action;
System.Console.WriteLine("ClientDataPassthrough_Actions 閫�鍑�" + System.DateTime.Now.ToString());
return result;
@@ -1346,8 +1198,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1355,24 +1206,16 @@
}
else
{
- d = new PassthroughAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new PassthroughAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbDataPassthrough")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<string>(jobject["Data"].ToString());
- if (gatewayTemp.getGwVersion == null)
- {
- d = new PassthroughAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
- }
- else
- {
- d = new PassthroughAllData { passData = temp };
- DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
- }
+ d = new PassthroughAllData { passData = temp };
+ DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
};
Actions += action;
@@ -1425,8 +1268,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = this.getGatewayBaseInfo?.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1435,13 +1277,12 @@
else
{
- d = new LinuxUpgradeAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new LinuxUpgradeAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGwOperation/LinuxUpgrade_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
d = new LinuxUpgradeAllData { Result = result };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
@@ -1502,8 +1343,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1512,22 +1352,21 @@
else
{
- d = new ZbGwOperationUpgradeAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new ZbGwOperationUpgradeAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "ZbGwOperation/Upgrade_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.zbGwOperationUpgradeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ZbGwOperationUpgradeData>(jobject["Data"].ToString());
+ zbGwOperationUpgradeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ZbGwOperationUpgradeData>(jobject["Data"].ToString());
- if (gatewayTemp.zbGwOperationUpgradeData == null)
+ if (zbGwOperationUpgradeData == null)
{
d = new ZbGwOperationUpgradeAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new ZbGwOperationUpgradeAllData { bGwOperationUpgradeData = gatewayTemp.zbGwOperationUpgradeData };
+ d = new ZbGwOperationUpgradeAllData { bGwOperationUpgradeData = zbGwOperationUpgradeData };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -1573,11 +1412,11 @@
/// <returns>The file async.</returns>
/// <param name="distributedMark">Distributed mark:鍥轰欢鍞竴鏍囪瘑</param>
/// <param name="imageName">Image name:鍥轰欢鐗堟湰</param>
- public async System.Threading.Tasks.Task<DownloadFileResponAllData> DownloadFileAsync(string distributedMark, string imageName)
+ public async System.Threading.Tasks.Task<CommonDevice.DownloadFileResponAllData> DownloadFileAsync(string distributedMark, string imageName)
{
return await System.Threading.Tasks.Task.Run(async () =>
{
- DownloadFileResponAllData d = null; ;
+ CommonDevice.DownloadFileResponAllData d = null; ;
Action<string, string> action = (topic, message) =>
{
var gatewayID = topic.Split('/')[0];
@@ -1585,32 +1424,30 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
- d = new DownloadFileResponAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
+ d = new CommonDevice.DownloadFileResponAllData { errorMessageBase = "缃戝叧閿欒鍥炲锛屼笖鏁版嵁鏄┖" };
}
else
{
- d = new DownloadFileResponAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new CommonDevice.DownloadFileResponAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "DownloadFile_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.downloadFileResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DownloadFileResponData>(jobject["Data"].ToString());
+ var downloadFileResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DownloadFileResponData>(jobject["Data"].ToString());
- if (gatewayTemp.downloadFileResponData == null)
+ if (downloadFileResponData == null)
{
- d = new DownloadFileResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
+ d = new CommonDevice.DownloadFileResponAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new DownloadFileResponAllData { downloadFileResponData = gatewayTemp.downloadFileResponData };
+ d = new CommonDevice.DownloadFileResponAllData { downloadFileResponData = downloadFileResponData };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -1641,7 +1478,7 @@
}
if ((DateTime.Now - dateTime).TotalMilliseconds > 30 * 1000)
{
- d = new DownloadFileResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
+ d = new CommonDevice.DownloadFileResponAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
}
Actions -= action;
@@ -1668,8 +1505,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1678,22 +1514,21 @@
else
{
- d = new CheckVDDriveCodeResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new CheckVDDriveCodeResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "VirtualDrive/CatDriveCode_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.vDriveDriveCodeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VDriveDriveCodeResponData>(jobject["Data"].ToString());
+ var vDriveDriveCodeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VDriveDriveCodeResponData>(jobject["Data"].ToString());
- if (gatewayTemp.vDriveDriveCodeResponData == null)
+ if (vDriveDriveCodeResponData == null)
{
d = new CheckVDDriveCodeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new CheckVDDriveCodeResponseAllData { vDriveDriveCodeResponData = gatewayTemp.vDriveDriveCodeResponData };
+ d = new CheckVDDriveCodeResponseAllData { vDriveDriveCodeResponData = vDriveDriveCodeResponData };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
}
}
@@ -1748,8 +1583,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1758,22 +1592,21 @@
else
{
- d = new VirtualDriveUpgradeResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ d = new VirtualDriveUpgradeResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "VirtualDrive/Upgrade_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.virtualDriveUpgradeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VirtualDriveUpgradeResponData>(jobject["Data"].ToString());
+ virtualDriveUpgradeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VirtualDriveUpgradeResponData>(jobject["Data"].ToString());
- if (gatewayTemp.virtualDriveUpgradeResponData == null)
+ if (virtualDriveUpgradeResponData == null)
{
d = new VirtualDriveUpgradeResponseAllData { errorMessageBase = "缃戝叧杩斿洖鐨勬暟鎹负绌�" };
}
else
{
- d = new VirtualDriveUpgradeResponseAllData { virtualDriveUpgradeResponData = gatewayTemp.virtualDriveUpgradeResponData };
+ d = new VirtualDriveUpgradeResponseAllData { virtualDriveUpgradeResponData = virtualDriveUpgradeResponData };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{topic}");
}
}
@@ -1811,115 +1644,6 @@
#endregion
- //#region 涓婁紶绉佹湁鏁版嵁
- //private bool backupSuccess = false;
- /// <summary>
- /// 涓婁紶绉佹湁鏁版嵁
- /// </summary>
- /// <returns>The data to gateway.</returns>
- /// <param name="fileName">File name.</param>
- /// <param name="dev">Dev.</param>
- //public async System.Threading.Tasks.Task<SendFileResponseAllData> BackupDataToGateway(string fileName, CommonDevice dev)
- //{
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // SendFileResponseAllData backUpStatus = null;
- // var file = await System.Threading.Tasks.Task.Factory.StartNew(() => Newtonsoft.Json.JsonConvert.SerializeObject(dev));
- // var data = System.Text.Encoding.UTF8.GetBytes(file);
- // //缃戝叧涓垱寤哄瓨鍌ㄦ暟鎹殑鏂囦欢
- // var saveFileName = await dev.Gateway.CreateFileAsync(fileName);
- // if (saveFileName != null && saveFileName.Result == 0)
- // {
- // backupSuccess = false;
- // //涓婁紶鏁版嵁鍒扮綉鍏�
- // var saveData = await dev.Gateway.SendFileAsync(data);
- // if (saveData != null)
- // {
- // backUpStatus = new SendFileResponseAllData { Result = saveData.Result };
- // }
- // }
- // var dateTime = DateTime.Now;
- // while ((DateTime.Now - dateTime).TotalMilliseconds < WaitReceiveDataTime)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // if (backUpStatus != null)
- // {
- // break;
- // }
- // }
- // if ((DateTime.Now - dateTime).TotalMilliseconds > WaitReceiveDataTime)
- // {
- // backUpStatus = new SendFileResponseAllData { errorMessageBase = " 鍥炲瓒呮椂锛岃閲嶆柊鎿嶄綔" };
- // };
- // return backUpStatus;
- // });
- //}
-
- /// <summary>
- /// 涓嬭浇绉佹湁鏁版嵁
- /// </summary>
- /// <returns>The data from gateway.</returns>
- /// <param name="fileName">File name.</param>
- /// <param name="dev">Dev.</param>
- //public async System.Threading.Tasks.Task<System.Collections.Generic.List<byte>> DownloadDataFromGateway(string fileName, CommonDevice dev)
- //{
- // return await System.Threading.Tasks.Task.Run(async () =>
- // {
- // byteSource.Clear();
- // System.Collections.Generic.List<byte> backUpData = null;
- // var dateTime = DateTime.Now;
- // //鑾峰彇褰撳墠鏂囦欢鐨勫叿浣撲俊鎭�
- // //var getFileSize = await currentKey.Gateway.GetCurrentFileInfoAsync(fileName);
- // //涓嬭浇鏂囦欢
- // var saveFileName = await dev.Gateway.SetDownloadFileAsync(fileName);
- // Action<string, byte[]> action = (topic, dataContent) =>
- // {
- // if (topic.Split('/')[0] + "/" + topic.Split('/')[1] + "/" + topic.Split('/')[2] == topic.Split('/')[0] + "/" + "FileTransfer/DownloadFile")
- // {
- // dateTime = DateTime.Now;
- // byte[] fileBytes = dataContent;
- // if (fileBytes[5] != 1)
- // {
- // if (fileBytes.Length == 2056)
- // {
- // var tempBytes = new byte[2048];
- // System.Array.Copy(fileBytes, 8, tempBytes, 0, 2048);
- // byteSource.AddRange(tempBytes);
- // }
- // else
- // {
- // var tempBytes = new byte[fileBytes.Length - 8];
- // System.Array.Copy(fileBytes, 8, tempBytes, 0, tempBytes.Length);
- // byteSource.AddRange(tempBytes);
- // }
- // }
- // else
- // {
- // var tempBytes = new byte[fileBytes.Length - 8];
- // System.Array.Copy(fileBytes, 8, tempBytes, 0, tempBytes.Length);
- // byteSource.AddRange(tempBytes);
-
- // if (byteSource != null )
- // {
- // backUpData = byteSource;
- // }
- // }
-
- // }
- // };
- // dev.Gateway.FileContentAction += action;
-
- // while ((DateTime.Now - dateTime).TotalMilliseconds < 2000)
- // {
- // await System.Threading.Tasks.Task.Delay(10);
- // }
- // dev.Gateway.FileContentAction -= action;
- // return byteSource;
- // });
- //}
-
- //#endregion
-
#region 瀹㈡埛绔笂浼犳枃浠跺埌缃戝叧.
/// <summary>
/// 瀹㈡埛绔笂浼犳枃浠跺埌缃戝叧
@@ -1940,8 +1664,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -1949,13 +1672,12 @@
}
else
{
- dataRes = new CreateFileResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ dataRes = new CreateFileResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "FileTransfer/CreateFile_Respon")
{
- var security = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
dataRes = new CreateFileResponseAllData { Result = result };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
@@ -2019,7 +1741,6 @@
if (topic == gatewayID + "/FileTransfer/SendFile_Respon")
{
- var gateway = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
dataRes = new SendFileResponseAllData { Result = result };
if (result == 0)
@@ -2109,8 +1830,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2118,13 +1838,12 @@
}
else
{
- dataRes = new FileTransferLsDiResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ dataRes = new FileTransferLsDiResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "FileTransfer/lsDir_Respon")
{
- var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
var resultlsDir = Newtonsoft.Json.JsonConvert.DeserializeObject<FileTransferLsDiResponseData>(jobject["Data"].ToString());
if (resultlsDir != null)
{
@@ -2187,8 +1906,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2196,13 +1914,12 @@
}
else
{
- dataRes = new FileTransferGetFileInfoResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ dataRes = new FileTransferGetFileInfoResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "FileTransfer/GetFileInfo_Respon")
{
- var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
var resultlsDir = Newtonsoft.Json.JsonConvert.DeserializeObject<FileTransferGetFileInfoResponseData>(jobject["Data"].ToString());
if (resultlsDir != null)
{
@@ -2267,8 +1984,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2276,13 +1992,12 @@
}
else
{
- dataRes = new SetDownloadFileResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ dataRes = new SetDownloadFileResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "FileTransfer/SetDownloadFile_Respon")
{
- var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = CurrentGateWayId };
var tempData = Newtonsoft.Json.JsonConvert.DeserializeObject<SetDownloadFileResponseData>(jobject["Data"].ToString());
if (tempData != null)
{
@@ -2290,7 +2005,7 @@
var tempDa = new SetDownloadFileResponseData();
if (tempData.Result == 0)
{
- ZbGateway.byteSource.Clear();
+ this.byteSource.Clear();
}
tempDa.Result = tempData.Result;
dataRes.setDownloadFileResponseData = tempDa;
@@ -2338,7 +2053,7 @@
#endregion
#region 缃戝叧鍙戦�佹枃浠舵祦鍒板鎴风
- static System.Collections.Generic.List<byte> byteSource = new System.Collections.Generic.List<byte>();
+ private List<byte> byteSource = new List<byte>();
///<summary >
/// 涓嬭浇鏂囦欢涓殑鏁版嵁
/// </summary>
@@ -2401,8 +2116,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2410,13 +2124,12 @@
}
else
{
- dataRes = new DelFileOrDirResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ dataRes = new DelFileOrDirResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "FileTransfer/DelFileOrDir_Respon")
{
- var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = CurrentGateWayId };
var resultDelFileOrDir = Newtonsoft.Json.JsonConvert.DeserializeObject<DelFileOrDirResponseData>(jobject["Data"].ToString());
if (resultDelFileOrDir != null)
{
@@ -2480,8 +2193,7 @@
if (topic == gatewayID + "/" + "Error_Respon")
{
- var gatewayTemp = new ZbGateway() { Time = jobject.Value<int>("Time"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = getGatewayBaseInfo.gwID };
- var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<ErrorResponData>(jobject["Data"].ToString());
+ var temp = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ErrorResponData>(jobject["Data"].ToString());
if (temp == null)
{
@@ -2489,13 +2201,12 @@
}
else
{
- dataRes = new CreateDirResponseAllData { errorResponData = temp, errorMessageBase = ErrorMess(temp.Error) };
+ dataRes = new CreateDirResponseAllData { errorResponData = temp, errorMessageBase = CommonDevice.ErrorMess(temp.Error) };
}
}
if (topic == gatewayID + "/" + "FileTransfer/CreateDir_Respon")
{
- var lsDir = new ZbGateway() { DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = CurrentGateWayId };
var resultCreateDir = Newtonsoft.Json.JsonConvert.DeserializeObject<CreateDirResponseData>(jobject["Data"].ToString());
if (resultCreateDir != null)
{
@@ -2556,7 +2267,6 @@
if (topic == gatewayID + "/" + "SendAESKey_Respon")
{
var jobject = Newtonsoft.Json.Linq.JObject.Parse(message);
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
var result = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["Result"].ToString());
sendKeyResponData = new SendKeyResponData { Result = result };
DebugPrintLog($"UI鏀跺埌閫氱煡鍚庣殑涓婚_{ topic}");
@@ -2601,7 +2311,7 @@
/// <para>杩涘叆褰撳墠鐣岄潰鏃惰娣诲姞</para>
/// <para>閫�鍑哄綋鍓嶇晫闈㈡椂瑕佸叧闂�</para>
/// </summary>
- public static readonly System.Collections.Generic.List<IStatus> StatusList = new System.Collections.Generic.List<IStatus>();
+ public static readonly List<IStatus> StatusList = new List<IStatus>();
/// <summary>
/// 璁惧淇℃伅鍙樺寲
@@ -2631,6 +2341,7 @@
/// </summary>
IMqttClient localMqttClient = new MqttFactory().CreateMqttClient();
bool localMqttIsConnecting;
+ [Newtonsoft.Json.JsonIgnore]
public bool localIsConnected;
/// <summary>
/// 鎵嬫満鏍囪瘑
@@ -2852,15 +2563,12 @@
/// 澶栫綉鐨凪QTT鏄惁姝ｅ湪杩炴帴
/// </summary>
static bool remoteMqttIsConnecting;
- static bool IsLoginAgain;
+
/// <summary>
/// 杩滅▼MqttClient
/// </summary>
- public static IMqttClient RemoteMqttClient= new MqttFactory().CreateMqttClient();
- static bool remoteIsConnected;
- private int IsLogin = 0;
- [Newtonsoft.Json.JsonIgnore]
- static Action actionTemp;
+ public static IMqttClient RemoteMqttClient = new MqttFactory().CreateMqttClient();
+ static bool remoteIsConnected;
/// <summary>
/// 鍚姩杩滅▼Mqtt
@@ -3086,7 +2794,7 @@
localIsConnected = false;
DebugPrintLog($"Local涓诲姩鏂紑_{s}");
//await localMqttClient.DisconnectAsync(new MQTTnet.Client.Disconnecting.MqttClientDisconnectOptions { }, CancellationToken.None);
- await localMqttClient.DisconnectAsync();
+ await localMqttClient.DisconnectAsync();
}
}
catch (Exception ex)
@@ -3098,7 +2806,7 @@
/// <summary>
/// 鏂紑杩滅▼Mqtt鐨勯摼鎺�
/// </summary>
- public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s="")
+ public static async System.Threading.Tasks.Task DisConnectRemoteMqttClient(string s = "")
{
try
{
@@ -3117,6 +2825,8 @@
}
#endregion
+
+ #region 鏁版嵁鍙戦��
/// <summary>
/// 鍙戦�佹秷鎭埌鏈嶅姟鍣�
@@ -3197,11 +2907,11 @@
if (IsRemote)
{
await SendRemoteMsg(topic, message, retain);
- DebugPrintLog($"杩滅▼鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId}");//{System.DateTime.Now.ToString()}");// DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")
+ DebugPrintLog($"杩滅▼鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}");//{System.DateTime.Now.ToString()}");// DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:fff")
}
else
{
- DebugPrintLog($"灞�鍩熺綉鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_鏄惁鍔犲瘑:{IsEncry}");
if (IsEncry)
{
@@ -3217,14 +2927,14 @@
{
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
}
- catch(Exception e)
+ catch (Exception e)
{
DebugPrintLog($"Local涓诲姩鏂紑_{e.Message}");
await DisConnectLocalMqttClient(e.Message);
await StartLocalMqtt("ReConnect");
if (localIsConnected)
{
- DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_鏄惁鍔犲瘑:{IsEncry}");
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
}
}
@@ -3269,7 +2979,7 @@
return;
}
- DebugPrintLog($"灞�鍩熺綉鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斿彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_鏄惁鍔犲瘑:{IsEncry}");
if (IsEncry)
{
@@ -3292,7 +3002,7 @@
await StartLocalMqtt("ReConnect");
if (localIsConnected)
{
- DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_褰撳墠缃戝叧{CurrentGateWayId} 鏄惁鍔犲瘑:{IsEncry}");
+ DebugPrintLog($"灞�鍩熺綉鈥斺�斾簩娆″彂閫佸埌缃戝叧鐨勪富棰�:{topic}_鍙戦�佸埌缃戝叧鐨勬暟鎹�:{System.Text.Encoding.UTF8.GetString(message)}_鏄惁鍔犲瘑:{IsEncry}");
await localMqttClient.PublishAsync(new MqttApplicationMessage { Topic = topic, Payload = message, QualityOfServiceLevel = MQTTnet.Protocol.MqttQualityOfServiceLevel.ExactlyOnce, Retain = retain });
}
}
@@ -3304,13 +3014,9 @@
}
}
- [Serializable]
- public class CloudTimeResponse
- {
- public string StateCode;
- public string Info;
- public string CloudTimestamp;
- }
+ #endregion
+
+ #region 鏁版嵁鎺ユ敹澶勭悊
/// <summary>
/// 鎺ユ敹杩滅▼鏁版嵁澶勭悊
@@ -3423,7 +3129,7 @@
/// <param name="topic">Topic.</param>
/// <param name="message">Message.</param>
/// <param name="e">E.</param>
- static void ReceiveMessage(string topic, string message, byte []payload)
+ static void ReceiveMessage(string topic, string message, byte[] payload)
{
try
{
@@ -3461,7 +3167,6 @@
}
gwa.GwResDataAction?.Invoke(topic, message);
- gwa.CurrentGateWayId = gatewayID;
var jobject = new Newtonsoft.Json.Linq.JObject();
if (topic.Split('/')[0] + "/" + topic.Split('/')[1] == topic.Split('/')[0] + "/" + "FileTransfer")
@@ -3505,121 +3210,13 @@
}
#endregion
- #region 璁惧鏂颁笂鎶�
- //姝ラ1锛夌綉鍏冲憡鐭ュ鎴风鏈夋柊璁惧鍔犲叆zigbee缃戠粶銆�
- if (topic == gatewayID + "/" + "Device/DeviceJoinZbNet_Respon")
- {
- var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- gatewayTemp.deviceDeviceJoinZbNetResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceDeviceJoinZbNetResponData>(jobject["Data"].ToString());
- if (gatewayTemp.deviceDeviceJoinZbNetResponData == null)
- {
- return;
- }
- //涓婃姤绫诲瀷閫氱煡
- if (gwa.ReportAction != null)
- {
- DebugPrintLog("Device/DeviceJoinZbNet宸茬粡閫氱煡");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("Device/DeviceJoinZbNet", gatewayTemp);
- }
- }
- //姝ラ2锛夌綉鍏冲憡鐭ュ鎴风鑾峰彇鏂拌澶囨墍鏈夌鐐逛俊鎭槸鍚︽垚鍔�
- if (topic == gatewayID + "/" + "Device/IsGetEpointInfo_Respon")
- {
- var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- gatewayTemp.deviceIsGetEpointInfoResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DeviceIsGetEpointInfoResponData>(jobject["Data"].ToString());
- if (gatewayTemp.deviceIsGetEpointInfoResponData == null)
- {
- return;
- }
- //涓婃姤绫诲瀷閫氱煡
- if (gwa.ReportAction != null)
- {
- DebugPrintLog("Device/IsGetEpointInfo宸茬粡閫氱煡");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("Device/IsGetEpointInfo", gatewayTemp);
- }
- }
- //姝ラ3锛夌綉鍏充笂鎶ヨ妭鐐硅澶囨墍鏈夌鐐逛俊鎭�
- if (topic == gatewayID + "/" + "DeviceInComingRespon")
- {
- //鏂拌澶囦笂鎶ワ紝閲嶆柊鍙戣幏鍙栨墍鏈夌殑璁惧
- var tempDevice = new CommonDevice() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- tempDevice.getNewDeviceInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.NewDeviceInfoData>(jobject["Data"].ToString());
- if (gwa.ReportAction != null)
- {
- DebugPrintLog("DeviceInComingRespon宸茬粡閫氱煡");
- gwa.ReportAction("DeviceInComingRespon", tempDevice.getNewDeviceInfo);
- }
- UpdateDeviceInfo(tempDevice, "DeviceInComingRespon");
- }
- #endregion
- #region 璁惧鍦ㄧ嚎鐘舵�佹洿鏂板弽棣�
- else if (topic == gatewayID + "/" + "OnlineStatusChange_Respon")
- {
- var tempDevice = new CommonDevice() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- tempDevice.IsOnline = Newtonsoft.Json.JsonConvert.DeserializeObject<int>(jobject["Data"]["IsOnline"].ToString());
-
- if (gwa.ReportAction != null)
- {
- DebugPrintLog("OnlineStatusChange宸茬粡閫氱煡");
- gwa.ReportAction("OnlineStatusChange", tempDevice);
- }
- var infoTempDevice = gwa.DeviceList.Find(obj => obj.DeviceID == tempDevice.DeviceID && obj.DeviceAddr == tempDevice.DeviceAddr);
- if (infoTempDevice == null)
- {
- gwa.DeviceList.Add(tempDevice);
- UpdateDeviceInfo(tempDevice, "OnlineStatusChange");
- }
- else
- {
- if (infoTempDevice.DeviceInfo != null)
- {
- infoTempDevice.DeviceInfo.IsOnline = infoTempDevice.IsOnline;
- }
- UpdateDeviceInfo(infoTempDevice, "OnlineStatusChange");
- }
- }
- #endregion
- #region 璁惧琚垹闄や笂鎶�
- else if (topic == gatewayID + "/" + "RemoveDeviceRespon")
- {
- var gatewayTemp = new ZbGateway() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- gatewayTemp.removeDeviceResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGateway.RemoveDeviceResponseData>(jobject["Data"].ToString());
- if (gatewayTemp.removeDeviceResponseData != null)
- {
- try
- {
- if (gatewayTemp.removeDeviceResponseData.Result == 0)
- {
- foreach (var delD in gatewayTemp.removeDeviceResponseData.DeviceList)
- {
- var tempDevice = new CommonDevice() { DeviceAddr = jobject.Value<string>("DeviceAddr"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- tempDevice.removeDeviceResponseData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.RemoveDeviceResponseData>(jobject["Data"].ToString());
- if (tempDevice.removeDeviceResponseData == null)
- {
- return;
- }
- else
- {
- UpdateDeviceInfo(tempDevice, "RemoveDeviceRespon");
- if (tempDevice.removeDeviceResponseData.Result == 0)
- {
- var infoTempDevice = gwa.DeviceList.Find((CommonDevice obj) => obj.DeviceID == tempDevice.DeviceID && obj.DeviceAddr == tempDevice.DeviceAddr && obj.DeviceEpoint == tempDevice.DeviceEpoint);
- if (infoTempDevice != null)
- {
- gwa.DeviceList.Remove(infoTempDevice);
- }
- }
- }
- }
- }
- }
- catch { }
- }
- }
+ #region 璁惧鍦ㄧ嚎鐘舵�佹洿鏂板弽棣�
+
+ //2020.05.11 鍒犻櫎
+
#endregion
+
#region 璁惧鐘舵�佷笂鎶�
else if (topic == gatewayID + "/" + "DeviceStatusReport" + "/" + addr + "/" + epoint + "/" + cluID + "/" + attrId)
{
@@ -3628,7 +3225,7 @@
var tempEpoint = jobject.Value<int>("Epoint");
var dataId = jobject.Value<int>("Data_ID");
- var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint, DataID = dataId };
+ var tempDevice = new CommonDevice { DeviceID = deviceID, DeviceAddr = deviceAddr, DeviceEpoint = tempEpoint };
tempDevice.DeviceStatusReport = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DeviceStatusReportData>(jobject["Data"].ToString());
UpdateDeviceInfo(tempDevice, "DeviceStatusReport");
}
@@ -3640,7 +3237,7 @@
switch ((DeviceType)(deviceID))
{
case DeviceType.DoorLock:
- var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
+ var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
var OperatingEventNotificationDatad = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockOperatingEventNotificationCommand>(jobject["Data"].ToString());
if (OperatingEventNotificationDatad != null)
{
@@ -3663,7 +3260,7 @@
switch ((DeviceType)(deviceID))
{
case DeviceType.DoorLock:
- var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
+ var doorLock = new DoorLock() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
var ProgrammingEventNotificationData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZigBee.Device.DoorLock.DoorLockProgrammingEventNotificationCommand>(jobject["Data"].ToString());
if (ProgrammingEventNotificationData != null)
{
@@ -3677,35 +3274,18 @@
UpdateDeviceInfo(doorLock, "DoorLockProgrammingEventNotificationCommand");
break;
}
- }
+ }
#endregion
#region IAS瀹夐槻淇℃伅涓婃姤
- else if (topic == gatewayID + "/" + "IASInfoReport")
- {
- var deviceID = jobject.Value<int>("Device_ID");
- switch ((DeviceType)(deviceID))
- {
- case DeviceType.IASZone:
- var ias = new IASZone() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- ias.iASInfo = Newtonsoft.Json.JsonConvert.DeserializeObject<IASZone.IASInfoData>(jobject["Data"].ToString());
- //涓婃姤绫诲瀷閫氱煡锛屽繀闇�鍏堣皟鐢紝鐒跺悗鎵嶆湁閫氱煡锛屽惁鍒欐槸绌轰笉浼氶�氱煡鐨�
- if (gwa.ReportAction != null)
- {
- DebugPrintLog("IASInfoReport宸茬粡閫氱煡");
- //ias.Save();
- gwa.ReportAction("IASInfoReport", ias.iASInfo);
- }
- UpdateDeviceInfo(ias, "IASInfoReport");
- break;
- }
- }
+
+ //2020.05.11 鍒犻櫎
+
#endregion
#region 涓嬭浇杩涘害涓婃姤
else if (topic == gatewayID + "/" + "DownloadFile_Progress")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.downloadFileProgressResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<DownloadFileProgressResponData>(jobject["Data"].ToString());
- if (gatewayTemp.downloadFileProgressResponData == null)
+ gwa.downloadFileProgressResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.DownloadFileProgressResponData>(jobject["Data"].ToString());
+ if (gwa.downloadFileProgressResponData == null)
{
return;
}
@@ -3713,15 +3293,13 @@
if (gwa.ReportAction != null)
{
DebugPrintLog("DownloadFileProgress");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("DownloadFileProgress", gatewayTemp);
+ gwa.ReportAction("DownloadFileProgress", gwa);
}
}
else if (topic == gatewayID + "/" + "ZbGwOperation/Upgrade_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.zbGwOperationUpgradeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGwOperationUpgradeData>(jobject["Data"].ToString());
- if (gatewayTemp.zbGwOperationUpgradeData == null)
+ gwa.zbGwOperationUpgradeData = Newtonsoft.Json.JsonConvert.DeserializeObject<ZbGwOperationUpgradeData>(jobject["Data"].ToString());
+ if (gwa.zbGwOperationUpgradeData == null)
{
return;
}
@@ -3729,16 +3307,14 @@
if (gwa.ReportAction != null)
{
DebugPrintLog("鍗忚皟鍣ㄥ崌绾х櫨鍒嗘瘮");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("CordinatorUpgradePercent", gatewayTemp);
+ gwa.ReportAction("CordinatorUpgradePercent", gwa);
}
}
else if (topic == gatewayID + "/" + "OTA/Schedule_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.oTAScheduleResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<OTAScheduleResponData>(jobject["Data"].ToString());
+ gwa.oTAScheduleResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.OTAScheduleResponData>(jobject["Data"].ToString());
- if (gatewayTemp.oTAScheduleResponData == null)
+ if (gwa.oTAScheduleResponData == null)
{
return;
}
@@ -3747,16 +3323,14 @@
if (gwa.ReportAction != null)
{
DebugPrintLog("鑺傜偣璁惧鍗囩骇鐧惧垎姣�");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("DeviceUpgradePercent", gatewayTemp);
+ gwa.ReportAction("DeviceUpgradePercent", gwa);
}
}
else if (topic == gatewayID + "/" + "VirtualDrive/Upgrade_Respon")
{
- var gatewayTemp = new ZbGateway() { DataID = jobject.Value<int>("Data_ID") };
- gatewayTemp.virtualDriveUpgradeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VirtualDriveUpgradeResponData>(jobject["Data"].ToString());
+ gwa.virtualDriveUpgradeResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<VirtualDriveUpgradeResponData>(jobject["Data"].ToString());
- if (gatewayTemp.virtualDriveUpgradeResponData == null)
+ if (gwa.virtualDriveUpgradeResponData == null)
{
return;
}
@@ -3764,18 +3338,16 @@
if (gwa.ReportAction != null)
{
DebugPrintLog("铏氭嫙椹卞姩鍗囩骇鐧惧垎姣�");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("VirtualDriveUpgrade", gatewayTemp);
+ gwa.ReportAction("VirtualDriveUpgrade", gwa);
}
}
#endregion
#region 閲嶅惎缃戝叧绯荤粺
else if (topic == gatewayID + "/" + "GwReboot_Respon")
{
- var gatewayTemp = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID") };
- gatewayTemp.gwRebootResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<GwRebootResponData>(jobject["Data"].ToString());
+ var gwRebootResponData = Newtonsoft.Json.JsonConvert.DeserializeObject<GwRebootResponData>(jobject["Data"].ToString());
- if (gatewayTemp.gwRebootResponData == null)
+ if (gwRebootResponData == null)
{
return;
}
@@ -3783,8 +3355,7 @@
if (gwa.ReportAction != null)
{
DebugPrintLog("GwReboot_Respon宸茬粡閫氱煡");
- gatewayTemp.CurrentGateWayId = gatewayID;//杩欓噷鐨凜urrentGateWayId鏄綋鍓嶆柊new ZbGateway鐨勫��
- gwa.ReportAction("GwReboot_Respon", gatewayTemp);
+ gwa.ReportAction("GwReboot_Respon", gwRebootResponData);
}
}
#endregion
@@ -3893,22 +3464,6 @@
}
}
#endregion
- #region 鑺傜偣璁惧榛樿鍙嶉
- else if (topic == gatewayID + "/" + "DeviceDefaultAck")
- {
- var deviceDefaultAck = new ZbGateway() { DeviceID = jobject.Value<int>("Device_ID"), DeviceAddr = jobject.Value<string>("DeviceAddr"), DeviceEpoint = jobject.Value<int>("Epoint"), DataID = jobject.Value<int>("Data_ID"), CurrentGateWayId = gwa.getGatewayBaseInfo.gwID };
- if (deviceDefaultAck == null)
- {
- return;
- }
- //涓婃姤绫诲瀷閫氱煡
- if (gwa.ReportAction != null)
- {
- DebugPrintLog("DeviceDefaultAck");
- gwa.ReportAction("DeviceDefaultAck", deviceDefaultAck);
- }
- }
- #endregion
#region 璁惧璇锋眰APP鑾峰彇鍗囩骇鏁版嵁
else if (topic == gatewayID + "/" + "ZbDataPassthrough")
@@ -3916,7 +3471,7 @@
//涓婃姤绫诲瀷閫氱煡
if (gwa.ReportAction != null)
{
- var clientDataPassthrough = Newtonsoft.Json.JsonConvert.DeserializeObject<ClientDataPassthroughResponseData>(jobject["Data"].ToString());
+ var clientDataPassthrough = Newtonsoft.Json.JsonConvert.DeserializeObject<CommonDevice.ClientDataPassthroughResponseData>(jobject["Data"].ToString());
if (clientDataPassthrough != null)
{
DebugPrintLog("DeviceRequestAcUpdateData");
@@ -3932,5 +3487,40 @@
}
}
+
+ #endregion
+
+ #region 淇濆瓨缂撳瓨
+
+ /// <summary>
+ /// 閲嶆柊淇濆瓨璁惧
+ /// </summary>
+ public void ReSave()
+ {
+ Global.WriteFileByBytesByHomeId(FilePath, System.Text.Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(this)));
+ }
+ #endregion
+
+ #region 璋冭瘯鎵撳嵃
+
+ /// <summary>
+ /// 璋冭瘯鏃舵墦寮�鎵撳嵃淇℃伅锛宼rue:鎵撳嵃锛宖alse:涓嶆墦鍗�
+ /// </summary>
+ /// <param name="msg">Message.</param>
+ /// <param name="flage">If set to <c>true</c> flage.</param>
+ public static void DebugPrintLog(string msg, bool flage = true)
+ {
+#if DEBUG
+ if (flage == true)
+ {
+ if (msg.Contains("DeviceStatusReport") == false)
+ {
+ System.Console.WriteLine(msg + " " + System.DateTime.Now.ToLongTimeString() + " " + System.DateTime.Now.Millisecond);
+ }
+ }
+#endif
+ }
+
+ #endregion
}
}
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
index e77d781..c4b44cc 100755
--- a/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
+++ b/ZigbeeApp/Shared/Phone/ZigBee/Device/ZbGatewayData.cs
@@ -4,9 +4,9 @@
namespace ZigBee.Device
{
- public class ZbGatewayData : CommonDevice
+ public class ZbGatewayData
{
- #region 鏂拌拷鍔犵殑涓�浜涘彉閲�
+ #region 涓�鍫嗗彉閲�
/// <summary>
/// 鍒ゆ柇缃戝叧鏄惁鍦ㄧ嚎鐨勬爣璇嗭紝APP鐣岄潰浼氭敼鍙樺畠鐨勫��,Application浼氶噸鏂板埛鏂板畠鐨勫��
/// </summary>
@@ -15,57 +15,32 @@
/// 缃戝叧鎵�鍦ㄧ殑鎴块棿ID
/// </summary>
public string RoomId = string.Empty;
-
- #endregion
-
- [Newtonsoft.Json.JsonIgnore]
/// <summary>
/// 铏氭嫙缃戝叧
/// </summary>
- public bool IsVirtual;
-
- #region 缃戝叧鍩烘湰淇℃伅
+ [Newtonsoft.Json.JsonIgnore]
+ public bool IsVirtual;
/// <summary>
- /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
+ /// 鏈�鍚庣殑鏇存柊鏃堕棿
/// </summary>
- public long AppVersion;
+ [Newtonsoft.Json.JsonIgnore]
+ public DateTime LastDateTime = DateTime.MinValue;
- /// <summary>
- /// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
- /// </summary>
- public int ZigbeeVersion;
#endregion
#region 缃戝叧淇℃伅.
/// <summary>
/// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
/// </summary>
- public GetGwVersionAllData getGwVersionAllData;
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class GetGwVersionAllData
+ public class GetGwVersionAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧鐗堟湰淇℃伅
/// </summary>
public GetGwVersionData getGwVersion;
}
- /// <summary>
- /// 缃戝叧鐗堟湰淇℃伅
- /// </summary>
- public GetGwVersionData getGwVersion;
/// <summary>
/// 缃戝叧鐗堟湰淇℃伅
/// </summary>
@@ -84,25 +59,13 @@
#endregion
#region 鑾峰彇缃戝叧淇℃伅.
- /// <summary>
- /// 缃戝叧淇℃伅,缃戝叧鍙嶉鍏蜂綋淇℃伅.
- /// </summary>
- public GetGwAllData getGwAllData;
+
/// <summary>
/// 缃戝叧淇℃伅,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
[System.Serializable]
- public class GetGwAllData
+ public class GetGwAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧淇℃伅
/// </summary>
@@ -114,7 +77,7 @@
/// </summary>
public GetGwData getGwInfo;
/// <summary>
- /// 缃戝叧淇℃伅
+ /// 缃戝叧淇℃伅(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉浣跨敤鐨勫彉閲�)
/// </summary>
[System.Serializable]
public class GetGwData
@@ -122,10 +85,11 @@
///<summary>
///缃戝叧搴忓垪鍙凤紝璇ョ綉鍏冲敮涓�鏍囪瘑
/// </summary>
- public string GwId;
+ public string GwId;
/// <summary>
///缃戝叧缁戝畾缃戝崱鐨刴ac鍦板潃
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string GwMac;
/// <summary>
///缃戝叧鍚嶇О
@@ -140,61 +104,71 @@
///<para>0锛氬惁</para>
///<para>1锛氭槸</para>
/// </summary>
- public int IsDominant;
+ public int IsDominant;
///<summary>
///utc鏃堕棿鎴筹紝绋嬪簭鍚姩鏃剁綉鍏崇殑绯荤粺鏃堕棿
///</summary>
- public long StartTime;
+ [Newtonsoft.Json.JsonIgnore]
+ public long StartTime;
/// <summary>
///鍔犲叆灞�鍩熺綉妯″紡
///<para>0锛歸ifi杩炴帴灞�鍩熺綉</para>
///<para>1锛氭湁绾胯繛鎺ュ眬鍩熺綉</para>
///<para>2锛氭湭鍔犲叆灞�鍩熺綉</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int JoinMode;
/// <summary>
///缃戝叧鎵�鍦ㄥ眬鍩熺綉鐨刬p鍦板潃
/// </summary>
- public string GwIP;
+ public string GwIP;
/// <summary>
/// 涓讳汉鐨凣uid(鍗充娇鏄鐞嗗憳,杩欓噷涔熸槸涓讳汉鐨凣uid)
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string AccountId;
/// <summary>
///褰撳墠灞�鍩熺綉缃戠粶鍙峰崰鐢ㄤ綅鏁帮紝鐢ㄤ簬璁＄畻瀛愮綉鎺╃爜锛屽Mask=32锛屽垯瀛愮綉鎺╃爜涓�255.255.255.0
/// </summary>
- public int Mask;
+ [Newtonsoft.Json.JsonIgnore]
+ public int Mask;
/// <summary>
///涓婄骇璺敱鍣ㄦ棤绾垮悕绉�
///<para>褰� JoinMode = 0鏃跺瓨鍦� </para>
/// </summary>
- public string RouteESSID;
+ [Newtonsoft.Json.JsonIgnore]
+ public string RouteESSID;
/// <summary>
///DNS鏈嶅姟鍣ㄥ湴鍧�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string DNSServer;
/// <summary>
- /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�
+ /// 璇ョ綉鍏冲簲鐢ㄧ▼搴忕増鏈�(缃戝叧鍥轰欢鏃ユ湡锛燂紵)
/// </summary>
- public long AppVersion;
+ public long AppVersion;
/// <summary>
/// Zigbee鍗忚鍣ㄧ▼搴忕増鏈�
/// </summary>
- public int ZigbeeVersion;
+ [Newtonsoft.Json.JsonIgnore]
+ public int ZigbeeVersion;
/// <summary>
///鍗忚皟鍣╩ac鍦板潃
/// </summary>
- public string ZigbeeMacAddr;
+ [Newtonsoft.Json.JsonIgnore]
+ public string ZigbeeMacAddr;
/// <summary>
///缃戝叧瀹卛d
/// </summary>
- public string HomeId;
+ [Newtonsoft.Json.JsonIgnore]
+ public string HomeId;
/// <summary>
///鏄惁宸茬粡杩炴帴浜戠mqtt
///<para>0锛氬惁</para>
///<para>1锛氭槸</para>
/// </summary>
- public int IsConnectCloud;
+ [Newtonsoft.Json.JsonIgnore]
+ public int IsConnectCloud;
/// <summary>
///锛堢敤浜庣綉鍏崇▼搴忚皟璇曪級
///<para>https鐧婚檰浜戠鏃讹紝鏈�杩戜竴娆¤幏鍙栫殑鍝嶅簲鐘舵�佺爜銆傛牴鎹簯绔殑瀹氫箟锛屾湁濡備笅鐘舵�佺爜銆�</para>
@@ -203,6 +177,7 @@
///<para>(3)NoBind,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭痆鎮ㄦ墍鎻愪氦鐨刐GatewayUniqueId 缃戝叧鍞竴Id(MAC)]鍜孾浣忓畢涓婚敭Id]涓嶅瓨鍦ㄧ粦瀹氱殑鍏崇郴]</para>
///<para>(4)YouDataNoIsLocalRegion,鍒欏搷搴斿瓧娈典腑[ErrorInfo] 涓洪敊璇俊鎭痆鎮ㄧ殑鐨勬暟鎹苟涓嶅湪姝DL鍖哄煙鏈嶅姟鍣�, 璇烽噸瀹氬悜鍒板涓婬DL鍖哄煙鏈嶅姟鍣ㄨ繘琛屽鐞�.]</para>
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public string StateCode;
/// <summary>
///Linux缃戝叧绫诲瀷
@@ -227,12 +202,12 @@
/// <summary>
/// 缃戝叧闀滃儚绫诲瀷
/// </summary>
- public int ZbImageType;
-
+ public int ZbImageType;
/// <summary>
/// 铏氭嫙椹卞姩淇℃伅
/// </summary>
- public List <DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
+ [Newtonsoft.Json.JsonIgnore]
+ public List<DriveCodeListObj> DriveCodeList = new List<DriveCodeListObj>();
}
public class DriveCodeListObj
@@ -264,32 +239,15 @@
/// <summary>
/// 淇敼缃戝叧鍚嶇О,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public GwReNameAllData gwReNameAllData;
- /// <summary>
- /// 淇敼缃戝叧鍚嶇О,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class GwReNameAllData
+ public class GwReNameAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇敼缃戝叧鍚嶇О
/// </summary>
public GwReNameData gwReNameData;
}
- /// <summary>
- /// 淇敼缃戝叧鍚嶇О
- /// </summary>
- public GwReNameData gwRename;
/// <summary>
/// 淇敼缃戝叧鍚嶇О
/// </summary>
@@ -307,32 +265,15 @@
/// <summary>
/// 缃戝叧浣忓畢id鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public GwSetHomeIdAllData gwSetHomeIdAllData;
- /// <summary>
- /// 缃戝叧浣忓畢id鏁版嵁,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class GwSetHomeIdAllData
+ public class GwSetHomeIdAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 缃戝叧浣忓畢id鏁版嵁
/// </summary>
public GwSetHomeIdData gwSetHomeIdData;
}
- /// <summary>
- /// 缃戝叧浣忓畢id鏁版嵁
- /// </summary>
- public GwSetHomeIdData gwSetHomeId;
/// <summary>
/// 缃戝叧浣忓畢id鏁版嵁
/// </summary>
@@ -346,11 +287,11 @@
}
/// <summary>
- /// 骞挎挱鍙戠幇鍗忚
+ /// 骞挎挱鍙戠幇鍗忚(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉鐢ㄧ殑鍙橀噺)
/// </summary>
- public GatewayBaseInfo getGatewayBaseInfo = new GatewayBaseInfo { };
+ public GatewayBaseInfo getGatewayBaseInfo = new GatewayBaseInfo();
/// <summary>
- /// 骞挎挱鍙戠幇鍗忚
+ /// 骞挎挱鍙戠幇鍗忚(灞忚斀鎺変簡涓�浜涚洰鍓嶄笉鐢ㄧ殑鍙橀噺)
/// </summary>
[System.Serializable]
public class GatewayBaseInfo
@@ -362,10 +303,11 @@
/// <summary>
/// 浣忓畢id锛�4瀛楄妭鏁村瀷銆傦紙灏忕缁撴瀯锛夊鏋滅綉鍏充笉璁剧疆瀹卛d锛屽皢榛樿涓�0
/// </summary>
- public string HomeId = string.Empty;
+ public string HomeId = string.Empty;
/// <summary>
/// 缃戝叧褰撳墠鏃堕棿鎴筹紙灏忕缁撴瀯锛�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public int Time;
/// <summary>
/// 鏄惁涓轰富缃戝叧
@@ -376,30 +318,11 @@
/// </summary>
public string GwName;
/// <summary>
- /// RSA鍏挜
- /// </summary>
- //public string PubKey;
- //string id;
- /// <summary>
/// 缃戝叧ID
/// </summary>
public string gwID;
- //{
- // get{
- // return id;
- // }
- // set{
- // id = value;
- // //System.Console.WriteLine("===========123456");
- // }
- //}
-
}
- /// <summary>
- /// 缃戝叧鎴愪负涓荤綉鍏虫椂骞挎挱閫氱煡
- /// </summary>
- public MainGatewayBaseInfo getMainGatewayBaseInfo;
/// <summary>
/// 缃戝叧鎴愪负涓荤綉鍏虫椂骞挎挱閫氱煡
/// </summary>
@@ -447,22 +370,9 @@
/// <summary>
/// 缃戝叧鎭㈠鍑哄巶璁剧疆杩斿洖鐨勬暟鎹�.
/// </summary>
- public GwLinuxResetResponData gwLinuxResetResponData;
- /// <summary>
- /// 缃戝叧鎭㈠鍑哄巶璁剧疆杩斿洖鐨勬暟鎹�.
- /// </summary>
[System.Serializable]
- public class GwLinuxResetResponData
+ public class GwLinuxResetResponData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>缃戝叧鎭㈠鍑哄巶璁剧疆</para>
- /// </summary>
- public ErrorResponData errorResponData;
///<summary >
/// <para>0锛氬懡浠ゅ凡鎺ユ敹锛岀郴缁熷嵆灏嗘仮澶嶅嚭鍘傚苟閲嶅惎銆�</para>
/// </summary>
@@ -475,32 +385,15 @@
/// <summary>
/// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁
/// </summary>
- public GwRebootResponAllData gwRebootResponAllData;
- /// <summary>
- /// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁
- /// </summary>
[System.Serializable]
- public class GwRebootResponAllData
+ public class GwRebootResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
///<summary >
/// <para>杩斿洖鍊兼槸0:鍛戒护宸叉帴鏀讹紝绯荤粺鍗冲皢閲嶅惎銆�</para>
/// </summary>
public int Result = 999;
}
- /// <summary>
- /// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁
- /// </summary>
- public GwRebootResponData gwRebootResponData;
/// <summary>
/// 閲嶅惎缃戝叧绯荤粺杩斿洖鏁版嵁
/// </summary>
@@ -519,32 +412,15 @@
/// <summary>
/// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public SaveNVFileResponseAllData saveNVFileResponseData;
- /// <summary>
- /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class SaveNVFileResponseAllData
+ public class SaveNVFileResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�
/// </summary>
public SaveNVFileResponseData saveNVFileResponseData;
}
- /// <summary>
- /// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�
- /// </summary>
- public SaveNVFileResponseData zbGwOperationSaveNVFileData;
/// <summary>
/// 淇濆瓨zigbee鍗忚皟鍣ㄧ粍缃戜俊鎭�
/// </summary>
@@ -565,32 +441,15 @@
/// <summary>
/// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public RestoreNVAllDtta restoreNVAllDtta;
- /// <summary>
- /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class RestoreNVAllDtta
+ public class RestoreNVAllDtta : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�
/// </summary>
public RestoreNVDtta restoreNVDtta;
}
- /// <summary>
- /// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�
- /// </summary>
- public RestoreNVDtta restoreNVDtta;
/// <summary>
/// 鍗忚皟鍣ㄦ仮澶嶇粍缃戜俊鎭�
/// </summary>
@@ -609,25 +468,24 @@
#endregion
#region 鍗忚皟鍣ㄥ崌绾�
+
/// <summary>
- /// 鍗忚皟鍣ㄥ崌绾�,缃戝叧鍙嶉鍏蜂綋淇℃伅
+ /// 涓嬭浇杩涘害
+ /// </summary
+ [Newtonsoft.Json.JsonIgnore]
+ public CommonDevice.DownloadFileProgressResponData downloadFileProgressResponData = null;
+ /// <summary>
+ /// 鍚姩鍗囩骇
/// </summary>
- public ZbGwOperationUpgradeAllData zbGwOperationUpgradeAllData;
+ [Newtonsoft.Json.JsonIgnore]
+ public CommonDevice.OTAScheduleResponData oTAScheduleResponData = null;
+
/// <summary>
/// 鍗忚皟鍣ㄥ崌绾�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
[System.Serializable]
- public class ZbGwOperationUpgradeAllData
+ public class ZbGwOperationUpgradeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍗忚皟鍣ㄥ崌绾�
/// </summary>
@@ -637,6 +495,7 @@
/// <summary>
/// 鍗忚皟鍣ㄥ崌绾�
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public ZbGwOperationUpgradeData zbGwOperationUpgradeData;
/// <summary>
/// 鍗忚皟鍣ㄥ崌绾�
@@ -667,22 +526,9 @@
/// <summary>
/// 鍗囩骇铏氭嫙椹卞姩璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public VirtualDriveUpgradeResponseAllData virtualDriveUpgradeResponseAllData;
- /// <summary>
- /// 鍗囩骇铏氭嫙椹卞姩璁惧,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class VirtualDriveUpgradeResponseAllData
+ public class VirtualDriveUpgradeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍗囩骇铏氭嫙椹卞姩璁惧
/// </summary>
@@ -691,7 +537,11 @@
/// <summary>
/// 鍗囩骇铏氭嫙椹卞姩璁惧
/// </summary>
+ [Newtonsoft.Json.JsonIgnore]
public VirtualDriveUpgradeResponData virtualDriveUpgradeResponData;
+ /// <summary>
+ /// 鍗囩骇铏氭嫙椹卞姩璁惧
+ /// </summary>
[System.Serializable]
public class VirtualDriveUpgradeResponData
{
@@ -720,22 +570,9 @@
/// <summary>
/// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public CheckVDDriveCodeResponseAllData checkVDDriveCodeResponseAllData;
- /// <summary>
- /// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class CheckVDDriveCodeResponseAllData
+ public class CheckVDDriveCodeResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔�
/// </summary>
@@ -744,7 +581,6 @@
/// <summary>
/// 鏌ョ湅缃戝叧璁板綍鐨勮櫄鎷熼┍鍔�
/// </summary>
- public VDriveDriveCodeResponData vDriveDriveCodeResponData;
[System.Serializable]
public class VDriveDriveCodeResponData
{
@@ -786,22 +622,9 @@
/// <summary>
/// 缃戝叧绯荤粺鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public LinuxUpgradeAllData linuxUpgradeAllData;
- /// <summary>
- /// 缃戝叧绯荤粺鍗囩骇,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class LinuxUpgradeAllData
+ public class LinuxUpgradeAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 0锛氭甯革紙榛樿鍥炲锛�
///<para>1锛氭壘涓嶅埌鍗囩骇鍥轰欢锛岃矾寰勬垨鍗囩骇鍥轰欢鍚嶇О閿欒銆�</para>
@@ -817,22 +640,9 @@
/// <summary>
/// 鑾峰彇鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public GwGetChannelResponData zbGwGetChannelResponData;
- /// <summary>
- /// 鑾峰彇鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class GwGetChannelResponData
+ public class GwGetChannelResponData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍗忚皟鍣ㄥ綋鍓嶄俊閬�
/// </summary>
@@ -845,32 +655,15 @@
/// <summary>
/// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public ChangeChannelResponAllData changeChannelResponAllData;
- /// <summary>
- /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class ChangeChannelResponAllData
+ public class ChangeChannelResponAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬撴暟鎹�
/// </summary>
public ChangeChannelResponData changeChannelResponData;
}
- /// <summary>
- /// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬撴暟鎹�
- /// </summary>
- public ChangeChannelResponData changeChannelResponData;
/// <summary>
/// 鏇存敼鍗忚皟鍣ㄥ綋鍓嶄俊閬撴暟鎹�
/// </summary>
@@ -891,25 +684,13 @@
}
#endregion
- /// <summary>
- /// 璇诲彇鍗忚皟鍣∕AC鍦板潃,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
- public GetMacResponData getMacResponData;
+ #region 璇诲彇鍗忚皟鍣∕AC鍦板潃
/// <summary>
/// 璇诲彇鍗忚皟鍣∕AC鍦板潃,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
[System.Serializable]
- public class GetMacResponData
+ public class GetMacResponData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍗忚皟鍣╩ac鍦板潃
/// </summary>
@@ -927,28 +708,15 @@
public string MacAddr;
}
- //#endregion
+ #endregion
#region 鍚敤鎴栧叧闂�忎紶鏁版嵁涓婁紶鎺ュ彛
/// <summary>
/// 閫忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉淇℃伅
/// </summary>
- public PassthroughAllData passthroughAllData;
- /// <summary>
- /// 閫忎紶鏁版嵁涓婁紶鎺ュ彛,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class PassthroughAllData
+ public class PassthroughAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 宸茬粡杞崲鎴愬瓧绗︽牸寮忕殑16杩涘埗鐨勯�忎紶鏁版嵁
/// </summary>
@@ -961,17 +729,8 @@
/// 瀹㈡埛绔彂閫佹枃浠舵祦鍒扮綉鍏�
/// </summary>
[System.Serializable]
- public class SendFileResponseAllData
+ public class SendFileResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 0: 鏁版嵁鍐欏叆鎴愬姛,璇锋眰鍙戦�佷笅涓�涓暟鎹寘
///<para>1锛氭暟鎹啓鍏ュけ璐�</para>
@@ -988,61 +747,31 @@
/// <summary>
/// 瀹㈡埛绔彂閫佸垱寤烘枃浠跺懡浠�,缃戝叧鍙嶉淇℃伅
/// </summary>
- public CreateFileResponseAllData createFileResponseAllData;
- /// <summary>
- /// 瀹㈡埛绔彂閫佸垱寤烘枃浠跺懡浠�,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class CreateFileResponseAllData
+ public class CreateFileResponseAllData : CommonDevice.ErrorResponCommon
{
/// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
- /// <summary>
/// 0锛氬垱寤烘垚鍔�
///<para>1锛氬け璐ワ紝鏃犳硶鍒涘缓鏂囦欢</para>
///<para>2锛氬け璐ワ紝璇ュ鎴风鏈夋枃浠惰繕娌′笂浼犲畬鎴愶紝璇风瓑寰呮枃浠朵笂浼犲畬姣曪紙涓�涓鎴风鍙兘鍚屾椂涓婁紶涓�涓枃浠讹級</para>
/// </summary>
public int Result = 999;
- }
+ }
#endregion
#region 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅
/// <summary>
/// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅,缃戝叧鍙嶉淇℃伅
/// </summary>
- public FileTransferLsDiResponseAllData fileTransferLsDiResponseAllData;
- /// <summary>
- /// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class FileTransferLsDiResponseAllData
+ public class FileTransferLsDiResponseAllData : CommonDevice.ErrorResponCommon
{
/// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
- /// <summary>
/// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅
/// </summary>
public FileTransferLsDiResponseData fileTransferLsDiResponseData;
}
- /// <summary>
- /// 鏌ョ湅缃戝叧鐩綍鏂囦欢淇℃伅,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public FileTransferLsDiResponseData fileTransferLsDiResponseData;
/// <summary>
/// 瀹㈡埛绔彂閫佸垱寤烘枃浠跺懡浠�,缃戝叧鍙嶉淇℃伅
/// </summary>
@@ -1087,32 +816,15 @@
/// <summary>
/// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅
/// </summary>
- public SetDownloadFileResponseAllData setDownloadFileResponseAllData;
- /// <summary>
- /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class SetDownloadFileResponseAllData
+ public class SetDownloadFileResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞
/// </summary>
public SetDownloadFileResponseData setDownloadFileResponseData;
}
- /// <summary>
- /// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public SetDownloadFileResponseData setDownloadFileResponseData;
/// <summary>
/// 瀹㈡埛绔瀹氳涓嬭浇鐨勬枃浠跺悕绉板拰璺緞,缃戝叧鍙嶉淇℃伅
/// </summary>
@@ -1142,32 +854,15 @@
/// <summary>
/// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅鏁版嵁
/// </summary>
- public FileTransferGetFileInfoResponseAllData fileTransferGetFileInfoResponseAllData;
- /// <summary>
- /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅鏁版嵁
- /// </summary>
[System.Serializable]
- public class FileTransferGetFileInfoResponseAllData
+ public class FileTransferGetFileInfoResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅杩斿洖鐨勬暟鎹�
/// </summary>
public FileTransferGetFileInfoResponseData fileTransferGetFileInfoResponseData;
}
- /// <summary>
- /// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅杩斿洖鐨勬暟鎹�
- /// </summary>
- public FileTransferGetFileInfoResponseData fileTransferGetFileInfoResponseData;
/// <summary>
/// 鏌ョ湅鍗曚釜鏂囦欢淇℃伅杩斿洖鐨勬暟鎹�
/// </summary>
@@ -1198,22 +893,9 @@
/// <summary>
/// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏冲埌鏍煎紡鏁版嵁
/// </summary>
- public DownloadFileResponseAllData downloadFileResponseAllData;
- /// <summary>
- /// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏冲埌鏍煎紡鏁版嵁
- /// </summary>
[System.Serializable]
- public class DownloadFileResponseAllData
+ public class DownloadFileResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 0: 鏁版嵁鍐欏叆鎴愬姛,璇锋眰鍙戦�佷笅涓�涓暟鎹寘
///<para>1锛氱粓姝笅杞姐�傚綋涓嬭浇鍑虹幇閿欒锛屾垨鑰呬笅杞藉凡缁忓畬鎴愬彲浠ュ彂閫佽鍊笺��</para>
@@ -1221,10 +903,6 @@
public int Result = -1;
}
- /// <summary>
- /// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏�
- /// </summary>
- public FileTransferDownloadFileRespon fileTransferDownloadFileRespon;
/// <summary>
/// 瀹㈡埛绔帴鏀跺埌缃戝叧鍙戣壊鏁版嵁鏍煎紡鍚庡簲鍙嶉缁欑綉鍏�
/// </summary>
@@ -1243,32 +921,15 @@
/// <summary>
/// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅
/// </summary>
- public DelFileOrDirResponseAllData delFileOrDirResponseAllData;
- /// <summary>
- /// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class DelFileOrDirResponseAllData
+ public class DelFileOrDirResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒犻櫎鏂囦欢鎴栫洰褰�
/// </summary>
public DelFileOrDirResponseData delFileOrDirResponseData;
}
- /// <summary>
- /// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public DelFileOrDirResponseData delFileOrDirResponseData;
/// <summary>
/// 鍒犻櫎鏂囦欢鎴栫洰褰�,缃戝叧鍙嶉淇℃伅
/// </summary>
@@ -1293,32 +954,15 @@
/// <summary>
/// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅
/// </summary>
- public CreateDirResponseAllData createDirResponseAllData;
- /// <summary>
- /// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅
- /// </summary>
[System.Serializable]
- public class CreateDirResponseAllData
+ public class CreateDirResponseAllData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 鍒涘缓涓�涓洰褰�
/// </summary>
public CreateDirResponseData createDirResponseData;
}
- /// <summary>
- /// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅
- /// </summary>
- public CreateDirResponseData createDirResponseData;
/// <summary>
/// 鍒涘缓涓�涓洰褰�,缃戝叧鍙嶉淇℃伅
/// </summary>
@@ -1342,22 +986,9 @@
/// <summary>
/// 瀹㈡埛绔彂閫丏ES瀵嗛挜鍒扮綉鍏�,缃戝叧鍙嶉鍏蜂綋淇℃伅
/// </summary>
- public SendKeyResponData sendDESKeyResponData;
- /// <summary>
- /// 瀹㈡埛绔彂閫丏ES瀵嗛挜鍒扮綉鍏�,缃戝叧鍙嶉鍏蜂綋淇℃伅
- /// </summary>
[System.Serializable]
- public class SendKeyResponData
+ public class SendKeyResponData : CommonDevice.ErrorResponCommon
{
- /// <summary>
- /// 閿欒淇℃伅
- /// </summary>
- public string errorMessageBase;
- /// <summary>
- /// 缃戝叧淇℃伅閿欒鍙嶉
- /// <para>褰撶綉鍏虫帴鏀跺埌瀹㈡埛绔俊鎭悗锛屽嚭鐜颁互涓嬪紓甯告儏鍐靛皢鍙嶉閿欒銆�</para>
- /// </summary>
- public ErrorResponData errorResponData;
/// <summary>
/// 0锛氭垚鍔�
///<para>1锛氬け璐ワ紝RSA绉侀挜瑙ｅ瘑澶辫触</para>
diff --git a/ZigbeeApp/Shared/Phone/ZigBee/IO/LocalFileUtils.cs b/ZigbeeApp/Shared/Phone/ZigBee/IO/LocalFileUtils.cs
deleted file mode 100755
index f86475f..0000000
--- a/ZigbeeApp/Shared/Phone/ZigBee/IO/LocalFileUtils.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-锘縰sing System;
-using System.IO;
-using System.Collections.Generic;
-using ZigBee.Device;
-using System.Text;
-
-namespace ZigBee.IO
-{
- public static class LocalFileUtils
- {
- /// <summary>
- /// 淇濆瓨璁惧淇℃伅
- /// </summary>
- //public static string ReadEquipmentMessage(CommonDevice commonDevice)
- //{
- // string fileName = "Zigbee_";
- // fileName += commonDevice.GetType().ToString().Replace("Shared.", "") + "_" + commonDevice.DeviceAddr.ToString() + "_" + commonDevice.DeviceEpoint.ToString();
- // var bytes =Shared.IO.FileUtils.ReadFile(fileName);
- // string one = System.Text.Encoding.UTF8.GetString(bytes);
- // return one;
- //}
-
- /// <summary>
- ///淇濆瓨璁惧淇℃伅.
- /// </summary>
- //public static void SaveDeviceInfo(CommonDevice commonDevice, string epoint = "")
- //{
- // var deviceType = commonDevice.Type.ToString();
- // var fileName = "Zigbee_" + deviceType + "_" + commonDevice.DeviceAddr;
- // if (epoint != "")
- // {
- // fileName += "_" + (epoint.Length < 2 ? "0" + epoint : epoint);
- // }
- // commonDevice.SavePath = fileName;
- // Console.WriteLine(fileName);
- // //淇濆瓨鍒版牴鐩綍涓�
- // Shared.IO.FileUtils.WriteFileByBytes(System.IO.Path.Combine(Shared.Common.Config.Instance.HomeId, fileName), Encoding.UTF8.GetBytes(Newtonsoft.Json.JsonConvert.SerializeObject(commonDevice)));
- //}
- }
-}
\ No newline at end of file
diff --git a/ZigbeeApp/Shared/Shared.projitems b/ZigbeeApp/Shared/Shared.projitems
index e397f68..aa71f62 100755
--- a/ZigbeeApp/Shared/Shared.projitems
+++ b/ZigbeeApp/Shared/Shared.projitems
@@ -405,7 +405,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HumiditySensor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PMSensor.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Repeater.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ThirdPartyModuleUpgrade.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Transverter.cs" />
<Compile Include="$(MSBuildThisFileDirectory)R.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserView\HomePage.cs" />
@@ -464,7 +463,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\HDLbutton.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\IASZone.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\LigthtBase.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\LogicBase.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\OTADevice.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\Panel.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\PIRSensor.cs" />
@@ -476,7 +474,6 @@
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ToggleLight.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ZbGateway.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\Device\ZbGatewayData.cs" />
- <Compile Include="$(MSBuildThisFileDirectory)Phone\ZigBee\IO\LocalFileUtils.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlSafeguardLogic.cs" />
<Compile Include="$(MSBuildThisFileDirectory)Phone\UserCenter\CommonBase\Logic\HdlAlarmsLogic.cs" />
</ItemGroup>
--
Gitblit v1.8.0