From 3f6685c77beeb12baf840733fb890860f4c26e7c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 25 七月 2024 17:25:59 +0800
Subject: [PATCH] 2024年07月25日17:24:45
---
HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs | 336 ++++++++--------
HDL-ON_Android/Resources/Resource.designer.cs | 755 ++++++++++++++++++------------------
HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs | 6
HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs | 70 ++-
NunitTest-Android/Resources/Resource.designer.cs | 2
5 files changed, 594 insertions(+), 575 deletions(-)
diff --git a/HDL-ON_Android/Resources/Resource.designer.cs b/HDL-ON_Android/Resources/Resource.designer.cs
index d4467f4..36065fc 100644
--- a/HDL-ON_Android/Resources/Resource.designer.cs
+++ b/HDL-ON_Android/Resources/Resource.designer.cs
@@ -19735,928 +19735,931 @@
public const int please_try_connect_device_hotspot_manually = 2131690306;
// aapt resource value: 0x7F0F0343
- public const int plug = 2131690307;
+ public const int please_try_connect_device_hotspot_manually2 = 2131690307;
// aapt resource value: 0x7F0F0344
- public const int pm = 2131690308;
+ public const int plug = 2131690308;
// aapt resource value: 0x7F0F0345
- public const int press_again_to_exit = 2131690309;
+ public const int pm = 2131690309;
// aapt resource value: 0x7F0F0346
- public const int press_to_talk_release_to_listen = 2131690310;
+ public const int press_again_to_exit = 2131690310;
// aapt resource value: 0x7F0F0347
- public const int privacy_masking = 2131690311;
+ public const int press_to_talk_release_to_listen = 2131690311;
// aapt resource value: 0x7F0F0348
- public const int privacy_policy_and_service_agreement = 2131690312;
+ public const int privacy_masking = 2131690312;
// aapt resource value: 0x7F0F0349
- public const int probe_not_support_tip = 2131690313;
+ public const int privacy_policy_and_service_agreement = 2131690313;
// aapt resource value: 0x7F0F034A
- public const int promptUserToActivate = 2131690314;
+ public const int probe_not_support_tip = 2131690314;
// aapt resource value: 0x7F0F034B
- public const int ptz = 2131690315;
+ public const int promptUserToActivate = 2131690315;
// aapt resource value: 0x7F0F034C
- public const int ptz_control_timeout_cruise_track_failed = 2131690316;
+ public const int ptz = 2131690316;
// aapt resource value: 0x7F0F034D
- public const int ptz_control_timeout_sound_lacalization_failed = 2131690317;
+ public const int ptz_control_timeout_cruise_track_failed = 2131690317;
// aapt resource value: 0x7F0F034E
- public const int ptz_is_preseting = 2131690318;
+ public const int ptz_control_timeout_sound_lacalization_failed = 2131690318;
// aapt resource value: 0x7F0F034F
- public const int ptz_mirroring_failed = 2131690319;
+ public const int ptz_is_preseting = 2131690319;
// aapt resource value: 0x7F0F0350
- public const int ptz_operation_failed = 2131690320;
+ public const int ptz_mirroring_failed = 2131690320;
// aapt resource value: 0x7F0F0351
- public const int ptz_operation_too_frequently = 2131690321;
+ public const int ptz_operation_failed = 2131690321;
// aapt resource value: 0x7F0F0352
- public const int ptz_preset_current_position_failed = 2131690322;
+ public const int ptz_operation_too_frequently = 2131690322;
// aapt resource value: 0x7F0F0353
- public const int ptz_preset_exceed_maxnum_failed = 2131690323;
+ public const int ptz_preset_current_position_failed = 2131690323;
// aapt resource value: 0x7F0F0354
- public const int ptz_preset_invalid_position_failed = 2131690324;
+ public const int ptz_preset_exceed_maxnum_failed = 2131690324;
// aapt resource value: 0x7F0F0355
- public const int ptz_preset_sound_localization_failed = 2131690325;
+ public const int ptz_preset_invalid_position_failed = 2131690325;
// aapt resource value: 0x7F0F0356
- public const int ptz_privacying_failed = 2131690326;
+ public const int ptz_preset_sound_localization_failed = 2131690326;
// aapt resource value: 0x7F0F0357
- public const int pull_to_refresh_from_bottom_pull_label = 2131690327;
+ public const int ptz_privacying_failed = 2131690327;
// aapt resource value: 0x7F0F0358
- public const int pull_to_refresh_from_bottom_refreshing_label = 2131690328;
+ public const int pull_to_refresh_from_bottom_pull_label = 2131690328;
// aapt resource value: 0x7F0F0359
- public const int pull_to_refresh_from_bottom_release_label = 2131690329;
+ public const int pull_to_refresh_from_bottom_refreshing_label = 2131690329;
// aapt resource value: 0x7F0F035A
- public const int pull_to_refresh_pull_label = 2131690330;
+ public const int pull_to_refresh_from_bottom_release_label = 2131690330;
// aapt resource value: 0x7F0F035B
- public const int pull_to_refresh_refreshing_label = 2131690331;
+ public const int pull_to_refresh_pull_label = 2131690331;
// aapt resource value: 0x7F0F035C
- public const int pull_to_refresh_release_label = 2131690332;
+ public const int pull_to_refresh_refreshing_label = 2131690332;
// aapt resource value: 0x7F0F035D
- public const int push_cat_body = 2131690333;
+ public const int pull_to_refresh_release_label = 2131690333;
// aapt resource value: 0x7F0F035E
- public const int push_cat_head = 2131690334;
+ public const int push_cat_body = 2131690334;
// aapt resource value: 0x7F0F035F
- public const int push_event_alarm_title = 2131690335;
+ public const int push_cat_head = 2131690335;
// aapt resource value: 0x7F0F0360
- public const int push_event_from = 2131690336;
+ public const int push_event_alarm_title = 2131690336;
// aapt resource value: 0x7F0F0361
- public const int push_event_get = 2131690337;
+ public const int push_event_from = 2131690337;
// aapt resource value: 0x7F0F0362
- public const int push_event_get_count = 2131690338;
+ public const int push_event_get = 2131690338;
// aapt resource value: 0x7F0F0363
- public const int push_out_event_alarm_title = 2131690339;
+ public const int push_event_get_count = 2131690339;
// aapt resource value: 0x7F0F0364
- public const int pwd_not_contain_chinese = 2131690340;
+ public const int push_out_event_alarm_title = 2131690340;
// aapt resource value: 0x7F0F0365
- public const int qrcode_card = 2131690341;
+ public const int pwd_not_contain_chinese = 2131690341;
// aapt resource value: 0x7F0F0366
- public const int quality_balanced = 2131690342;
+ public const int qrcode_card = 2131690342;
// aapt resource value: 0x7F0F0367
- public const int quality_flunet = 2131690343;
+ public const int quality_balanced = 2131690343;
// aapt resource value: 0x7F0F0368
- public const int quality_hd = 2131690344;
+ public const int quality_flunet = 2131690344;
// aapt resource value: 0x7F0F0369
- public const int quality_super_hd = 2131690345;
-
- // aapt resource value: 0x7F0F0370
- public const int querying_camera_text = 2131690352;
+ public const int quality_hd = 2131690345;
// aapt resource value: 0x7F0F036A
- public const int query_camera_fail = 2131690346;
-
- // aapt resource value: 0x7F0F036B
- public const int query_camera_fail_network_exception = 2131690347;
-
- // aapt resource value: 0x7F0F036C
- public const int query_camera_fail_network_exception_or_server_exception = 2131690348;
-
- // aapt resource value: 0x7F0F036D
- public const int query_camera_fail_not_exit = 2131690349;
-
- // aapt resource value: 0x7F0F036E
- public const int query_camera_fail_repeat_error = 2131690350;
-
- // aapt resource value: 0x7F0F036F
- public const int query_camera_fail_server_exception = 2131690351;
-
- // aapt resource value: 0x7F0F0372
- public const int readed = 2131690354;
+ public const int quality_super_hd = 2131690346;
// aapt resource value: 0x7F0F0371
- public const int read_privacy_policy_and_service_agreement_tip = 2131690353;
+ public const int querying_camera_text = 2131690353;
+
+ // aapt resource value: 0x7F0F036B
+ public const int query_camera_fail = 2131690347;
+
+ // aapt resource value: 0x7F0F036C
+ public const int query_camera_fail_network_exception = 2131690348;
+
+ // aapt resource value: 0x7F0F036D
+ public const int query_camera_fail_network_exception_or_server_exception = 2131690349;
+
+ // aapt resource value: 0x7F0F036E
+ public const int query_camera_fail_not_exit = 2131690350;
+
+ // aapt resource value: 0x7F0F036F
+ public const int query_camera_fail_repeat_error = 2131690351;
+
+ // aapt resource value: 0x7F0F0370
+ public const int query_camera_fail_server_exception = 2131690352;
// aapt resource value: 0x7F0F0373
- public const int realplay = 2131690355;
+ public const int readed = 2131690355;
+
+ // aapt resource value: 0x7F0F0372
+ public const int read_privacy_policy_and_service_agreement_tip = 2131690354;
// aapt resource value: 0x7F0F0374
- public const int realplay_close_sound_localization_fail = 2131690356;
+ public const int realplay = 2131690356;
// aapt resource value: 0x7F0F0375
- public const int realplay_encrypt_password_error_message = 2131690357;
+ public const int realplay_close_sound_localization_fail = 2131690357;
// aapt resource value: 0x7F0F0376
- public const int realplay_encrypt_password_error_title = 2131690358;
+ public const int realplay_encrypt_password_error_message = 2131690358;
// aapt resource value: 0x7F0F0377
- public const int realplay_fail_connect_device = 2131690359;
+ public const int realplay_encrypt_password_error_title = 2131690359;
// aapt resource value: 0x7F0F0378
- public const int realplay_fail_device_not_exist = 2131690360;
+ public const int realplay_fail_connect_device = 2131690360;
// aapt resource value: 0x7F0F0379
- public const int realplay_full_talk_start_tip = 2131690361;
+ public const int realplay_fail_device_not_exist = 2131690361;
// aapt resource value: 0x7F0F037A
- public const int realplay_loading = 2131690362;
+ public const int realplay_full_talk_start_tip = 2131690362;
// aapt resource value: 0x7F0F037B
- public const int realplay_login_password_error = 2131690363;
+ public const int realplay_loading = 2131690363;
// aapt resource value: 0x7F0F037C
- public const int realplay_login_password_msg = 2131690364;
+ public const int realplay_login_password_error = 2131690364;
// aapt resource value: 0x7F0F037D
- public const int realplay_no_encrypt_password_error = 2131690365;
+ public const int realplay_login_password_msg = 2131690365;
// aapt resource value: 0x7F0F037E
- public const int realplay_no_permission = 2131690366;
+ public const int realplay_no_encrypt_password_error = 2131690366;
// aapt resource value: 0x7F0F037F
- public const int realplay_open_sound_localization_fail = 2131690367;
+ public const int realplay_no_permission = 2131690367;
// aapt resource value: 0x7F0F0380
- public const int realplay_password_error_message1 = 2131690368;
+ public const int realplay_open_sound_localization_fail = 2131690368;
// aapt resource value: 0x7F0F0381
- public const int realplay_password_error_message3 = 2131690369;
+ public const int realplay_password_error_message1 = 2131690369;
// aapt resource value: 0x7F0F0382
- public const int realplay_password_error_message4 = 2131690370;
+ public const int realplay_password_error_message3 = 2131690370;
// aapt resource value: 0x7F0F0383
- public const int realplay_password_error_title = 2131690371;
+ public const int realplay_password_error_message4 = 2131690371;
// aapt resource value: 0x7F0F0384
- public const int realplay_play_fail = 2131690372;
+ public const int realplay_password_error_title = 2131690372;
// aapt resource value: 0x7F0F0385
- public const int realplay_play_fail_becauseof_network = 2131690373;
+ public const int realplay_play_fail = 2131690373;
// aapt resource value: 0x7F0F0386
- public const int realplay_play_no_video_source = 2131690374;
+ public const int realplay_play_fail_becauseof_network = 2131690374;
// aapt resource value: 0x7F0F0387
- public const int realplay_play_talkback_fail = 2131690375;
+ public const int realplay_play_no_video_source = 2131690375;
// aapt resource value: 0x7F0F0388
- public const int realplay_play_talkback_fail_ison = 2131690376;
+ public const int realplay_play_talkback_fail = 2131690376;
// aapt resource value: 0x7F0F0389
- public const int realplay_play_talkback_fail_privacy = 2131690377;
+ public const int realplay_play_talkback_fail_ison = 2131690377;
// aapt resource value: 0x7F0F038A
- public const int realplay_play_talkback_network_exception = 2131690378;
+ public const int realplay_play_talkback_fail_privacy = 2131690378;
// aapt resource value: 0x7F0F038B
- public const int realplay_play_talkback_request_timeout = 2131690379;
+ public const int realplay_play_talkback_network_exception = 2131690379;
// aapt resource value: 0x7F0F038C
- public const int realplay_set_fail_network = 2131690380;
+ public const int realplay_play_talkback_request_timeout = 2131690380;
// aapt resource value: 0x7F0F038D
- public const int realplay_set_fail_status = 2131690381;
+ public const int realplay_set_fail_network = 2131690381;
// aapt resource value: 0x7F0F038E
- public const int realplay_set_vediomode_fail = 2131690382;
+ public const int realplay_set_fail_status = 2131690382;
// aapt resource value: 0x7F0F038F
- public const int realplay_share_no_permission = 2131690383;
+ public const int realplay_set_vediomode_fail = 2131690383;
// aapt resource value: 0x7F0F0390
- public const int realplay_share_time_over = 2131690384;
+ public const int realplay_share_no_permission = 2131690384;
// aapt resource value: 0x7F0F0391
- public const int realplay_verifycode_error_message0 = 2131690385;
+ public const int realplay_share_time_over = 2131690385;
// aapt resource value: 0x7F0F0392
- public const int realplay_verifycode_error_placehold = 2131690386;
+ public const int realplay_verifycode_error_message0 = 2131690386;
// aapt resource value: 0x7F0F0393
- public const int receice_leave_msg_audio = 2131690387;
+ public const int realplay_verifycode_error_placehold = 2131690387;
// aapt resource value: 0x7F0F0394
- public const int receice_leave_msg_video = 2131690388;
+ public const int receice_leave_msg_audio = 2131690388;
// aapt resource value: 0x7F0F0395
- public const int record = 2131690389;
+ public const int receice_leave_msg_video = 2131690389;
// aapt resource value: 0x7F0F0396
- public const int refresh = 2131690390;
-
- // aapt resource value: 0x7F0F039A
- public const int refreshing = 2131690394;
+ public const int record = 2131690390;
// aapt resource value: 0x7F0F0397
- public const int refresh_done = 2131690391;
-
- // aapt resource value: 0x7F0F0398
- public const int refresh_empty_hint = 2131690392;
-
- // aapt resource value: 0x7F0F0399
- public const int refresh_fail_hint = 2131690393;
-
- // aapt resource value: 0x7F0F039C
- public const int remoteplayback_capture_fail = 2131690396;
-
- // aapt resource value: 0x7F0F039D
- public const int remoteplayback_capture_fail_for_memory = 2131690397;
-
- // aapt resource value: 0x7F0F039E
- public const int remoteplayback_connect_device_error = 2131690398;
-
- // aapt resource value: 0x7F0F039F
- public const int remoteplayback_connect_server_error = 2131690399;
-
- // aapt resource value: 0x7F0F03A0
- public const int remoteplayback_fail = 2131690400;
-
- // aapt resource value: 0x7F0F03A1
- public const int remoteplayback_norecordfile = 2131690401;
-
- // aapt resource value: 0x7F0F03A2
- public const int remoteplayback_norecordfile_alarm = 2131690402;
-
- // aapt resource value: 0x7F0F03A3
- public const int remoteplayback_over_link = 2131690403;
-
- // aapt resource value: 0x7F0F03A4
- public const int remoteplayback_record_fail = 2131690404;
-
- // aapt resource value: 0x7F0F03A5
- public const int remoteplayback_record_fail_for_memory = 2131690405;
+ public const int refresh = 2131690391;
// aapt resource value: 0x7F0F039B
- public const int remoteplayback_SDCard_disable_use = 2131690395;
+ public const int refreshing = 2131690395;
+
+ // aapt resource value: 0x7F0F0398
+ public const int refresh_done = 2131690392;
+
+ // aapt resource value: 0x7F0F0399
+ public const int refresh_empty_hint = 2131690393;
+
+ // aapt resource value: 0x7F0F039A
+ public const int refresh_fail_hint = 2131690394;
+
+ // aapt resource value: 0x7F0F039D
+ public const int remoteplayback_capture_fail = 2131690397;
+
+ // aapt resource value: 0x7F0F039E
+ public const int remoteplayback_capture_fail_for_memory = 2131690398;
+
+ // aapt resource value: 0x7F0F039F
+ public const int remoteplayback_connect_device_error = 2131690399;
+
+ // aapt resource value: 0x7F0F03A0
+ public const int remoteplayback_connect_server_error = 2131690400;
+
+ // aapt resource value: 0x7F0F03A1
+ public const int remoteplayback_fail = 2131690401;
+
+ // aapt resource value: 0x7F0F03A2
+ public const int remoteplayback_norecordfile = 2131690402;
+
+ // aapt resource value: 0x7F0F03A3
+ public const int remoteplayback_norecordfile_alarm = 2131690403;
+
+ // aapt resource value: 0x7F0F03A4
+ public const int remoteplayback_over_link = 2131690404;
+
+ // aapt resource value: 0x7F0F03A5
+ public const int remoteplayback_record_fail = 2131690405;
// aapt resource value: 0x7F0F03A6
- public const int remoteplayback_searchfile_fail_for_device = 2131690406;
+ public const int remoteplayback_record_fail_for_memory = 2131690406;
+
+ // aapt resource value: 0x7F0F039C
+ public const int remoteplayback_SDCard_disable_use = 2131690396;
// aapt resource value: 0x7F0F03A7
- public const int remoteplayback_searchfile_fail_for_network = 2131690407;
+ public const int remoteplayback_searchfile_fail_for_device = 2131690407;
// aapt resource value: 0x7F0F03A8
- public const int reset_10_sec_to_release = 2131690408;
+ public const int remoteplayback_searchfile_fail_for_network = 2131690408;
// aapt resource value: 0x7F0F03A9
- public const int reset_device = 2131690409;
+ public const int reset_10_sec_to_release = 2131690409;
// aapt resource value: 0x7F0F03AA
- public const int result_txt = 2131690410;
+ public const int reset_device = 2131690410;
// aapt resource value: 0x7F0F03AB
- public const int retry = 2131690411;
-
- // aapt resource value: 0x7F0F03AD
- public const int router = 2131690413;
+ public const int result_txt = 2131690411;
// aapt resource value: 0x7F0F03AC
- public const int route_status_light = 2131690412;
+ public const int retry = 2131690412;
// aapt resource value: 0x7F0F03AE
- public const int sadp_activate_state1 = 2131690414;
+ public const int router = 2131690414;
+
+ // aapt resource value: 0x7F0F03AD
+ public const int route_status_light = 2131690413;
// aapt resource value: 0x7F0F03AF
- public const int sadp_activate_state2 = 2131690415;
+ public const int sadp_activate_state1 = 2131690415;
// aapt resource value: 0x7F0F03B0
- public const int sadp_password_input_hint = 2131690416;
+ public const int sadp_activate_state2 = 2131690416;
// aapt resource value: 0x7F0F03B1
- public const int sadp_password_toast = 2131690417;
+ public const int sadp_password_input_hint = 2131690417;
// aapt resource value: 0x7F0F03B2
- public const int sadp_password_too_weak = 2131690418;
+ public const int sadp_password_toast = 2131690418;
// aapt resource value: 0x7F0F03B3
- public const int sadp_quit_activate = 2131690419;
+ public const int sadp_password_too_weak = 2131690419;
// aapt resource value: 0x7F0F03B4
- public const int save_encrypt_password_fail_network_exception = 2131690420;
+ public const int sadp_quit_activate = 2131690420;
// aapt resource value: 0x7F0F03B5
- public const int scan_add = 2131690421;
+ public const int save_encrypt_password_fail_network_exception = 2131690421;
// aapt resource value: 0x7F0F03B6
- public const int scan_connet_network = 2131690422;
+ public const int scan_add = 2131690422;
// aapt resource value: 0x7F0F03B7
- public const int scan_cue_txt = 2131690423;
+ public const int scan_connet_network = 2131690423;
// aapt resource value: 0x7F0F03B8
- public const int scan_device_add_by_others = 2131690424;
+ public const int scan_cue_txt = 2131690424;
// aapt resource value: 0x7F0F03B9
- public const int scan_device_search = 2131690425;
+ public const int scan_device_add_by_others = 2131690425;
// aapt resource value: 0x7F0F03BA
- public const int scan_device_serial_no = 2131690426;
+ public const int scan_device_search = 2131690426;
// aapt resource value: 0x7F0F03BB
- public const int scan_network_unavailible = 2131690427;
+ public const int scan_device_serial_no = 2131690427;
// aapt resource value: 0x7F0F03BC
- public const int scan_probe_qrcode_error = 2131690428;
+ public const int scan_network_unavailible = 2131690428;
// aapt resource value: 0x7F0F03BD
- public const int scan_search_probe_qrcode = 2131690429;
+ public const int scan_probe_qrcode_error = 2131690429;
// aapt resource value: 0x7F0F03BE
- public const int scan_title = 2131690430;
+ public const int scan_search_probe_qrcode = 2131690430;
// aapt resource value: 0x7F0F03BF
- public const int scan_title_txt = 2131690431;
+ public const int scan_title = 2131690431;
// aapt resource value: 0x7F0F03C0
- public const int screenshot_fail = 2131690432;
+ public const int scan_title_txt = 2131690432;
// aapt resource value: 0x7F0F03C1
- public const int screenshot_success = 2131690433;
-
- // aapt resource value: 0x7F0F03C4
- public const int sdk_is_init = 2131690436;
-
- // aapt resource value: 0x7F0F03C3
- public const int sd_card_formatting = 2131690435;
+ public const int screenshot_fail = 2131690433;
// aapt resource value: 0x7F0F03C2
- public const int sd_card_format_tip = 2131690434;
+ public const int screenshot_success = 2131690434;
// aapt resource value: 0x7F0F03C5
- public const int search = 2131690437;
+ public const int sdk_is_init = 2131690437;
+
+ // aapt resource value: 0x7F0F03C4
+ public const int sd_card_formatting = 2131690436;
+
+ // aapt resource value: 0x7F0F03C3
+ public const int sd_card_format_tip = 2131690435;
// aapt resource value: 0x7F0F03C6
- public const int search_menu_title = 2131690438;
+ public const int search = 2131690438;
// aapt resource value: 0x7F0F03C7
- public const int secure_validate = 2131690439;
-
- // aapt resource value: 0x7F0F03C9
- public const int secure_validatee_fail = 2131690441;
+ public const int search_menu_title = 2131690439;
// aapt resource value: 0x7F0F03C8
- public const int secure_validate_success = 2131690440;
+ public const int secure_validate = 2131690440;
// aapt resource value: 0x7F0F03CA
- public const int seek_camera_fail_device_not_support_shipin7 = 2131690442;
+ public const int secure_validatee_fail = 2131690442;
+
+ // aapt resource value: 0x7F0F03C9
+ public const int secure_validate_success = 2131690441;
// aapt resource value: 0x7F0F03CB
- public const int select_all = 2131690443;
+ public const int seek_camera_fail_device_not_support_shipin7 = 2131690443;
// aapt resource value: 0x7F0F03CC
- public const int select_date = 2131690444;
+ public const int select_all = 2131690444;
// aapt resource value: 0x7F0F03CD
- public const int select_set_parameters = 2131690445;
+ public const int select_date = 2131690445;
// aapt resource value: 0x7F0F03CE
- public const int select_set_wifi = 2131690446;
+ public const int select_set_parameters = 2131690446;
// aapt resource value: 0x7F0F03CF
- public const int serial_add_hint = 2131690447;
+ public const int select_set_wifi = 2131690447;
// aapt resource value: 0x7F0F03D0
- public const int serial_add_password_error_title = 2131690448;
+ public const int serial_add_hint = 2131690448;
// aapt resource value: 0x7F0F03D1
- public const int serial_input_text = 2131690449;
+ public const int serial_add_password_error_title = 2131690449;
// aapt resource value: 0x7F0F03D2
- public const int serial_number_error = 2131690450;
+ public const int serial_input_text = 2131690450;
// aapt resource value: 0x7F0F03D3
- public const int serial_number_is_null = 2131690451;
+ public const int serial_number_error = 2131690451;
// aapt resource value: 0x7F0F03D4
- public const int serial_number_put_the_right_no = 2131690452;
+ public const int serial_number_is_null = 2131690452;
// aapt resource value: 0x7F0F03D5
- public const int server_area = 2131690453;
-
- // aapt resource value: 0x7F0F03DA
- public const int setting = 2131690458;
-
- // aapt resource value: 0x7F0F03DB
- public const int setting_video_level = 2131690459;
+ public const int serial_number_put_the_right_no = 2131690453;
// aapt resource value: 0x7F0F03D6
- public const int set_defence_plan = 2131690454;
+ public const int server_area = 2131690454;
- // aapt resource value: 0x7F0F03D7
- public const int set_device_wifi_network_need_reset_the_device = 2131690455;
-
- // aapt resource value: 0x7F0F03D8
- public const int set_ptz_flip_fail = 2131690456;
-
- // aapt resource value: 0x7F0F03D9
- public const int set_ptz_flip_success = 2131690457;
+ // aapt resource value: 0x7F0F03DB
+ public const int setting = 2131690459;
// aapt resource value: 0x7F0F03DC
- public const int share_devices = 2131690460;
+ public const int setting_video_level = 2131690460;
+
+ // aapt resource value: 0x7F0F03D7
+ public const int set_defence_plan = 2131690455;
+
+ // aapt resource value: 0x7F0F03D8
+ public const int set_device_wifi_network_need_reset_the_device = 2131690456;
+
+ // aapt resource value: 0x7F0F03D9
+ public const int set_ptz_flip_fail = 2131690457;
+
+ // aapt resource value: 0x7F0F03DA
+ public const int set_ptz_flip_success = 2131690458;
// aapt resource value: 0x7F0F03DD
- public const int sms_verify_bind_error = 2131690461;
+ public const int share_devices = 2131690461;
// aapt resource value: 0x7F0F03DE
- public const int sms_verify_code_received = 2131690462;
+ public const int sms_verify_bind_error = 2131690462;
// aapt resource value: 0x7F0F03DF
- public const int source_detection_off = 2131690463;
+ public const int sms_verify_code_received = 2131690463;
// aapt resource value: 0x7F0F03E0
- public const int source_detection_on = 2131690464;
+ public const int source_detection_off = 2131690464;
// aapt resource value: 0x7F0F03E1
- public const int specified_device = 2131690465;
+ public const int source_detection_on = 2131690465;
// aapt resource value: 0x7F0F03E2
- public const int srl_component_falsify = 2131690466;
+ public const int specified_device = 2131690466;
// aapt resource value: 0x7F0F03E3
- public const int srl_content_empty = 2131690467;
+ public const int srl_component_falsify = 2131690467;
// aapt resource value: 0x7F0F03E4
- public const int srl_footer_failed = 2131690468;
+ public const int srl_content_empty = 2131690468;
// aapt resource value: 0x7F0F03E5
- public const int srl_footer_finish = 2131690469;
+ public const int srl_footer_failed = 2131690469;
// aapt resource value: 0x7F0F03E6
- public const int srl_footer_loading = 2131690470;
+ public const int srl_footer_finish = 2131690470;
// aapt resource value: 0x7F0F03E7
- public const int srl_footer_nothing = 2131690471;
+ public const int srl_footer_loading = 2131690471;
// aapt resource value: 0x7F0F03E8
- public const int srl_footer_pulling = 2131690472;
+ public const int srl_footer_nothing = 2131690472;
// aapt resource value: 0x7F0F03E9
- public const int srl_footer_refreshing = 2131690473;
+ public const int srl_footer_pulling = 2131690473;
// aapt resource value: 0x7F0F03EA
- public const int srl_footer_release = 2131690474;
+ public const int srl_footer_refreshing = 2131690474;
// aapt resource value: 0x7F0F03EB
- public const int srl_header_failed = 2131690475;
+ public const int srl_footer_release = 2131690475;
// aapt resource value: 0x7F0F03EC
- public const int srl_header_finish = 2131690476;
+ public const int srl_header_failed = 2131690476;
// aapt resource value: 0x7F0F03ED
- public const int srl_header_loading = 2131690477;
+ public const int srl_header_finish = 2131690477;
// aapt resource value: 0x7F0F03EE
- public const int srl_header_pulling = 2131690478;
+ public const int srl_header_loading = 2131690478;
// aapt resource value: 0x7F0F03EF
- public const int srl_header_refreshing = 2131690479;
+ public const int srl_header_pulling = 2131690479;
// aapt resource value: 0x7F0F03F0
- public const int srl_header_release = 2131690480;
+ public const int srl_header_refreshing = 2131690480;
// aapt resource value: 0x7F0F03F1
- public const int srl_header_secondary = 2131690481;
+ public const int srl_header_release = 2131690481;
// aapt resource value: 0x7F0F03F2
- public const int srl_header_update = 2131690482;
+ public const int srl_header_secondary = 2131690482;
// aapt resource value: 0x7F0F03F3
- public const int start_cloud = 2131690483;
+ public const int srl_header_update = 2131690483;
// aapt resource value: 0x7F0F03F4
- public const int start_to_experience = 2131690484;
+ public const int start_cloud = 2131690484;
// aapt resource value: 0x7F0F03F5
- public const int start_voice_talk = 2131690485;
+ public const int start_to_experience = 2131690485;
// aapt resource value: 0x7F0F03F6
- public const int status_bar_notification_info_overflow = 2131690486;
+ public const int start_voice_talk = 2131690486;
// aapt resource value: 0x7F0F03F7
- public const int step3_adding_device_to_account = 2131690487;
+ public const int status_bar_notification_info_overflow = 2131690487;
// aapt resource value: 0x7F0F03F8
- public const int stop = 2131690488;
+ public const int step3_adding_device_to_account = 2131690488;
// aapt resource value: 0x7F0F03F9
- public const int storage_status = 2131690489;
+ public const int stop = 2131690489;
// aapt resource value: 0x7F0F03FA
- public const int stream_type = 2131690490;
-
- // aapt resource value: 0x7F0F03FD
- public const int string_apiurl = 2131690493;
+ public const int storage_status = 2131690490;
// aapt resource value: 0x7F0F03FB
- public const int string_ap_connection = 2131690491;
-
- // aapt resource value: 0x7F0F03FC
- public const int string_ap_connection_normal = 2131690492;
+ public const int stream_type = 2131690491;
// aapt resource value: 0x7F0F03FE
- public const int string_authurl = 2131690494;
+ public const int string_apiurl = 2131690494;
- // aapt resource value: 0x7F0F0400
- public const int string_deviceserial = 2131690496;
+ // aapt resource value: 0x7F0F03FC
+ public const int string_ap_connection = 2131690492;
+
+ // aapt resource value: 0x7F0F03FD
+ public const int string_ap_connection_normal = 2131690493;
// aapt resource value: 0x7F0F03FF
- public const int string_device_network_mode = 2131690495;
+ public const int string_authurl = 2131690495;
// aapt resource value: 0x7F0F0401
- public const int string_ezopenurl = 2131690497;
+ public const int string_deviceserial = 2131690497;
+
+ // aapt resource value: 0x7F0F0400
+ public const int string_device_network_mode = 2131690496;
// aapt resource value: 0x7F0F0402
- public const int string_get_device_version_fail = 2131690498;
+ public const int string_ezopenurl = 2131690498;
// aapt resource value: 0x7F0F0403
- public const int string_smart_and_sound_wave_connection = 2131690499;
+ public const int string_get_device_version_fail = 2131690499;
// aapt resource value: 0x7F0F0404
- public const int string_smart_connection = 2131690500;
+ public const int string_smart_and_sound_wave_connection = 2131690500;
// aapt resource value: 0x7F0F0405
- public const int string_smart_connection_normal = 2131690501;
+ public const int string_smart_connection = 2131690501;
// aapt resource value: 0x7F0F0406
- public const int string_sound_wave_connection = 2131690502;
+ public const int string_smart_connection_normal = 2131690502;
// aapt resource value: 0x7F0F0407
- public const int string_wired_connection = 2131690503;
+ public const int string_sound_wave_connection = 2131690503;
// aapt resource value: 0x7F0F0408
- public const int submit_secure_validate = 2131690504;
+ public const int string_wired_connection = 2131690504;
// aapt resource value: 0x7F0F0409
- public const int submit_sms_code = 2131690505;
+ public const int submit_secure_validate = 2131690505;
// aapt resource value: 0x7F0F040A
- public const int switch_to_handset = 2131690506;
+ public const int submit_sms_code = 2131690506;
// aapt resource value: 0x7F0F040B
- public const int switch_to_speaker = 2131690507;
+ public const int switch_to_handset = 2131690507;
// aapt resource value: 0x7F0F040C
- public const int system_default_channel = 2131690508;
+ public const int switch_to_speaker = 2131690508;
// aapt resource value: 0x7F0F040D
- public const int tab_more = 2131690509;
+ public const int system_default_channel = 2131690509;
// aapt resource value: 0x7F0F040E
- public const int talk = 2131690510;
-
- // aapt resource value: 0x7F0F0411
- public const int talking = 2131690513;
+ public const int tab_more = 2131690510;
// aapt resource value: 0x7F0F040F
- public const int talk_open_failed = 2131690511;
-
- // aapt resource value: 0x7F0F0410
- public const int talk_open_success = 2131690512;
+ public const int talk = 2131690511;
// aapt resource value: 0x7F0F0412
- public const int text_day_ago = 2131690514;
+ public const int talking = 2131690514;
+
+ // aapt resource value: 0x7F0F0410
+ public const int talk_open_failed = 2131690512;
+
+ // aapt resource value: 0x7F0F0411
+ public const int talk_open_success = 2131690513;
// aapt resource value: 0x7F0F0413
- public const int text_end_time_hint = 2131690515;
+ public const int text_day_ago = 2131690515;
// aapt resource value: 0x7F0F0414
- public const int text_hour_ago = 2131690516;
+ public const int text_end_time_hint = 2131690516;
// aapt resource value: 0x7F0F0415
- public const int text_just = 2131690517;
+ public const int text_hour_ago = 2131690517;
// aapt resource value: 0x7F0F0416
- public const int text_minute_ago = 2131690518;
+ public const int text_just = 2131690518;
// aapt resource value: 0x7F0F0417
- public const int text_month_ago = 2131690519;
+ public const int text_minute_ago = 2131690519;
// aapt resource value: 0x7F0F0418
- public const int text_press_to_copy = 2131690520;
+ public const int text_month_ago = 2131690520;
// aapt resource value: 0x7F0F0419
- public const int text_seconds_ago = 2131690521;
+ public const int text_press_to_copy = 2131690521;
// aapt resource value: 0x7F0F041A
- public const int text_start_time_hint = 2131690522;
+ public const int text_seconds_ago = 2131690522;
// aapt resource value: 0x7F0F041B
- public const int text_year_ago = 2131690523;
+ public const int text_start_time_hint = 2131690523;
// aapt resource value: 0x7F0F041C
- public const int tip = 2131690524;
+ public const int text_year_ago = 2131690524;
// aapt resource value: 0x7F0F041D
- public const int tip_confirm_unlock = 2131690525;
+ public const int tip = 2131690525;
// aapt resource value: 0x7F0F041E
- public const int tip_heard_voice = 2131690526;
+ public const int tip_confirm_unlock = 2131690526;
// aapt resource value: 0x7F0F041F
- public const int tip_login_out = 2131690527;
+ public const int tip_heard_voice = 2131690527;
// aapt resource value: 0x7F0F0420
- public const int tip_of_added_by_yourself_and_online = 2131690528;
+ public const int tip_login_out = 2131690528;
// aapt resource value: 0x7F0F0421
- public const int tip_of_bad_net = 2131690529;
+ public const int tip_of_added_by_yourself_and_online = 2131690529;
// aapt resource value: 0x7F0F0422
- public const int tip_playback_again = 2131690530;
+ public const int tip_of_bad_net = 2131690530;
// aapt resource value: 0x7F0F0423
- public const int tip_specified_device = 2131690531;
+ public const int tip_playback_again = 2131690531;
// aapt resource value: 0x7F0F0424
- public const int title_activate_device = 2131690532;
+ public const int tip_specified_device = 2131690532;
// aapt resource value: 0x7F0F0425
- public const int title_activate_device_fail = 2131690533;
+ public const int title_activate_device = 2131690533;
// aapt resource value: 0x7F0F0426
- public const int title_activity_connect_device_wifi = 2131690534;
+ public const int title_activate_device_fail = 2131690534;
// aapt resource value: 0x7F0F0427
- public const int title_activity_ezupgrade_device = 2131690535;
+ public const int title_activity_connect_device_wifi = 2131690535;
// aapt resource value: 0x7F0F0428
- public const int today = 2131690536;
+ public const int title_activity_ezupgrade_device = 2131690536;
// aapt resource value: 0x7F0F0429
- public const int touch_fingerprint_sensor_hint = 2131690537;
+ public const int today = 2131690537;
// aapt resource value: 0x7F0F042A
- public const int touch_to_load = 2131690538;
+ public const int touch_fingerprint_sensor_hint = 2131690538;
// aapt resource value: 0x7F0F042B
- public const int try_again = 2131690539;
+ public const int touch_to_load = 2131690539;
// aapt resource value: 0x7F0F042C
- public const int ui_call_demo_txt = 2131690540;
+ public const int try_again = 2131690540;
// aapt resource value: 0x7F0F042D
- public const int unable_identify_two_dimensional_code_tip = 2131690541;
+ public const int ui_call_demo_txt = 2131690541;
// aapt resource value: 0x7F0F042E
- public const int unanswered = 2131690542;
+ public const int unable_identify_two_dimensional_code_tip = 2131690542;
// aapt resource value: 0x7F0F042F
- public const int unbind_to_bind = 2131690543;
+ public const int unanswered = 2131690543;
// aapt resource value: 0x7F0F0430
- public const int unblanking = 2131690544;
+ public const int unbind_to_bind = 2131690544;
// aapt resource value: 0x7F0F0431
- public const int unknow_ssid = 2131690545;
+ public const int unblanking = 2131690545;
// aapt resource value: 0x7F0F0432
- public const int unlock_fail = 2131690546;
+ public const int unknow_ssid = 2131690546;
// aapt resource value: 0x7F0F0433
- public const int unlock_success = 2131690547;
+ public const int unlock_fail = 2131690547;
// aapt resource value: 0x7F0F0434
- public const int unnamed = 2131690548;
+ public const int unlock_success = 2131690548;
// aapt resource value: 0x7F0F0435
- public const int update_exit = 2131690549;
+ public const int unnamed = 2131690549;
// aapt resource value: 0x7F0F0436
- public const int upgrade = 2131690550;
+ public const int update_exit = 2131690550;
// aapt resource value: 0x7F0F0437
- public const int upgrade_fail = 2131690551;
+ public const int upgrade = 2131690551;
// aapt resource value: 0x7F0F0438
- public const int upgrade_progress = 2131690552;
+ public const int upgrade_fail = 2131690552;
// aapt resource value: 0x7F0F0439
- public const int upgrade_success = 2131690553;
+ public const int upgrade_progress = 2131690553;
// aapt resource value: 0x7F0F043A
- public const int upgrade_success_progress = 2131690554;
+ public const int upgrade_success = 2131690554;
// aapt resource value: 0x7F0F043B
- public const int user_input_name = 2131690555;
+ public const int upgrade_success_progress = 2131690555;
// aapt resource value: 0x7F0F043C
- public const int user_login_title = 2131690556;
+ public const int user_input_name = 2131690556;
// aapt resource value: 0x7F0F043D
- public const int user_name_txt = 2131690557;
+ public const int user_login_title = 2131690557;
// aapt resource value: 0x7F0F043E
- public const int user_pwd_login_login = 2131690558;
+ public const int user_name_txt = 2131690558;
// aapt resource value: 0x7F0F043F
- public const int user_register = 2131690559;
+ public const int user_pwd_login_login = 2131690559;
// aapt resource value: 0x7F0F0440
- public const int user_register_btn = 2131690560;
+ public const int user_register = 2131690560;
// aapt resource value: 0x7F0F0441
- public const int valid_code_retrieve_valid_num = 2131690561;
+ public const int user_register_btn = 2131690561;
// aapt resource value: 0x7F0F0442
- public const int verify_camera_fail_network_exception = 2131690562;
+ public const int valid_code_retrieve_valid_num = 2131690562;
// aapt resource value: 0x7F0F0443
- public const int verify_code_error = 2131690563;
+ public const int verify_camera_fail_network_exception = 2131690563;
// aapt resource value: 0x7F0F0444
- public const int verify_sms_code_fail = 2131690564;
+ public const int verify_code_error = 2131690564;
// aapt resource value: 0x7F0F0445
- public const int verify_sms_code_success = 2131690565;
+ public const int verify_sms_code_fail = 2131690565;
// aapt resource value: 0x7F0F0446
- public const int version_newest = 2131690566;
+ public const int verify_sms_code_success = 2131690566;
// aapt resource value: 0x7F0F0447
- public const int video_answer = 2131690567;
+ public const int version_newest = 2131690567;
// aapt resource value: 0x7F0F0448
- public const int video_box = 2131690568;
+ public const int video_answer = 2131690568;
// aapt resource value: 0x7F0F0449
- public const int video_confirm = 2131690569;
+ public const int video_box = 2131690569;
// aapt resource value: 0x7F0F044A
- public const int video_device = 2131690570;
+ public const int video_confirm = 2131690570;
// aapt resource value: 0x7F0F044B
- public const int video_fail = 2131690571;
+ public const int video_device = 2131690571;
// aapt resource value: 0x7F0F044C
- public const int video_hang_up = 2131690572;
+ public const int video_fail = 2131690572;
// aapt resource value: 0x7F0F044D
- public const int video_icon = 2131690573;
+ public const int video_hang_up = 2131690573;
// aapt resource value: 0x7F0F044E
- public const int video_not_answer = 2131690574;
+ public const int video_icon = 2131690574;
// aapt resource value: 0x7F0F044F
- public const int video_screenshot = 2131690575;
+ public const int video_not_answer = 2131690575;
// aapt resource value: 0x7F0F0450
- public const int video_square = 2131690576;
+ public const int video_screenshot = 2131690576;
// aapt resource value: 0x7F0F0451
- public const int video_success = 2131690577;
+ public const int video_square = 2131690577;
// aapt resource value: 0x7F0F0452
- public const int video_talk_call_cancel = 2131690578;
+ public const int video_success = 2131690578;
// aapt resource value: 0x7F0F0453
- public const int video_talk_call_is_accepted = 2131690579;
+ public const int video_talk_call_cancel = 2131690579;
// aapt resource value: 0x7F0F0454
- public const int video_talk_is_playing = 2131690580;
+ public const int video_talk_call_is_accepted = 2131690580;
// aapt resource value: 0x7F0F0455
- public const int video_talk_sdk_toast_hang_up = 2131690581;
+ public const int video_talk_is_playing = 2131690581;
// aapt resource value: 0x7F0F0456
- public const int video_talk_sdk_toast_nobody = 2131690582;
+ public const int video_talk_sdk_toast_hang_up = 2131690582;
// aapt resource value: 0x7F0F0457
- public const int video_talk_signal_weak = 2131690583;
+ public const int video_talk_sdk_toast_nobody = 2131690583;
// aapt resource value: 0x7F0F0458
- public const int video_talk_watch_is_busy = 2131690584;
+ public const int video_talk_signal_weak = 2131690584;
// aapt resource value: 0x7F0F0459
- public const int video_talk_watch_temperature_high_hang = 2131690585;
+ public const int video_talk_watch_is_busy = 2131690585;
// aapt resource value: 0x7F0F045A
- public const int video_talk_watch_temperature_high_hint = 2131690586;
+ public const int video_talk_watch_temperature_high_hang = 2131690586;
// aapt resource value: 0x7F0F045B
- public const int video_talk_watch_temperature_high_reject = 2131690587;
+ public const int video_talk_watch_temperature_high_hint = 2131690587;
// aapt resource value: 0x7F0F045C
- public const int video_talk_watch_temperature_high_warn = 2131690588;
+ public const int video_talk_watch_temperature_high_reject = 2131690588;
// aapt resource value: 0x7F0F045D
- public const int video_tip = 2131690589;
+ public const int video_talk_watch_temperature_high_warn = 2131690589;
// aapt resource value: 0x7F0F045E
- public const int video_unlock = 2131690590;
+ public const int video_tip = 2131690590;
// aapt resource value: 0x7F0F045F
- public const int volume = 2131690591;
+ public const int video_unlock = 2131690591;
// aapt resource value: 0x7F0F0460
- public const int wait = 2131690592;
+ public const int volume = 2131690592;
// aapt resource value: 0x7F0F0461
- public const int web_login_button_txt = 2131690593;
+ public const int wait = 2131690593;
// aapt resource value: 0x7F0F0462
- public const int wechat_interconnect = 2131690594;
+ public const int web_login_button_txt = 2131690594;
// aapt resource value: 0x7F0F0463
- public const int wifi_connected = 2131690595;
+ public const int wechat_interconnect = 2131690595;
// aapt resource value: 0x7F0F0464
- public const int wifi_connection_finish_need_refresh = 2131690596;
+ public const int wifi_connected = 2131690596;
// aapt resource value: 0x7F0F0465
- public const int wifi_set = 2131690597;
+ public const int wifi_connection_finish_need_refresh = 2131690597;
// aapt resource value: 0x7F0F0466
- public const int wifi_setting = 2131690598;
+ public const int wifi_set = 2131690598;
// aapt resource value: 0x7F0F0467
- public const int wired_connection = 2131690599;
-
- // aapt resource value: 0x7F0F0469
- public const int xlistview_footer_hint_normal = 2131690601;
+ public const int wifi_setting = 2131690599;
// aapt resource value: 0x7F0F0468
- public const int xlistview_footer_hint_no_more_device = 2131690600;
+ public const int wired_connection = 2131690600;
// aapt resource value: 0x7F0F046A
- public const int xlistview_footer_hint_ready = 2131690602;
+ public const int xlistview_footer_hint_normal = 2131690602;
+
+ // aapt resource value: 0x7F0F0469
+ public const int xlistview_footer_hint_no_more_device = 2131690601;
// aapt resource value: 0x7F0F046B
- public const int xlistview_footer_no_more = 2131690603;
+ public const int xlistview_footer_hint_ready = 2131690603;
// aapt resource value: 0x7F0F046C
- public const int xlistview_footer_no_more_msg = 2131690604;
+ public const int xlistview_footer_no_more = 2131690604;
// aapt resource value: 0x7F0F046D
- public const int xlistview_header_hint_loading = 2131690605;
+ public const int xlistview_footer_no_more_msg = 2131690605;
// aapt resource value: 0x7F0F046E
- public const int xlistview_header_hint_more = 2131690606;
+ public const int xlistview_header_hint_loading = 2131690606;
// aapt resource value: 0x7F0F046F
- public const int xlistview_header_hint_normal = 2131690607;
+ public const int xlistview_header_hint_more = 2131690607;
// aapt resource value: 0x7F0F0470
- public const int xlistview_header_hint_ready = 2131690608;
+ public const int xlistview_header_hint_normal = 2131690608;
// aapt resource value: 0x7F0F0471
- public const int xlistview_header_last_time = 2131690609;
+ public const int xlistview_header_hint_ready = 2131690609;
// aapt resource value: 0x7F0F0472
- public const int zxing_app_name = 2131690610;
+ public const int xlistview_header_last_time = 2131690610;
// aapt resource value: 0x7F0F0473
- public const int zxing_button_ok = 2131690611;
+ public const int zxing_app_name = 2131690611;
// aapt resource value: 0x7F0F0474
- public const int zxing_msg_camera_framework_bug = 2131690612;
+ public const int zxing_button_ok = 2131690612;
// aapt resource value: 0x7F0F0475
- public const int zxing_msg_default_status = 2131690613;
+ public const int zxing_msg_camera_framework_bug = 2131690613;
// aapt resource value: 0x7F0F0476
- public const int zxing_scan_tips = 2131690614;
+ public const int zxing_msg_default_status = 2131690614;
+
+ // aapt resource value: 0x7F0F0477
+ public const int zxing_scan_tips = 2131690615;
static String()
{
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs
index 0a12ab0..f037dad 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31MyListMusic.cs
@@ -47,17 +47,15 @@
public void MusicView(FileListInfo fileListInfo)
{
middViewLayout.RemoveAll();
- // A31SongPlay.SongListView(middViewLayout,fileListInfo.ListName, fileListInfo.MusicInfoList);
+ // A31SongPlay.SongListView(middViewLayout,fileListInfo.ListName, fileListInfo.MusicInfoList);
}
/// <summary>
/// 瀹氭椂鏇存柊褰撳墠鎾斁闊充箰
/// </summary>
public void UpdateSelectedMusic()
{
- UpdateThread.updateCurrMusicThread(this, middViewLayout, A31MusicModel.Current);
+ UpdateThread.updateCurrMusicThread(this, middViewLayout, A31MusicModel.Current);
}
-
-
}
}
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
index 7a30610..477877c 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/A31PlayMusicPage.cs
@@ -349,182 +349,186 @@
{
timerThread = new System.Threading.Thread((obj) =>
{
- while (true)
+ try
{
- Application.RunOnMainThread(() =>
+ while (true)
{
- try
+ Application.RunOnMainThread(() =>
{
- //鏇存柊鎬绘椂闂�
- //鎬诲叡鏈夊灏戠
- int totalSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_time));
- //鍒嗛挓
- int totalMusicMinute = totalSecond / 60;
- //绉掗挓
- int totalMusicSecond = totalSecond % 60;
- //杞寲姝屾洸鎬绘椂闂存椂闂存牸寮�
- string totalTime = (totalMusicMinute.ToString().Length < 2 ? "0" + totalMusicMinute.ToString() : totalMusicMinute.ToString()) + ":" + (totalMusicSecond.ToString().Length < 2 ? "0" + totalMusicSecond.ToString() : totalMusicSecond.ToString());
- //鏄剧ず鎬绘椂闂�
- playView.endTimeBtn.Text = totalTime;
- //鏄剧ず鎾斁鍣ㄥ悕绉�
- topView.topNameBtn.Text = A31MusicModel.Current.functionMusic.name;
- //鏄剧ず鎾斁妯″紡鍥炬爣
- switch (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode))
+ try
{
- case ValueProperty.list_cycle://鍒楄〃寰幆
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
- break;
- case ValueProperty.single_cycle://鍗曟洸寰幆
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single_cycle.png";
- break;
- case ValueProperty.random://闅忔満鎾斁
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/random.png";
- break;
- case ValueProperty.single:// 鍗曟洸<single>
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
- break;
- case ValueProperty.order://寰簭寰幆
- playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/order.png";
- break;
- }
+ //鏇存柊鎬绘椂闂�
+ //鎬诲叡鏈夊灏戠
+ int totalSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_time));
+ //鍒嗛挓
+ int totalMusicMinute = totalSecond / 60;
+ //绉掗挓
+ int totalMusicSecond = totalSecond % 60;
+ //杞寲姝屾洸鎬绘椂闂存椂闂存牸寮�
+ string totalTime = (totalMusicMinute.ToString().Length < 2 ? "0" + totalMusicMinute.ToString() : totalMusicMinute.ToString()) + ":" + (totalMusicSecond.ToString().Length < 2 ? "0" + totalMusicSecond.ToString() : totalMusicSecond.ToString());
+ //鏄剧ず鎬绘椂闂�
+ playView.endTimeBtn.Text = totalTime;
+ //鏄剧ず鎾斁鍣ㄥ悕绉�
+ topView.topNameBtn.Text = A31MusicModel.Current.functionMusic.name;
+ //鏄剧ず鎾斁妯″紡鍥炬爣
+ switch (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.mode))
+ {
+ case ValueProperty.list_cycle://鍒楄〃寰幆
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/list.png";
+ break;
+ case ValueProperty.single_cycle://鍗曟洸寰幆
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single_cycle.png";
+ break;
+ case ValueProperty.random://闅忔満鎾斁
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/random.png";
+ break;
+ case ValueProperty.single:// 鍗曟洸<single>
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/single.png";
+ break;
+ case ValueProperty.order://寰簭寰幆
+ playView.playOrderBtn.UnSelectedImagePath = "MusicIcon/order.png";
+ break;
+ }
- //if (A31MusicModel.Current.A31PlayStatus.Source == "RADIO-NETWORK")
- //{
- // var v = A31MusicModel.Current.LoveRadioInfoList.Find((like) =>
- // {
- // return like.URL == A31MusicModel.Current.A31PlayStatus.TrackURL;
- // });
- // if (v != null)
- // {
- // playView.loveBtn.IsSelected = true;
- // }
- // else
- // {
- // playView.loveBtn.IsSelected = false;
- // }
- //}
- //else
- //{
- // var v = A31MusicModel.Current.LoveMusicInfoList.Find((like) =>
- // {
- // return like.URL == A31MusicModel.Current.A31PlayStatus.TrackURL;
- // });
- // if (v != null)
- // {
- // playView.loveBtn.IsSelected = true;
- // }
- // else
- // {
- // playView.loveBtn.IsSelected = false;
- // }
- //}
- //鏄剧ず鎾斁鍣ㄥ尯鍩�
- playView.regionBtn.Text = A31MusicModel.Current.functionMusic.GetRoomListName();
- //鏄剧ず鎾斁鍣ㄦ敹钘忕姸鎬�
- if (A31MusicModel.Current.functionMusic.collect)
- {
- //鏀惰棌
- playView.collectIconBtn.IsSelected = true;
+ //if (A31MusicModel.Current.A31PlayStatus.Source == "RADIO-NETWORK")
+ //{
+ // var v = A31MusicModel.Current.LoveRadioInfoList.Find((like) =>
+ // {
+ // return like.URL == A31MusicModel.Current.A31PlayStatus.TrackURL;
+ // });
+ // if (v != null)
+ // {
+ // playView.loveBtn.IsSelected = true;
+ // }
+ // else
+ // {
+ // playView.loveBtn.IsSelected = false;
+ // }
+ //}
+ //else
+ //{
+ // var v = A31MusicModel.Current.LoveMusicInfoList.Find((like) =>
+ // {
+ // return like.URL == A31MusicModel.Current.A31PlayStatus.TrackURL;
+ // });
+ // if (v != null)
+ // {
+ // playView.loveBtn.IsSelected = true;
+ // }
+ // else
+ // {
+ // playView.loveBtn.IsSelected = false;
+ // }
+ //}
+ //鏄剧ず鎾斁鍣ㄥ尯鍩�
+ playView.regionBtn.Text = A31MusicModel.Current.functionMusic.GetRoomListName();
+ //鏄剧ず鎾斁鍣ㄦ敹钘忕姸鎬�
+ if (A31MusicModel.Current.functionMusic.collect)
+ {
+ //鏀惰棌
+ playView.collectIconBtn.IsSelected = true;
+ }
+ else
+ {
+ //涓嶆敹钘�
+ playView.collectIconBtn.IsSelected = false;
+ }
+ //if (A31MusicModel.Current.A31PlayStatus.IsMute)
+ //{
+ // // btnMute.IsSelected = true;//闈欓煶鍥炬爣
+ // playView.volSeekBar.Progress = 0;
+ //}
+ //else
+ //{
+ // // btnMute.IsSelected = false;//闈欓煶鍥炬爣
+ // if (1000 < (DateTime.Now - A31MusicModel.ProgressDateTime).TotalMilliseconds)
+ // {
+ // //澹伴煶杩涘害鏉�;
+ // playView.volSeekBar.Progress = int.Parse(A31MusicModel.Current.A31PlayStatus.vol);
+ // //鏄剧ず褰撳墠闊抽噺鍊�;
+ // playView.volValueBtn.Text = A31MusicModel.Current.A31PlayStatus.vol + "%";
+ // }
+ //}
+ //涓轰簡闃叉闊抽噺鏉¤烦鍔�,寤堕暱鏇存柊鏃堕棿(澶氬姞1s)
+ if (2000 < (DateTime.Now - A31MusicModel.ProgressDateTime).TotalMilliseconds || A31MusicModel.ProgressDateTime == DateTime.MinValue)
+ {
+ //鏄剧ず闊抽噺杩涘害鏉″��;
+ playView.volSeekBar.Progress = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.volume));
+ //鏄剧ず褰撳墠闊抽噺鍊�;
+ playView.volValueBtn.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.volume) + "%";
+ }
+ //鏇存柊鎾斁鍣ㄩ煶閲忕粰绯荤粺闊抽噺
+ //Volume.MusicVolume = playView.volSeekBar.Progress;
+ //褰撳墠鎾斁闊充箰鏃堕棿
+ //鎸夐亾鐞嗕笉浼氫负绌猴紝GetAttrState("playing_time")鍊煎彲鑳戒负绌猴紝寮哄埗杞崲int.Parse(锛変細鍑虹幇寮傚父锛屼笉杩囦篃鍋氫簡寮傚父澶勭悊浜�
+ int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playing_time));
+ //璇嗗埆闊充箰鐘舵�佹槸鍚﹀湪鎾斁鐘舵��
+ if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
+ {
+ //闊充箰鍦ㄦ挱鏀炬椂锛屽啀璁＄畻鎾斁鏃堕棿(鐜板湪鏃堕棿=鍘熸潵鏃堕棿+1绉�)
+ //playSecond += (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
+ playSecond += 1;//琛ㄧず鍔犱笂绛夊緟鐨勬椂闂�1s
+ ///姝屾洸璁板綍鏆傛椂鏃堕棿鍐欏叆缂撳瓨锛�
+ A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.playing_time, playSecond);
+ }
+ if (playSecond <= 0)
+ {
+ ///鎾斁鏃堕棿涓嶈兘灏忎簬0锛�
+ playSecond = 0;
+ }
+ if (playSecond >= totalSecond)
+ {
+ ///鎾斁鏃堕棿涓嶈兘瓒呰繃鎬绘椂闂达紱
+ playSecond = totalSecond;
+ }
+ int playMusicMinute = playSecond / 60;
+ //绉掗挓
+ int playMusicSecond = playSecond % 60;
+ //杞寲鎾斁鏃堕棿鏃堕棿鏍煎紡
+ string playTime = (playMusicMinute.ToString().Length < 2 ? "0" + playMusicMinute.ToString() : playMusicMinute.ToString()) + ":" + (playMusicSecond.ToString().Length < 2 ? "0" + playMusicSecond.ToString() : playMusicSecond.ToString());
+ //鏄剧ず鎾斁鏃堕棿
+ playView.startTimeBtn.Text = playTime;
+ //鏄剧ず鎾斁鐘舵��
+ if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
+ {
+ //鎾斁
+ playView.playBtn.IsSelected = true;
+ }
+ else
+ {
+ //鏆傚仠
+ playView.playBtn.IsSelected = false;
+ ///璁板綍姝屾洸鏆傚仠鏃堕棿锛�<LastDateTime 璁＄畻鎾斁鏃堕棿鏈夌敤鍒�>
+ A31MusicModel.Current.LastDateTime = DateTime.Now;
+ }
+ //鏄剧ず杩涘害鏉″��
+ if (totalSecond == 0)
+ {
+ //姝屾洸鎾斁杩涘害
+ playView.diyArcSeekBar.Progress = 0;
+ }
+ else
+ {
+ //姝屾洸鎾斁杩涘害
+ playView.diyArcSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
+ }
+ //鏄剧ず姝屾洸鍚嶇О
+ playView.songNameTextView.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name) == null ? "Unkown" : A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name);
+ //鏄剧ず姝屾墜鍚嶇О
+ playView.singerBtn.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name) == null ? "Unkown" : A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name);
+ //鏇存柊婧愮殑鐣岄潰
+ // showSourcePage();
}
- else
+ catch (Exception e)
{
- //涓嶆敹钘�
- playView.collectIconBtn.IsSelected = false;
+ var ee = e.Message;
}
- //if (A31MusicModel.Current.A31PlayStatus.IsMute)
- //{
- // // btnMute.IsSelected = true;//闈欓煶鍥炬爣
- // playView.volSeekBar.Progress = 0;
- //}
- //else
- //{
- // // btnMute.IsSelected = false;//闈欓煶鍥炬爣
- // if (1000 < (DateTime.Now - A31MusicModel.ProgressDateTime).TotalMilliseconds)
- // {
- // //澹伴煶杩涘害鏉�;
- // playView.volSeekBar.Progress = int.Parse(A31MusicModel.Current.A31PlayStatus.vol);
- // //鏄剧ず褰撳墠闊抽噺鍊�;
- // playView.volValueBtn.Text = A31MusicModel.Current.A31PlayStatus.vol + "%";
- // }
- //}
- //涓轰簡闃叉闊抽噺鏉¤烦鍔�,寤堕暱鏇存柊鏃堕棿(澶氬姞1s)
- if (2000 < (DateTime.Now - A31MusicModel.ProgressDateTime).TotalMilliseconds || A31MusicModel.ProgressDateTime == DateTime.MinValue)
- {
- //鏄剧ず闊抽噺杩涘害鏉″��;
- playView.volSeekBar.Progress = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.volume));
- //鏄剧ず褰撳墠闊抽噺鍊�;
- playView.volValueBtn.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.volume) + "%";
- }
- //鏇存柊鎾斁鍣ㄩ煶閲忕粰绯荤粺闊抽噺
- //Volume.MusicVolume = playView.volSeekBar.Progress;
- //褰撳墠鎾斁闊充箰鏃堕棿
- //鎸夐亾鐞嗕笉浼氫负绌猴紝GetAttrState("playing_time")鍊煎彲鑳戒负绌猴紝寮哄埗杞崲int.Parse(锛変細鍑虹幇寮傚父锛屼笉杩囦篃鍋氫簡寮傚父澶勭悊浜�
- int playSecond = int.Parse(A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.playing_time));
- //璇嗗埆闊充箰鐘舵�佹槸鍚﹀湪鎾斁鐘舵��
- if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
- {
- //闊充箰鍦ㄦ挱鏀炬椂锛屽啀璁＄畻鎾斁鏃堕棿(鐜板湪鏃堕棿=鍘熸潵鏃堕棿+1绉�)
- //playSecond += (int)(DateTime.Now - A31MusicModel.Current.LastDateTime).TotalSeconds;
- playSecond += 1;//琛ㄧず鍔犱笂绛夊緟鐨勬椂闂�1s
- ///姝屾洸璁板綍鏆傛椂鏃堕棿鍐欏叆缂撳瓨锛�
- A31MusicModel.Current.functionMusic.SetAttrState(KeyProperty.playing_time, playSecond);
- }
- if (playSecond <= 0)
- {
- ///鎾斁鏃堕棿涓嶈兘灏忎簬0锛�
- playSecond = 0;
- }
- if (playSecond >= totalSecond)
- {
- ///鎾斁鏃堕棿涓嶈兘瓒呰繃鎬绘椂闂达紱
- playSecond = totalSecond;
- }
- int playMusicMinute = playSecond / 60;
- //绉掗挓
- int playMusicSecond = playSecond % 60;
- //杞寲鎾斁鏃堕棿鏃堕棿鏍煎紡
- string playTime = (playMusicMinute.ToString().Length < 2 ? "0" + playMusicMinute.ToString() : playMusicMinute.ToString()) + ":" + (playMusicSecond.ToString().Length < 2 ? "0" + playMusicSecond.ToString() : playMusicSecond.ToString());
- //鏄剧ず鎾斁鏃堕棿
- playView.startTimeBtn.Text = playTime;
- //鏄剧ず鎾斁鐘舵��
- if (A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
- {
- //鎾斁
- playView.playBtn.IsSelected = true;
- }
- else
- {
- //鏆傚仠
- playView.playBtn.IsSelected = false;
- ///璁板綍姝屾洸鏆傚仠鏃堕棿锛�<LastDateTime 璁＄畻鎾斁鏃堕棿鏈夌敤鍒�>
- A31MusicModel.Current.LastDateTime = DateTime.Now;
- }
- //鏄剧ず杩涘害鏉″��
- if (totalSecond == 0)
- {
- //姝屾洸鎾斁杩涘害
- playView.diyArcSeekBar.Progress = 0;
- }
- else
- {
- //姝屾洸鎾斁杩涘害
- playView.diyArcSeekBar.Progress = (int)(playSecond * 100.0 / totalSecond);//+1
- }
- //鏄剧ず姝屾洸鍚嶇О
- playView.songNameTextView.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name) == null ? "Unkown" : A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name);
- //鏄剧ず姝屾墜鍚嶇О
- playView.singerBtn.Text = A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name) == null ? "Unkown" : A31MusicModel.Current.functionMusic.GetAttrState(KeyProperty.song_name);
- //鏇存柊婧愮殑鐣岄潰
- // showSourcePage();
- }
- catch (Exception e)
- {
- var ee = e.Message;
- }
- });
- System.Threading.Thread.Sleep(1000 * 1);
+ });
+ System.Threading.Thread.Sleep(1000 * 1);
+ }
}
+ catch (Exception e) { }
})
{ IsBackground = true };
timerThread.Start();
diff --git a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
index 9cf4210..336e8be 100644
--- a/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
+++ b/HDL_ON/UI/UI2/FuntionControlView/Music/MusicMain.cs
@@ -276,40 +276,54 @@
//鏇存柊鐘舵�佺嚎绋�
var musicThread = new System.Threading.Thread(() =>
{
- while (true)
+ try
{
- if (!player.functionMusic.isOnline())
+ while (true)
{
- ///涓嶅湪绾夸笉璇荤姸鎬�
- continue;
- }
- //SendMethod.ReadStatus(player);
- SendMethod.Current.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
- System.Threading.Thread.Sleep(1000);
- Application.RunOnMainThread(() =>
- {
- musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
- musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
- musicView.musicNameBtn.Text = player.functionMusic.name;
- if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
+ if (!player.functionMusic.isOnline())
{
- musicView.playBtn.IsSelected = true;
+ ///涓嶅湪绾夸笉璇荤姸鎬�
+ continue;
}
- else
+ //SendMethod.ReadStatus(player);
+ SendMethod.Current.GetDeviceStatus(ref player, new List<string> { player.functionMusic.deviceId }, player.functionMusic.sid);
+ System.Threading.Thread.Sleep(1000);
+ Application.RunOnMainThread(() =>
{
- musicView.playBtn.IsSelected = false;
- }
- musicView.regionBtn.Text = player.functionMusic.GetRoomListName();
+ try
+ {
+ musicView.singerBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
+ musicView.songNameBtn.Text = player.functionMusic.GetAttrState(KeyProperty.song_name);
+ musicView.musicNameBtn.Text = player.functionMusic.name;
+ if (player.functionMusic.GetAttrState(KeyProperty.on_off) == ValueProperty.on)
+ {
+ musicView.playBtn.IsSelected = true;
+ }
+ else
+ {
+ musicView.playBtn.IsSelected = false;
+ }
+ musicView.regionBtn.Text = player.functionMusic.GetRoomListName();
- if (player.functionMusic.collect)
- {
- musicView.collectIconBtn.IsSelected = true;
- }
- else
- {
- musicView.collectIconBtn.IsSelected = false;
- }
- });
+ if (player.functionMusic.collect)
+ {
+ musicView.collectIconBtn.IsSelected = true;
+ }
+ else
+ {
+ musicView.collectIconBtn.IsSelected = false;
+ }
+ }
+ catch (Exception e)
+ {
+ string ee = e.Message;
+ }
+ });
+ }
+ }
+ catch (Exception e)
+ {
+ string ee = e.Message;
}
})
{ IsBackground = true, Name = "A31" };
diff --git a/NunitTest-Android/Resources/Resource.designer.cs b/NunitTest-Android/Resources/Resource.designer.cs
index 21a62c4..ae568d0 100644
--- a/NunitTest-Android/Resources/Resource.designer.cs
+++ b/NunitTest-Android/Resources/Resource.designer.cs
@@ -15,7 +15,7 @@
{
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.2.120")]
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Xamarin.Android.Build.Tasks", "13.2.0.99")]
public partial class Resource
{
--
Gitblit v1.8.0