From 7ee9224f4779efc78bfc8130e518e7d123864d47 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 11 四月 2023 11:42:38 +0800
Subject: [PATCH] 修复退出登录，挤下线卡死问题
---
HDL-ON_Android/HDL-ON_Android.csproj | 3
HDL-ON_Android/SplashActivity.cs | 3
HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs | 9
HDL_ON/Common/HDLCommon.cs | 11
HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs | 2
HDL-ON_Android/Resources/Resource.designer.cs | 439 +++++++++++++++++++++---------------
HDL_ON/UI/UI2/2-Classification/RoomPage.cs | 44 ++-
HDL_ON/DAL/DriverLayer/Control.cs | 60 ++--
HDL_ON/UI/MainPage.cs | 11
HDL_ON/DAL/DriverLayer/Control_TcpClient.cs | 85 +++---
HDL_ON/DAL/Mqtt/MqttClient.cs | 2
11 files changed, 399 insertions(+), 270 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 18901d3..9ef0e2b 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -782,6 +782,9 @@
<PackageReference Include="Square.OkHttp3">
<Version>3.14.4</Version>
</PackageReference>
+ <PackageReference Include="Bugly">
+ <Version>4.3.1</Version>
+ </PackageReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\Language.ini" />
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index 4ace83c..67dd43b 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -20503,368 +20503,440 @@
// aapt resource value: 0x7F0F03E4
public const int storage_status = 2131690468;
- // aapt resource value: 0x7F0F03E5
- public const int stream_type = 2131690469;
-
- // aapt resource value: 0x7F0F03E8
- public const int string_apiurl = 2131690472;
-
- // aapt resource value: 0x7F0F03E6
- public const int string_ap_connection = 2131690470;
-
- // aapt resource value: 0x7F0F03E7
- public const int string_ap_connection_normal = 2131690471;
-
- // aapt resource value: 0x7F0F03E9
- public const int string_authurl = 2131690473;
-
- // aapt resource value: 0x7F0F03EB
- public const int string_deviceserial = 2131690475;
-
- // aapt resource value: 0x7F0F03EA
- public const int string_device_network_mode = 2131690474;
-
- // aapt resource value: 0x7F0F03EC
- public const int string_ezopenurl = 2131690476;
-
- // aapt resource value: 0x7F0F03ED
- public const int string_get_device_version_fail = 2131690477;
-
- // aapt resource value: 0x7F0F03EE
- public const int string_smart_and_sound_wave_connection = 2131690478;
-
- // aapt resource value: 0x7F0F03EF
- public const int string_smart_connection = 2131690479;
-
- // aapt resource value: 0x7F0F03F0
- public const int string_smart_connection_normal = 2131690480;
-
- // aapt resource value: 0x7F0F03F1
- public const int string_sound_wave_connection = 2131690481;
-
- // aapt resource value: 0x7F0F03F2
- public const int string_wired_connection = 2131690482;
-
- // aapt resource value: 0x7F0F03F3
- public const int submit_secure_validate = 2131690483;
-
- // aapt resource value: 0x7F0F03F4
- public const int submit_sms_code = 2131690484;
-
- // aapt resource value: 0x7F0F03F5
- public const int switch_to_handset = 2131690485;
-
- // aapt resource value: 0x7F0F03F6
- public const int switch_to_speaker = 2131690486;
-
- // aapt resource value: 0x7F0F03F7
- public const int system_default_channel = 2131690487;
-
- // aapt resource value: 0x7F0F03F8
- public const int tab_more = 2131690488;
-
- // aapt resource value: 0x7F0F03F9
- public const int talk = 2131690489;
-
- // aapt resource value: 0x7F0F03FC
- public const int talking = 2131690492;
-
- // aapt resource value: 0x7F0F03FA
- public const int talk_open_failed = 2131690490;
-
- // aapt resource value: 0x7F0F03FB
- public const int talk_open_success = 2131690491;
-
// aapt resource value: 0x7F0F03FD
- public const int text_day_ago = 2131690493;
-
- // aapt resource value: 0x7F0F03FE
- public const int text_end_time_hint = 2131690494;
-
- // aapt resource value: 0x7F0F03FF
- public const int text_hour_ago = 2131690495;
+ public const int stream_type = 2131690493;
// aapt resource value: 0x7F0F0400
- public const int text_just = 2131690496;
+ public const int string_apiurl = 2131690496;
+
+ // aapt resource value: 0x7F0F03FE
+ public const int string_ap_connection = 2131690494;
+
+ // aapt resource value: 0x7F0F03FF
+ public const int string_ap_connection_normal = 2131690495;
// aapt resource value: 0x7F0F0401
- public const int text_minute_ago = 2131690497;
-
- // aapt resource value: 0x7F0F0402
- public const int text_month_ago = 2131690498;
+ public const int string_authurl = 2131690497;
// aapt resource value: 0x7F0F0403
- public const int text_press_to_copy = 2131690499;
+ public const int string_deviceserial = 2131690499;
+
+ // aapt resource value: 0x7F0F0402
+ public const int string_device_network_mode = 2131690498;
// aapt resource value: 0x7F0F0404
- public const int text_seconds_ago = 2131690500;
+ public const int string_ezopenurl = 2131690500;
// aapt resource value: 0x7F0F0405
- public const int text_start_time_hint = 2131690501;
+ public const int string_get_device_version_fail = 2131690501;
// aapt resource value: 0x7F0F0406
- public const int text_year_ago = 2131690502;
+ public const int string_smart_and_sound_wave_connection = 2131690502;
// aapt resource value: 0x7F0F0407
- public const int tip_heard_voice = 2131690503;
+ public const int string_smart_connection = 2131690503;
// aapt resource value: 0x7F0F0408
- public const int tip_login_out = 2131690504;
+ public const int string_smart_connection_normal = 2131690504;
// aapt resource value: 0x7F0F0409
- public const int tip_of_added_by_yourself_and_online = 2131690505;
+ public const int string_sound_wave_connection = 2131690505;
// aapt resource value: 0x7F0F040A
- public const int tip_of_bad_net = 2131690506;
+ public const int string_wired_connection = 2131690506;
+
+ // aapt resource value: 0x7F0F03E5
+ public const int strNetworkTipsCancelBtn = 2131690469;
+
+ // aapt resource value: 0x7F0F03E6
+ public const int strNetworkTipsConfirmBtn = 2131690470;
+
+ // aapt resource value: 0x7F0F03E7
+ public const int strNetworkTipsMessage = 2131690471;
+
+ // aapt resource value: 0x7F0F03E8
+ public const int strNetworkTipsTitle = 2131690472;
+
+ // aapt resource value: 0x7F0F03E9
+ public const int strNotificationClickToContinue = 2131690473;
+
+ // aapt resource value: 0x7F0F03EA
+ public const int strNotificationClickToInstall = 2131690474;
+
+ // aapt resource value: 0x7F0F03EB
+ public const int strNotificationClickToRetry = 2131690475;
+
+ // aapt resource value: 0x7F0F03EC
+ public const int strNotificationClickToView = 2131690476;
+
+ // aapt resource value: 0x7F0F03ED
+ public const int strNotificationDownloadError = 2131690477;
+
+ // aapt resource value: 0x7F0F03EF
+ public const int strNotificationDownloading = 2131690479;
+
+ // aapt resource value: 0x7F0F03EE
+ public const int strNotificationDownloadSucc = 2131690478;
+
+ // aapt resource value: 0x7F0F03F0
+ public const int strNotificationHaveNewVersion = 2131690480;
+
+ // aapt resource value: 0x7F0F03F2
+ public const int strToastCheckingUpgrade = 2131690482;
+
+ // aapt resource value: 0x7F0F03F1
+ public const int strToastCheckUpgradeError = 2131690481;
+
+ // aapt resource value: 0x7F0F03F3
+ public const int strToastYourAreTheLatestVersion = 2131690483;
+
+ // aapt resource value: 0x7F0F03F4
+ public const int strUpgradeDialogCancelBtn = 2131690484;
+
+ // aapt resource value: 0x7F0F03F5
+ public const int strUpgradeDialogContinueBtn = 2131690485;
+
+ // aapt resource value: 0x7F0F03F6
+ public const int strUpgradeDialogFeatureLabel = 2131690486;
+
+ // aapt resource value: 0x7F0F03F7
+ public const int strUpgradeDialogFileSizeLabel = 2131690487;
+
+ // aapt resource value: 0x7F0F03F8
+ public const int strUpgradeDialogInstallBtn = 2131690488;
+
+ // aapt resource value: 0x7F0F03F9
+ public const int strUpgradeDialogRetryBtn = 2131690489;
+
+ // aapt resource value: 0x7F0F03FA
+ public const int strUpgradeDialogUpdateTimeLabel = 2131690490;
+
+ // aapt resource value: 0x7F0F03FB
+ public const int strUpgradeDialogUpgradeBtn = 2131690491;
+
+ // aapt resource value: 0x7F0F03FC
+ public const int strUpgradeDialogVersionLabel = 2131690492;
// aapt resource value: 0x7F0F040B
- public const int tip_playback_again = 2131690507;
+ public const int submit_secure_validate = 2131690507;
// aapt resource value: 0x7F0F040C
- public const int tip_specified_device = 2131690508;
+ public const int submit_sms_code = 2131690508;
// aapt resource value: 0x7F0F040D
- public const int title_activate_device = 2131690509;
+ public const int switch_to_handset = 2131690509;
// aapt resource value: 0x7F0F040E
- public const int title_activate_device_fail = 2131690510;
+ public const int switch_to_speaker = 2131690510;
// aapt resource value: 0x7F0F040F
- public const int title_activity_connect_device_wifi = 2131690511;
+ public const int system_default_channel = 2131690511;
// aapt resource value: 0x7F0F0410
- public const int title_activity_ezupgrade_device = 2131690512;
+ public const int tab_more = 2131690512;
// aapt resource value: 0x7F0F0411
- public const int today = 2131690513;
-
- // aapt resource value: 0x7F0F0412
- public const int touch_fingerprint_sensor_hint = 2131690514;
-
- // aapt resource value: 0x7F0F0413
- public const int touch_to_load = 2131690515;
+ public const int talk = 2131690513;
// aapt resource value: 0x7F0F0414
- public const int try_again = 2131690516;
+ public const int talking = 2131690516;
+
+ // aapt resource value: 0x7F0F0412
+ public const int talk_open_failed = 2131690514;
+
+ // aapt resource value: 0x7F0F0413
+ public const int talk_open_success = 2131690515;
// aapt resource value: 0x7F0F0415
- public const int ui_call_demo_txt = 2131690517;
+ public const int text_day_ago = 2131690517;
// aapt resource value: 0x7F0F0416
- public const int unable_identify_two_dimensional_code_tip = 2131690518;
+ public const int text_end_time_hint = 2131690518;
// aapt resource value: 0x7F0F0417
- public const int unbind_to_bind = 2131690519;
+ public const int text_hour_ago = 2131690519;
// aapt resource value: 0x7F0F0418
- public const int unblanking = 2131690520;
+ public const int text_just = 2131690520;
// aapt resource value: 0x7F0F0419
- public const int unknow_ssid = 2131690521;
+ public const int text_minute_ago = 2131690521;
// aapt resource value: 0x7F0F041A
- public const int unlock_fail = 2131690522;
+ public const int text_month_ago = 2131690522;
// aapt resource value: 0x7F0F041B
- public const int unlock_success = 2131690523;
+ public const int text_press_to_copy = 2131690523;
// aapt resource value: 0x7F0F041C
- public const int unnamed = 2131690524;
+ public const int text_seconds_ago = 2131690524;
// aapt resource value: 0x7F0F041D
- public const int update_exit = 2131690525;
+ public const int text_start_time_hint = 2131690525;
// aapt resource value: 0x7F0F041E
- public const int upgrade = 2131690526;
+ public const int text_year_ago = 2131690526;
// aapt resource value: 0x7F0F041F
- public const int upgrade_fail = 2131690527;
+ public const int tip_heard_voice = 2131690527;
// aapt resource value: 0x7F0F0420
- public const int upgrade_progress = 2131690528;
+ public const int tip_login_out = 2131690528;
// aapt resource value: 0x7F0F0421
- public const int upgrade_success = 2131690529;
+ public const int tip_of_added_by_yourself_and_online = 2131690529;
// aapt resource value: 0x7F0F0422
- public const int upgrade_success_progress = 2131690530;
+ public const int tip_of_bad_net = 2131690530;
// aapt resource value: 0x7F0F0423
- public const int user_input_name = 2131690531;
+ public const int tip_playback_again = 2131690531;
// aapt resource value: 0x7F0F0424
- public const int user_login_title = 2131690532;
+ public const int tip_specified_device = 2131690532;
// aapt resource value: 0x7F0F0425
- public const int user_name_txt = 2131690533;
+ public const int title_activate_device = 2131690533;
// aapt resource value: 0x7F0F0426
- public const int user_pwd_login_login = 2131690534;
+ public const int title_activate_device_fail = 2131690534;
// aapt resource value: 0x7F0F0427
- public const int user_register = 2131690535;
+ public const int title_activity_connect_device_wifi = 2131690535;
// aapt resource value: 0x7F0F0428
- public const int user_register_btn = 2131690536;
+ public const int title_activity_ezupgrade_device = 2131690536;
// aapt resource value: 0x7F0F0429
- public const int valid_code_retrieve_valid_num = 2131690537;
+ public const int today = 2131690537;
// aapt resource value: 0x7F0F042A
- public const int verify_camera_fail_network_exception = 2131690538;
+ public const int touch_fingerprint_sensor_hint = 2131690538;
// aapt resource value: 0x7F0F042B
- public const int verify_code_error = 2131690539;
+ public const int touch_to_load = 2131690539;
// aapt resource value: 0x7F0F042C
- public const int verify_sms_code_fail = 2131690540;
+ public const int try_again = 2131690540;
// aapt resource value: 0x7F0F042D
- public const int verify_sms_code_success = 2131690541;
+ public const int ui_call_demo_txt = 2131690541;
// aapt resource value: 0x7F0F042E
- public const int version_newest = 2131690542;
+ public const int unable_identify_two_dimensional_code_tip = 2131690542;
// aapt resource value: 0x7F0F042F
- public const int video_answer = 2131690543;
+ public const int unbind_to_bind = 2131690543;
// aapt resource value: 0x7F0F0430
- public const int video_box = 2131690544;
+ public const int unblanking = 2131690544;
// aapt resource value: 0x7F0F0431
- public const int video_confirm = 2131690545;
+ public const int unknow_ssid = 2131690545;
// aapt resource value: 0x7F0F0432
- public const int video_device = 2131690546;
+ public const int unlock_fail = 2131690546;
// aapt resource value: 0x7F0F0433
- public const int video_fail = 2131690547;
+ public const int unlock_success = 2131690547;
// aapt resource value: 0x7F0F0434
- public const int video_hang_up = 2131690548;
+ public const int unnamed = 2131690548;
// aapt resource value: 0x7F0F0435
- public const int video_icon = 2131690549;
+ public const int update_exit = 2131690549;
// aapt resource value: 0x7F0F0436
- public const int video_not_answer = 2131690550;
+ public const int upgrade = 2131690550;
// aapt resource value: 0x7F0F0437
- public const int video_screenshot = 2131690551;
+ public const int upgrade_fail = 2131690551;
// aapt resource value: 0x7F0F0438
- public const int video_square = 2131690552;
+ public const int upgrade_progress = 2131690552;
// aapt resource value: 0x7F0F0439
- public const int video_success = 2131690553;
+ public const int upgrade_success = 2131690553;
// aapt resource value: 0x7F0F043A
- public const int video_talk_call_cancel = 2131690554;
+ public const int upgrade_success_progress = 2131690554;
// aapt resource value: 0x7F0F043B
- public const int video_talk_call_is_accepted = 2131690555;
+ public const int user_input_name = 2131690555;
// aapt resource value: 0x7F0F043C
- public const int video_talk_is_playing = 2131690556;
+ public const int user_login_title = 2131690556;
// aapt resource value: 0x7F0F043D
- public const int video_talk_sdk_toast_hang_up = 2131690557;
+ public const int user_name_txt = 2131690557;
// aapt resource value: 0x7F0F043E
- public const int video_talk_sdk_toast_nobody = 2131690558;
+ public const int user_pwd_login_login = 2131690558;
// aapt resource value: 0x7F0F043F
- public const int video_talk_signal_weak = 2131690559;
+ public const int user_register = 2131690559;
// aapt resource value: 0x7F0F0440
- public const int video_talk_watch_is_busy = 2131690560;
+ public const int user_register_btn = 2131690560;
// aapt resource value: 0x7F0F0441
- public const int video_talk_watch_temperature_high_hang = 2131690561;
+ public const int valid_code_retrieve_valid_num = 2131690561;
// aapt resource value: 0x7F0F0442
- public const int video_talk_watch_temperature_high_hint = 2131690562;
+ public const int verify_camera_fail_network_exception = 2131690562;
// aapt resource value: 0x7F0F0443
- public const int video_talk_watch_temperature_high_reject = 2131690563;
+ public const int verify_code_error = 2131690563;
// aapt resource value: 0x7F0F0444
- public const int video_talk_watch_temperature_high_warn = 2131690564;
+ public const int verify_sms_code_fail = 2131690564;
// aapt resource value: 0x7F0F0445
- public const int video_tip = 2131690565;
+ public const int verify_sms_code_success = 2131690565;
// aapt resource value: 0x7F0F0446
- public const int video_unlock = 2131690566;
+ public const int version_newest = 2131690566;
// aapt resource value: 0x7F0F0447
- public const int wait = 2131690567;
+ public const int video_answer = 2131690567;
// aapt resource value: 0x7F0F0448
- public const int web_login_button_txt = 2131690568;
+ public const int video_box = 2131690568;
// aapt resource value: 0x7F0F0449
- public const int wechat_interconnect = 2131690569;
+ public const int video_confirm = 2131690569;
// aapt resource value: 0x7F0F044A
- public const int wifi_connected = 2131690570;
+ public const int video_device = 2131690570;
// aapt resource value: 0x7F0F044B
- public const int wifi_connection_finish_need_refresh = 2131690571;
+ public const int video_fail = 2131690571;
// aapt resource value: 0x7F0F044C
- public const int wifi_set = 2131690572;
+ public const int video_hang_up = 2131690572;
// aapt resource value: 0x7F0F044D
- public const int wifi_setting = 2131690573;
+ public const int video_icon = 2131690573;
// aapt resource value: 0x7F0F044E
- public const int wired_connection = 2131690574;
-
- // aapt resource value: 0x7F0F0450
- public const int xlistview_footer_hint_normal = 2131690576;
+ public const int video_not_answer = 2131690574;
// aapt resource value: 0x7F0F044F
- public const int xlistview_footer_hint_no_more_device = 2131690575;
+ public const int video_screenshot = 2131690575;
+
+ // aapt resource value: 0x7F0F0450
+ public const int video_square = 2131690576;
// aapt resource value: 0x7F0F0451
- public const int xlistview_footer_hint_ready = 2131690577;
+ public const int video_success = 2131690577;
// aapt resource value: 0x7F0F0452
- public const int xlistview_footer_no_more = 2131690578;
+ public const int video_talk_call_cancel = 2131690578;
// aapt resource value: 0x7F0F0453
- public const int xlistview_footer_no_more_msg = 2131690579;
+ public const int video_talk_call_is_accepted = 2131690579;
// aapt resource value: 0x7F0F0454
- public const int xlistview_header_hint_loading = 2131690580;
+ public const int video_talk_is_playing = 2131690580;
// aapt resource value: 0x7F0F0455
- public const int xlistview_header_hint_more = 2131690581;
+ public const int video_talk_sdk_toast_hang_up = 2131690581;
// aapt resource value: 0x7F0F0456
- public const int xlistview_header_hint_normal = 2131690582;
+ public const int video_talk_sdk_toast_nobody = 2131690582;
// aapt resource value: 0x7F0F0457
- public const int xlistview_header_hint_ready = 2131690583;
+ public const int video_talk_signal_weak = 2131690583;
// aapt resource value: 0x7F0F0458
- public const int xlistview_header_last_time = 2131690584;
+ public const int video_talk_watch_is_busy = 2131690584;
// aapt resource value: 0x7F0F0459
- public const int zxing_app_name = 2131690585;
+ public const int video_talk_watch_temperature_high_hang = 2131690585;
// aapt resource value: 0x7F0F045A
- public const int zxing_button_ok = 2131690586;
+ public const int video_talk_watch_temperature_high_hint = 2131690586;
// aapt resource value: 0x7F0F045B
- public const int zxing_msg_camera_framework_bug = 2131690587;
+ public const int video_talk_watch_temperature_high_reject = 2131690587;
// aapt resource value: 0x7F0F045C
- public const int zxing_msg_default_status = 2131690588;
+ public const int video_talk_watch_temperature_high_warn = 2131690588;
// aapt resource value: 0x7F0F045D
- public const int zxing_scan_tips = 2131690589;
+ public const int video_tip = 2131690589;
+
+ // aapt resource value: 0x7F0F045E
+ public const int video_unlock = 2131690590;
+
+ // aapt resource value: 0x7F0F045F
+ public const int wait = 2131690591;
+
+ // aapt resource value: 0x7F0F0460
+ public const int web_login_button_txt = 2131690592;
+
+ // aapt resource value: 0x7F0F0461
+ public const int wechat_interconnect = 2131690593;
+
+ // aapt resource value: 0x7F0F0462
+ public const int wifi_connected = 2131690594;
+
+ // aapt resource value: 0x7F0F0463
+ public const int wifi_connection_finish_need_refresh = 2131690595;
+
+ // aapt resource value: 0x7F0F0464
+ public const int wifi_set = 2131690596;
+
+ // aapt resource value: 0x7F0F0465
+ public const int wifi_setting = 2131690597;
+
+ // aapt resource value: 0x7F0F0466
+ public const int wired_connection = 2131690598;
+
+ // aapt resource value: 0x7F0F0468
+ public const int xlistview_footer_hint_normal = 2131690600;
+
+ // aapt resource value: 0x7F0F0467
+ public const int xlistview_footer_hint_no_more_device = 2131690599;
+
+ // aapt resource value: 0x7F0F0469
+ public const int xlistview_footer_hint_ready = 2131690601;
+
+ // aapt resource value: 0x7F0F046A
+ public const int xlistview_footer_no_more = 2131690602;
+
+ // aapt resource value: 0x7F0F046B
+ public const int xlistview_footer_no_more_msg = 2131690603;
+
+ // aapt resource value: 0x7F0F046C
+ public const int xlistview_header_hint_loading = 2131690604;
+
+ // aapt resource value: 0x7F0F046D
+ public const int xlistview_header_hint_more = 2131690605;
+
+ // aapt resource value: 0x7F0F046E
+ public const int xlistview_header_hint_normal = 2131690606;
+
+ // aapt resource value: 0x7F0F046F
+ public const int xlistview_header_hint_ready = 2131690607;
+
+ // aapt resource value: 0x7F0F0470
+ public const int xlistview_header_last_time = 2131690608;
+
+ // aapt resource value: 0x7F0F0471
+ public const int zxing_app_name = 2131690609;
+
+ // aapt resource value: 0x7F0F0472
+ public const int zxing_button_ok = 2131690610;
+
+ // aapt resource value: 0x7F0F0473
+ public const int zxing_msg_camera_framework_bug = 2131690611;
+
+ // aapt resource value: 0x7F0F0474
+ public const int zxing_msg_default_status = 2131690612;
+
+ // aapt resource value: 0x7F0F0475
+ public const int zxing_scan_tips = 2131690613;
static String()
{
@@ -26334,7 +26406,10 @@
public const int network_security_config = 2131886083;
// aapt resource value: 0x7F120004
- public const int xamarin_essentials_fileprovider_file_paths = 2131886084;
+ public const int provider_paths = 2131886084;
+
+ // aapt resource value: 0x7F120005
+ public const int xamarin_essentials_fileprovider_file_paths = 2131886085;
static Xml()
{
diff --git a/HDL-ON_Android/SplashActivity.cs b/HDL-ON_Android/SplashActivity.cs
index c6ae1b6..7b9abca 100644
--- a/HDL-ON_Android/SplashActivity.cs
+++ b/HDL-ON_Android/SplashActivity.cs
@@ -109,6 +109,9 @@
//#endif
JPushInterface.Init(this);
+ Com.Chteam.Agent.BuglyAgentHelper.Init(this.ApplicationContext, "316a8f5d83");
+
+
BaseActivity.OnCreateActoin += (activity, application) =>
{
diff --git a/HDL_ON/Common/HDLCommon.cs b/HDL_ON/Common/HDLCommon.cs
index 800c3d2..42a0b9a 100644
--- a/HDL_ON/Common/HDLCommon.cs
+++ b/HDL_ON/Common/HDLCommon.cs
@@ -447,7 +447,13 @@
//璐﹀彿鍦ㄥ埆澶勭櫥闄嗭紝琚涪涓嬬嚎 璺宠浆鍒扮櫥褰曢〉闈�
new Alert(Language.StringByID(StringId.Tip), Language.StringByID(StringId.LoggedOnOtherDevices), Language.StringByID(StringId.Close)).Show();
- Logout();
+ try
+ {
+ Logout();
+ }catch (Exception ex)
+ {
+ MainPage.Log($"鎸や笅绾垮紓甯�:{ex.Message}");
+ }
}
/// <summary>
@@ -470,8 +476,10 @@
UserInfo.Current.LastTime = DateTime.MinValue;
UserInfo.Current.SaveUserInfo();
DB_ResidenceData.Instance.EixtAccount();
+ MainPage.Log("閫�鍑鸿处鍙锋竻绌烘暟鎹�");
//4.娉ㄩ攢HDLSIP璐﹀彿鐧诲綍 2021-08-20
HDLLinphone.Current.LogoutAllAccount();
+ MainPage.Log("娉ㄩ攢HDLSIP璐﹀彿鐧诲綍");
#if __IOS__
//5.鍏ㄨ閫氱櫥鍑�
@@ -492,6 +500,7 @@
{
if (waitPage != null)
{
+ waitPage.Hide();
waitPage.RemoveFromParent();
waitPage = null;
}
diff --git a/HDL_ON/DAL/DriverLayer/Control.cs b/HDL_ON/DAL/DriverLayer/Control.cs
index eeb2431..656dcca 100644
--- a/HDL_ON/DAL/DriverLayer/Control.cs
+++ b/HDL_ON/DAL/DriverLayer/Control.cs
@@ -138,45 +138,51 @@
}
set
{
- if (_GatewayOnline_Cloud != value)
+ try
{
- _GatewayOnline_Cloud = value;
- if (GatewayOnline_Local)
+ if (_GatewayOnline_Cloud != value)
{
- return;
- }
- if (value)
- {
- if (DB_ResidenceData.Instance.HomeGateway == null)
+ _GatewayOnline_Cloud = value;
+ if (GatewayOnline_Local)
{
return;
}
- if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+ if (value)
{
+ if (DB_ResidenceData.Instance.HomeGateway == null)
+ {
+ return;
+ }
+ if (!DB_ResidenceData.Instance.HomeGateway.gatewayStatus)//杩滅▼鎯呭喌涓嬶紝缃戝叧鏈摼鎺ユ湇鍔″櫒涓嶈兘淇敼涓婚〉缃戝叧鐘舵��
+ {
+ new System.Threading.Thread(() =>
+ {
+ System.Threading.Thread.Sleep(3000);
+ var pm = new DAL.Server.HttpServerRequest();
+ pm.GetGatewayInfo();
+ })
+ { IsBackground = true }.Start();
+ return;
+ }
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
new System.Threading.Thread(() =>
{
- System.Threading.Thread.Sleep(3000);
- var pm = new DAL.Server.HttpServerRequest();
- pm.GetGatewayInfo();
+ System.Threading.Thread.Sleep(1000);
+ FunctionList.List.ReadAllFunctionStatus();
})
- { IsBackground = true }.Start();
- return;
+ { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
}
- //淇敼涓婚〉杩炴帴鐘舵��
- HomePage.LoadEvent_CheckLinkStatus();
- MainPage.Log($"缃戝叧浜戠鍦ㄧ嚎锛屽埛鏂拌澶囩姸鎬�");
- new System.Threading.Thread(() =>
+ else
{
- System.Threading.Thread.Sleep(1000);
- FunctionList.List.ReadAllFunctionStatus();
- })
- { IsBackground = true, Priority = System.Threading.ThreadPriority.AboveNormal }.Start();
+ //淇敼涓婚〉杩炴帴鐘舵��
+ HomePage.LoadEvent_CheckLinkStatus();
+ }
}
- else
- {
- //淇敼涓婚〉杩炴帴鐘舵��
- HomePage.LoadEvent_CheckLinkStatus();
- }
+ }catch(Exception ex)
+ {
+ MainPage.Log($"Set GatewayCloudOnline Error:{ex.Message}");
}
}
}
diff --git a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
index 251f039..2c53a79 100644
--- a/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
+++ b/HDL_ON/DAL/DriverLayer/Control_TcpClient.cs
@@ -320,54 +320,59 @@
{
receiveThread = new Thread(() =>
{
- while (isConnected)
+ try
{
- if (_tcpClient == null)
+ while (isConnected)
{
- try
+ if (_tcpClient == null)
{
- receiveThread?.Abort();
- }
- catch { }
- finally
- {
- receiveThread = null;
- }
- return;
- }
- if (!_tcpClient.Connected)
- {
- MainPage.Log("tcp瀹㈡埛绔柇寮�浜嗚繛鎺�...");
- isConnected = false;
- return;
- }
- try
- {
- // 瀹氫箟涓�涓�2M鐨勭紦瀛樺尯锛�
- byte[] arrMsgRec = new byte[1024 * 1024 * 2];
- try
- {
- int size = _tcpClient.GetStream().Read(arrMsgRec, 0, arrMsgRec.Length);
- }
- catch (Exception ex)
- {
- isConnected = false;
- MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹寮傚父:{ex.Message}");
+ try
+ {
+ receiveThread?.Abort();
+ }
+ catch { }
+ finally
+ {
+ receiveThread = null;
+ }
return;
}
- var tcpDataString = System.Text.Encoding.UTF8.GetString(arrMsgRec, 0, arrMsgRec.Length);
-
-
- if (!string.IsNullOrEmpty(tcpDataString))
+ if (!_tcpClient.Connected)
{
- MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹");
- Control.Ins.ConvertReceiveData(arrMsgRec, null);
-
+ MainPage.Log("tcp瀹㈡埛绔柇寮�浜嗚繛鎺�...");
+ isConnected = false;
+ return;
}
- }
- catch (Exception) { }
- }
+ try
+ {
+ // 瀹氫箟涓�涓�2M鐨勭紦瀛樺尯锛�
+ byte[] arrMsgRec = new byte[1024 * 1024 * 2];
+ try
+ {
+ int size = _tcpClient.GetStream().Read(arrMsgRec, 0, arrMsgRec.Length);
+ }
+ catch (Exception ex)
+ {
+ isConnected = false;
+ MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹寮傚父:{ex.Message}");
+ return;
+ }
+ var tcpDataString = System.Text.Encoding.UTF8.GetString(arrMsgRec, 0, arrMsgRec.Length);
+
+ if (!string.IsNullOrEmpty(tcpDataString))
+ {
+ MainPage.Log($"灞�鍩熺綉tcp鏁版嵁鎺ユ敹");
+ Control.Ins.ConvertReceiveData(arrMsgRec, null);
+
+ }
+ }
+ catch (Exception) { }
+ }
+ }catch (Exception ex)
+ {
+ MainPage.Log($"tcp ReceiveMessage error :{ex.Message}");
+ }
});
//receiveThread.IsBackground = true;
receiveThread.Start();
diff --git a/HDL_ON/DAL/Mqtt/MqttClient.cs b/HDL_ON/DAL/Mqtt/MqttClient.cs
index 12026aa..f5b5a83 100644
--- a/HDL_ON/DAL/Mqtt/MqttClient.cs
+++ b/HDL_ON/DAL/Mqtt/MqttClient.cs
@@ -870,7 +870,7 @@
static void ReceiveNotifySqueezeAsync(string mMes)
{
#if DEBUG
- return;
+ //return;
#endif
if (mMes == PushSignStr) return;//鏄嚜宸辩殑鐧诲綍鎺ㄩ�佷笉澶勭悊//鎴栬�呭綋鍓嶄笉鏄繙绋嬮摼鎺ョ姸鎬�
//娴嬭瘯璐﹀彿锛屼笉鎸や笅绾�
diff --git a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
index 52f4a76..13c9e3c 100644
--- a/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
+++ b/HDL_ON/DAL/ThirdPartySdk/HDLLinphone.cs
@@ -164,7 +164,14 @@
Shared.IOS.HDLLinphoneSDK.HDLLinPhoneSDK.Instance().LogoutAllLinphoneUser();
#else
- HDLLinphoneKit.Instance.Logout();
+ if (HDLLinphoneKit.Instance != null)
+ {
+ HDLLinphoneKit.Instance.Logout();
+ }
+ else
+ {
+
+ }
#endif
}
diff --git a/HDL_ON/UI/MainPage.cs b/HDL_ON/UI/MainPage.cs
index 397b590..8c30533 100644
--- a/HDL_ON/UI/MainPage.cs
+++ b/HDL_ON/UI/MainPage.cs
@@ -211,7 +211,10 @@
/// </summary>
public static void GoLoginPage(UserInfo userInfo = null)
{
- BaseView.RemoveAll();
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
BaseView.BackgroundColor = CSS_Color.BackgroundColor;
var fisrtView = new UI.UI1Login.LoginPage();
fisrtView.BackgroundColor = CSS_Color.MainBackgroundColor;
@@ -226,7 +229,11 @@
/// <param name="pageShowEvent">涓婚〉鏄剧ず涔嬪悗瑙﹀彂鐨勪簨浠�(娌℃湁浣忓畢鐨勮瘽,鍒欎笉浼氳Е鍙�)</param>
public static void GoUserPage(bool downloadData, bool isFirstOpen = false, Action pageShowEvent = null)
{
- BaseView.RemoveAll();
+
+ for (int i = 0; i < BaseView.ChildrenCount; i++)
+ {
+ BaseView.GetChildren(i).RemoveFromParent();
+ }
#region 鍚庨��浜嬩欢
BasePageView = new PageLayout();
BasePageView.ScrollEnabled = false;
diff --git a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
index 3c04eec..f19a9d6 100644
--- a/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
+++ b/HDL_ON/UI/UI2/2-Classification/RoomPage.cs
@@ -1,4 +1,5 @@
-锘縰sing System;
+锘�
+using System;
using HDL_ON.Entity;
using HDL_ON.UI.CSS;
using Shared;
@@ -88,6 +89,9 @@
{
continue;
}
+#if DEBUG
+ //throw new ArgumentNullException();
+#endif
functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
@@ -127,22 +131,32 @@
functionListView.AddChidren(functionDiv);
}
}
- foreach (var scene in room.GetRoomScenes(false))
+ try
{
- functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
- var sceneRow = new FrameLayout()
+ foreach (var scene in room.GetRoomScenes(false))
{
- Gravity = Gravity.CenterHorizontal,
- Width = Application.GetRealWidth(343),
- Height = Application.GetRealHeight(116),
- Radius = (uint)Application.GetMinRealAverage(12),
- BorderColor = 0x00FFFFFF,
- BorderWidth = 1,
- BackgroundColor = CSS_Color.MainBackgroundColor,
- Tag = "Scene-" + scene.sid
- };
- functionListView.AddChidren(sceneRow);
- LoadSceneRow(sceneRow, scene);
+ if (scene == null)
+ {
+ continue;
+ }
+ functionListView.AddChidren(new Button() { Height = Application.GetRealHeight(12) });
+ var sceneRow = new FrameLayout()
+ {
+ Gravity = Gravity.CenterHorizontal,
+ Width = Application.GetRealWidth(343),
+ Height = Application.GetRealHeight(116),
+ Radius = (uint)Application.GetMinRealAverage(12),
+ BorderColor = 0x00FFFFFF,
+ BorderWidth = 1,
+ BackgroundColor = CSS_Color.MainBackgroundColor,
+ Tag = "Scene-" + scene.sid
+ };
+ functionListView.AddChidren(sceneRow);
+ LoadSceneRow(sceneRow, scene);
+ }
+ }catch (Exception ex)
+ {
+ MainPage.Log($"RoomPage LoadPage Error:{ex.Message}");
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
index 77c25b5..d0d0372 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/ChooseRoomPage.cs
@@ -57,7 +57,7 @@
public void LoadPage()
{
bodyView.BackgroundColor = CSS_Color.BackgroundColor;
- new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView(backAction);
+ new TopViewDiv(bodyView, Language.StringByID(StringId.LocationManagement)).LoadTopView();
contentView = new VerticalScrolViewLayout()
{
--
Gitblit v1.8.0