睿美4控

This commit is contained in:
Long-PC\Long 2018-04-19 19:40:57 +08:00
parent 8b88c08561
commit 1b35b2246a
149 changed files with 13958 additions and 11270 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
#Tue Mar 13 17:30:29 CST 2018
#Thu Apr 19 19:10:07 CST 2018

View File

@ -1 +1 @@
#Tue Mar 13 17:30:28 CST 2018
#Thu Apr 19 19:10:06 CST 2018

View File

@ -1 +1 @@
#Tue Mar 13 17:30:39 CST 2018
#Thu Apr 19 19:10:16 CST 2018

View File

@ -75,14 +75,14 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_000.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_check_to_on_mtrl_000.png"

View File

@ -219,14 +219,14 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_back_pressed.png",
"source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_pressed.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_pause_normal.png",
"source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_pause_normal.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_volume_icon.png",
"source": "C:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_volume_icon.png"

View File

@ -15,14 +15,14 @@
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_vector_test.xml",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_vector_test.xml"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_seekbar_thumb_material.xml"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_textfield_search_material.xml",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_textfield_search_material.xml"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_seekbar_thumb_material.xml",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_seekbar_thumb_material.xml"
},
{
"merged": "C:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_item_background_holo_dark.xml",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_item_background_holo_dark.xml"

View File

@ -1,4 +1,4 @@
#Tue Mar 13 17:30:38 CST 2018
#Thu Apr 19 19:10:15 CST 2018
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_seek_progress.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_bottom_seek_progress.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
@ -16,12 +16,12 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_bottom_bg.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_bottom_bg.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\notification_bg_normal.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\notification_bg_normal.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_vector_test.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_vector_test.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_vector_test.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_vector_test.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_alert_dialog_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_alert_dialog_material.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color\\abc_tint_switch_thumb.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color\\abc_tint_switch_thumb.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_alert_dialog_button_bar_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_alert_dialog_button_bar_material.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_btn_radio_to_on_mtrl_000.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_alert_dialog_button_bar_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_alert_dialog_button_bar_material.xml
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_back_pressed.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\notify_panel_notification_icon_bg.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\notify_panel_notification_icon_bg.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png
@ -267,9 +267,9 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_light.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_light.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_spinner_mtrl_am_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_alert_dialog_title_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_alert_dialog_title_material.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\notification_template_media.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\notification_template_media.xml
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_play_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_play_pressed.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\select_dialog_singlechoice_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\select_dialog_singlechoice_material.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\notification_template_media.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\notification_template_media.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_spinner_textfield_background_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_spinner_textfield_background_material.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_star_half_black_36dp.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_close_volume.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\jc_close_volume.png
@ -283,8 +283,8 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\notification_bg_low_pressed.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\notification_bg_low_pressed.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_scrubber_control_to_pressed_mtrl_005.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_list_focused_holo.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color-v23\\abc_tint_switch_track.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_switch_track.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color-v23\\abc_tint_switch_track.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_switch_track.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_star_black_16dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_black_16dp.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png
@ -367,14 +367,14 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-ldrtl-xxhdpi-v17\\abc_spinner_mtrl_am_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxhdpi-v17\\abc_spinner_mtrl_am_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color-v23\\abc_tint_btn_checkable.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_btn_checkable.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout-v11\\notification_template_big_media_custom.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout-v11\\notification_template_big_media_custom.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_light.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_light.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout-v11\\notification_template_big_media_custom.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout-v11\\notification_template_big_media_custom.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\select_dialog_item_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\select_dialog_item_material.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_cab_background_internal_bg.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_cab_background_internal_bg.xml
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\layout\\jc_layout_base.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\jc_layout_base.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\notification_bg_normal.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\notification_bg_normal.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\color-v23\\abc_tint_spinner.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\color-v23\\abc_tint_spinner.xml
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_title_bg.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\jc_title_bg.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_list_divider_mtrl_alpha.9.png
@ -406,8 +406,8 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\notification_bg_low_normal.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\notification_bg_low_normal.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_expanded_menu_layout.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_expanded_menu_layout.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_expanded_menu_layout.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_expanded_menu_layout.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_text_select_handle_middle_mtrl_dark.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_list_selector_holo_dark.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_list_selector_holo_dark.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_ic_ab_back_material.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_ic_ab_back_material.xml

View File

@ -1,4 +1,4 @@
#Tue Mar 13 17:30:33 CST 2018
#Thu Apr 19 19:10:10 CST 2018
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_text_select_handle_left_mtrl_dark.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png
@ -399,8 +399,8 @@ C\:\\ifish\\JCVideo_Library\\src\\main\\res\\layout\\jc_dialog_brightness.xml=C\
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout-v11\\notification_template_big_media_narrow.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\layout-v11\\notification_template_big_media_narrow.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_list_menu_item_checkbox.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\layout\\abc_list_menu_item_checkbox.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_half_black_36dp.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_enlarge.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_enlarge.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_enlarge.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_enlarge.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_btn_switch_to_on_mtrl_00012.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_36dp.png

View File

@ -1,4 +1,4 @@
#Tue Mar 13 17:30:34 CST 2018
#Thu Apr 19 19:10:11 CST 2018
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_back_normal.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable\\jc_seek_thumb_pressed.xml
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_play_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\jc_play_pressed.png

View File

@ -1,4 +1,4 @@
#Tue Mar 13 17:30:39 CST 2018
#Thu Apr 19 19:10:17 CST 2018
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_back_normal.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_back_normal.png
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable\\jc_seek_thumb_pressed.xml=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable\\jc_seek_thumb_pressed.xml
C\:\\ifish\\JCVideo_Library\\src\\main\\res\\drawable-xhdpi\\jc_play_pressed.png=C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_play_pressed.png

View File

@ -1096,7 +1096,7 @@
jumboMode="true"
optimize="true"
revision="25.0.2"
sha1="5d48f078c74db86cf5dd8c4408399ee76a806f94">
sha1="bed6336f45c6f484aa54cc8932fc4f8df8b3be45">
<dex dex="C:\ifish\iFish7\build\intermediates\transforms\dex\debug\folders\1000\10000\instant-run-bootstrap_02bf513360b9e7b7429c008d6869464b3d9d6522\classes.dex" />
</item>
<item

View File

@ -702,7 +702,7 @@ public final class R {
public static final int notify_panel_notification_icon_bg = 0x7f02039c;
}
public static final class id {
public static final int action0 = 0x7f0f0414;
public static final int action0 = 0x7f0f0419;
public static final int action_bar = 0x7f0f0090;
public static final int action_bar_activity_content = 0x7f0f0000;
public static final int action_bar_container = 0x7f0f008f;
@ -710,17 +710,17 @@ public final class R {
public static final int action_bar_spinner = 0x7f0f0001;
public static final int action_bar_subtitle = 0x7f0f006e;
public static final int action_bar_title = 0x7f0f006d;
public static final int action_container = 0x7f0f0411;
public static final int action_container = 0x7f0f0416;
public static final int action_context_bar = 0x7f0f0091;
public static final int action_divider = 0x7f0f0418;
public static final int action_image = 0x7f0f0412;
public static final int action_divider = 0x7f0f041d;
public static final int action_image = 0x7f0f0417;
public static final int action_menu_divider = 0x7f0f0002;
public static final int action_menu_presenter = 0x7f0f0003;
public static final int action_mode_bar = 0x7f0f008d;
public static final int action_mode_bar_stub = 0x7f0f008c;
public static final int action_mode_close_button = 0x7f0f006f;
public static final int action_text = 0x7f0f0413;
public static final int actions = 0x7f0f0421;
public static final int action_text = 0x7f0f0418;
public static final int actions = 0x7f0f0426;
public static final int activity_chooser_view_content = 0x7f0f0070;
public static final int add = 0x7f0f002c;
public static final int alertTitle = 0x7f0f0084;
@ -730,12 +730,12 @@ public final class R {
public static final int beginning = 0x7f0f0049;
public static final int bottom = 0x7f0f0037;
public static final int buttonPanel = 0x7f0f0077;
public static final int cancel_action = 0x7f0f0415;
public static final int cancel_action = 0x7f0f041a;
public static final int center = 0x7f0f0038;
public static final int center_horizontal = 0x7f0f0039;
public static final int center_vertical = 0x7f0f003a;
public static final int checkbox = 0x7f0f0087;
public static final int chronometer = 0x7f0f041d;
public static final int chronometer = 0x7f0f0422;
public static final int clip_horizontal = 0x7f0f0043;
public static final int clip_vertical = 0x7f0f0044;
public static final int collapseActionView = 0x7f0f004c;
@ -744,15 +744,15 @@ public final class R {
public static final int customPanel = 0x7f0f0080;
public static final int decor_content_parent = 0x7f0f008e;
public static final int default_activity_button = 0x7f0f0073;
public static final int design_bottom_sheet = 0x7f0f010b;
public static final int design_menu_item_action_area = 0x7f0f0112;
public static final int design_menu_item_action_area_stub = 0x7f0f0111;
public static final int design_menu_item_text = 0x7f0f0110;
public static final int design_navigation_view = 0x7f0f010f;
public static final int design_bottom_sheet = 0x7f0f0111;
public static final int design_menu_item_action_area = 0x7f0f0118;
public static final int design_menu_item_action_area_stub = 0x7f0f0117;
public static final int design_menu_item_text = 0x7f0f0116;
public static final int design_navigation_view = 0x7f0f0115;
public static final int disableHome = 0x7f0f0020;
public static final int edit_query = 0x7f0f0092;
public static final int end = 0x7f0f003b;
public static final int end_padder = 0x7f0f0426;
public static final int end_padder = 0x7f0f042b;
public static final int enterAlways = 0x7f0f0027;
public static final int enterAlwaysCollapsed = 0x7f0f0028;
public static final int exitUntilCollapsed = 0x7f0f0029;
@ -765,29 +765,29 @@ public final class R {
public static final int home = 0x7f0f0009;
public static final int homeAsUp = 0x7f0f0021;
public static final int icon = 0x7f0f0075;
public static final int icon_group = 0x7f0f0422;
public static final int icon_group = 0x7f0f0427;
public static final int ifRoom = 0x7f0f004d;
public static final int image = 0x7f0f0072;
public static final int info = 0x7f0f041e;
public static final int info = 0x7f0f0423;
public static final int item_touch_helper_previous_elevation = 0x7f0f000a;
public static final int largeLabel = 0x7f0f0109;
public static final int largeLabel = 0x7f0f010f;
public static final int left = 0x7f0f003d;
public static final int line1 = 0x7f0f0423;
public static final int line3 = 0x7f0f0425;
public static final int line1 = 0x7f0f0428;
public static final int line3 = 0x7f0f042a;
public static final int listMode = 0x7f0f001d;
public static final int list_item = 0x7f0f0074;
public static final int masked = 0x7f0f070f;
public static final int media_actions = 0x7f0f0417;
public static final int masked = 0x7f0f0716;
public static final int media_actions = 0x7f0f041c;
public static final int middle = 0x7f0f004a;
public static final int mini = 0x7f0f0048;
public static final int multiply = 0x7f0f002d;
public static final int navigation_header_container = 0x7f0f010e;
public static final int navigation_header_container = 0x7f0f0114;
public static final int never = 0x7f0f004e;
public static final int none = 0x7f0f0022;
public static final int normal = 0x7f0f001e;
public static final int notification_background = 0x7f0f041f;
public static final int notification_main_column = 0x7f0f041a;
public static final int notification_main_column_container = 0x7f0f0419;
public static final int notification_background = 0x7f0f0424;
public static final int notification_main_column = 0x7f0f041f;
public static final int notification_main_column_container = 0x7f0f041e;
public static final int parallax = 0x7f0f0041;
public static final int parentPanel = 0x7f0f0079;
public static final int pin = 0x7f0f0042;
@ -795,8 +795,8 @@ public final class R {
public static final int progress_horizontal = 0x7f0f000d;
public static final int radio = 0x7f0f0089;
public static final int right = 0x7f0f003e;
public static final int right_icon = 0x7f0f0420;
public static final int right_side = 0x7f0f041b;
public static final int right_icon = 0x7f0f0425;
public static final int right_side = 0x7f0f0420;
public static final int screen = 0x7f0f002e;
public static final int scroll = 0x7f0f002a;
public static final int scrollIndicatorDown = 0x7f0f007f;
@ -818,9 +818,9 @@ public final class R {
public static final int showCustom = 0x7f0f0023;
public static final int showHome = 0x7f0f0024;
public static final int showTitle = 0x7f0f0025;
public static final int smallLabel = 0x7f0f0108;
public static final int snackbar_action = 0x7f0f010d;
public static final int snackbar_text = 0x7f0f010c;
public static final int smallLabel = 0x7f0f010e;
public static final int snackbar_action = 0x7f0f0113;
public static final int snackbar_text = 0x7f0f0112;
public static final int snap = 0x7f0f002b;
public static final int spacer = 0x7f0f0078;
public static final int split_action_bar = 0x7f0f0015;
@ -828,30 +828,30 @@ public final class R {
public static final int src_in = 0x7f0f0030;
public static final int src_over = 0x7f0f0031;
public static final int start = 0x7f0f003f;
public static final int status_bar_latest_event_content = 0x7f0f0416;
public static final int status_bar_latest_event_content = 0x7f0f041b;
public static final int submenuarrow = 0x7f0f008a;
public static final int submit_area = 0x7f0f009b;
public static final int tabMode = 0x7f0f001f;
public static final int text = 0x7f0f0107;
public static final int text2 = 0x7f0f0424;
public static final int text = 0x7f0f010d;
public static final int text2 = 0x7f0f0429;
public static final int textSpacerNoButtons = 0x7f0f007e;
public static final int textSpacerNoTitle = 0x7f0f007d;
public static final int text_input_password_toggle = 0x7f0f0113;
public static final int text_input_password_toggle = 0x7f0f0119;
public static final int textinput_counter = 0x7f0f0016;
public static final int textinput_error = 0x7f0f0017;
public static final int time = 0x7f0f041c;
public static final int time = 0x7f0f0421;
public static final int title = 0x7f0f0076;
public static final int titleDividerNoCustom = 0x7f0f0085;
public static final int title_template = 0x7f0f0083;
public static final int top = 0x7f0f0040;
public static final int topPanel = 0x7f0f0082;
public static final int touch_outside = 0x7f0f010a;
public static final int touch_outside = 0x7f0f0110;
public static final int transition_current_scene = 0x7f0f0018;
public static final int transition_scene_layoutid_cache = 0x7f0f0019;
public static final int up = 0x7f0f001a;
public static final int useLogo = 0x7f0f0026;
public static final int view_offset_helper = 0x7f0f001b;
public static final int visible = 0x7f0f070e;
public static final int visible = 0x7f0f0715;
public static final int withText = 0x7f0f004f;
public static final int wrap_content = 0x7f0f0032;
}
@ -894,39 +894,39 @@ public final class R {
public static final int abc_search_dropdown_item_icons_2line = 0x7f040018;
public static final int abc_search_view = 0x7f040019;
public static final int abc_select_dialog_material = 0x7f04001a;
public static final int design_bottom_navigation_item = 0x7f04003e;
public static final int design_bottom_sheet_dialog = 0x7f04003f;
public static final int design_layout_snackbar = 0x7f040040;
public static final int design_layout_snackbar_include = 0x7f040041;
public static final int design_layout_tab_icon = 0x7f040042;
public static final int design_layout_tab_text = 0x7f040043;
public static final int design_menu_item_action_area = 0x7f040044;
public static final int design_navigation_item = 0x7f040045;
public static final int design_navigation_item_header = 0x7f040046;
public static final int design_navigation_item_separator = 0x7f040047;
public static final int design_navigation_item_subheader = 0x7f040048;
public static final int design_navigation_menu = 0x7f040049;
public static final int design_navigation_menu_item = 0x7f04004a;
public static final int design_text_input_password_icon = 0x7f04004b;
public static final int notification_action = 0x7f040126;
public static final int notification_action_tombstone = 0x7f040127;
public static final int notification_media_action = 0x7f040128;
public static final int notification_media_cancel_action = 0x7f040129;
public static final int notification_template_big_media = 0x7f04012a;
public static final int notification_template_big_media_custom = 0x7f04012b;
public static final int notification_template_big_media_narrow = 0x7f04012c;
public static final int notification_template_big_media_narrow_custom = 0x7f04012d;
public static final int notification_template_custom_big = 0x7f04012e;
public static final int notification_template_icon_group = 0x7f04012f;
public static final int notification_template_lines_media = 0x7f040130;
public static final int notification_template_media = 0x7f040131;
public static final int notification_template_media_custom = 0x7f040132;
public static final int notification_template_part_chronometer = 0x7f040133;
public static final int notification_template_part_time = 0x7f040134;
public static final int select_dialog_item_material = 0x7f04014a;
public static final int select_dialog_multichoice_material = 0x7f04014b;
public static final int select_dialog_singlechoice_material = 0x7f04014c;
public static final int support_simple_spinner_dropdown_item = 0x7f04016e;
public static final int design_bottom_navigation_item = 0x7f04003f;
public static final int design_bottom_sheet_dialog = 0x7f040040;
public static final int design_layout_snackbar = 0x7f040041;
public static final int design_layout_snackbar_include = 0x7f040042;
public static final int design_layout_tab_icon = 0x7f040043;
public static final int design_layout_tab_text = 0x7f040044;
public static final int design_menu_item_action_area = 0x7f040045;
public static final int design_navigation_item = 0x7f040046;
public static final int design_navigation_item_header = 0x7f040047;
public static final int design_navigation_item_separator = 0x7f040048;
public static final int design_navigation_item_subheader = 0x7f040049;
public static final int design_navigation_menu = 0x7f04004a;
public static final int design_navigation_menu_item = 0x7f04004b;
public static final int design_text_input_password_icon = 0x7f04004c;
public static final int notification_action = 0x7f040129;
public static final int notification_action_tombstone = 0x7f04012a;
public static final int notification_media_action = 0x7f04012b;
public static final int notification_media_cancel_action = 0x7f04012c;
public static final int notification_template_big_media = 0x7f04012d;
public static final int notification_template_big_media_custom = 0x7f04012e;
public static final int notification_template_big_media_narrow = 0x7f04012f;
public static final int notification_template_big_media_narrow_custom = 0x7f040130;
public static final int notification_template_custom_big = 0x7f040131;
public static final int notification_template_icon_group = 0x7f040132;
public static final int notification_template_lines_media = 0x7f040133;
public static final int notification_template_media = 0x7f040134;
public static final int notification_template_media_custom = 0x7f040135;
public static final int notification_template_part_chronometer = 0x7f040136;
public static final int notification_template_part_time = 0x7f040137;
public static final int select_dialog_item_material = 0x7f04014d;
public static final int select_dialog_multichoice_material = 0x7f04014e;
public static final int select_dialog_singlechoice_material = 0x7f04014f;
public static final int support_simple_spinner_dropdown_item = 0x7f040171;
}
public static final class string {
public static final int abc_action_bar_home_description = 0x7f080000;

View File

@ -538,7 +538,7 @@ public final class R {
public static final int notify_panel_notification_icon_bg = 0x7f02039c;
}
public static final class id {
public static final int action0 = 0x7f0f0414;
public static final int action0 = 0x7f0f0419;
public static final int action_bar = 0x7f0f0090;
public static final int action_bar_activity_content = 0x7f0f0000;
public static final int action_bar_container = 0x7f0f008f;
@ -546,17 +546,17 @@ public final class R {
public static final int action_bar_spinner = 0x7f0f0001;
public static final int action_bar_subtitle = 0x7f0f006e;
public static final int action_bar_title = 0x7f0f006d;
public static final int action_container = 0x7f0f0411;
public static final int action_container = 0x7f0f0416;
public static final int action_context_bar = 0x7f0f0091;
public static final int action_divider = 0x7f0f0418;
public static final int action_image = 0x7f0f0412;
public static final int action_divider = 0x7f0f041d;
public static final int action_image = 0x7f0f0417;
public static final int action_menu_divider = 0x7f0f0002;
public static final int action_menu_presenter = 0x7f0f0003;
public static final int action_mode_bar = 0x7f0f008d;
public static final int action_mode_bar_stub = 0x7f0f008c;
public static final int action_mode_close_button = 0x7f0f006f;
public static final int action_text = 0x7f0f0413;
public static final int actions = 0x7f0f0421;
public static final int action_text = 0x7f0f0418;
public static final int actions = 0x7f0f0426;
public static final int activity_chooser_view_content = 0x7f0f0070;
public static final int add = 0x7f0f002c;
public static final int alertTitle = 0x7f0f0084;
@ -564,9 +564,9 @@ public final class R {
public static final int beginning = 0x7f0f0049;
public static final int bottom = 0x7f0f0037;
public static final int buttonPanel = 0x7f0f0077;
public static final int cancel_action = 0x7f0f0415;
public static final int cancel_action = 0x7f0f041a;
public static final int checkbox = 0x7f0f0087;
public static final int chronometer = 0x7f0f041d;
public static final int chronometer = 0x7f0f0422;
public static final int collapseActionView = 0x7f0f004c;
public static final int contentPanel = 0x7f0f007a;
public static final int custom = 0x7f0f0081;
@ -576,35 +576,35 @@ public final class R {
public static final int disableHome = 0x7f0f0020;
public static final int edit_query = 0x7f0f0092;
public static final int end = 0x7f0f003b;
public static final int end_padder = 0x7f0f0426;
public static final int end_padder = 0x7f0f042b;
public static final int expand_activities_button = 0x7f0f0071;
public static final int expanded_menu = 0x7f0f0086;
public static final int home = 0x7f0f0009;
public static final int homeAsUp = 0x7f0f0021;
public static final int icon = 0x7f0f0075;
public static final int icon_group = 0x7f0f0422;
public static final int icon_group = 0x7f0f0427;
public static final int ifRoom = 0x7f0f004d;
public static final int image = 0x7f0f0072;
public static final int info = 0x7f0f041e;
public static final int line1 = 0x7f0f0423;
public static final int line3 = 0x7f0f0425;
public static final int info = 0x7f0f0423;
public static final int line1 = 0x7f0f0428;
public static final int line3 = 0x7f0f042a;
public static final int listMode = 0x7f0f001d;
public static final int list_item = 0x7f0f0074;
public static final int media_actions = 0x7f0f0417;
public static final int media_actions = 0x7f0f041c;
public static final int middle = 0x7f0f004a;
public static final int multiply = 0x7f0f002d;
public static final int never = 0x7f0f004e;
public static final int none = 0x7f0f0022;
public static final int normal = 0x7f0f001e;
public static final int notification_background = 0x7f0f041f;
public static final int notification_main_column = 0x7f0f041a;
public static final int notification_main_column_container = 0x7f0f0419;
public static final int notification_background = 0x7f0f0424;
public static final int notification_main_column = 0x7f0f041f;
public static final int notification_main_column_container = 0x7f0f041e;
public static final int parentPanel = 0x7f0f0079;
public static final int progress_circular = 0x7f0f000c;
public static final int progress_horizontal = 0x7f0f000d;
public static final int radio = 0x7f0f0089;
public static final int right_icon = 0x7f0f0420;
public static final int right_side = 0x7f0f041b;
public static final int right_icon = 0x7f0f0425;
public static final int right_side = 0x7f0f0420;
public static final int screen = 0x7f0f002e;
public static final int scrollIndicatorDown = 0x7f0f007f;
public static final int scrollIndicatorUp = 0x7f0f007b;
@ -629,15 +629,15 @@ public final class R {
public static final int src_atop = 0x7f0f002f;
public static final int src_in = 0x7f0f0030;
public static final int src_over = 0x7f0f0031;
public static final int status_bar_latest_event_content = 0x7f0f0416;
public static final int status_bar_latest_event_content = 0x7f0f041b;
public static final int submenuarrow = 0x7f0f008a;
public static final int submit_area = 0x7f0f009b;
public static final int tabMode = 0x7f0f001f;
public static final int text = 0x7f0f0107;
public static final int text2 = 0x7f0f0424;
public static final int text = 0x7f0f010d;
public static final int text2 = 0x7f0f0429;
public static final int textSpacerNoButtons = 0x7f0f007e;
public static final int textSpacerNoTitle = 0x7f0f007d;
public static final int time = 0x7f0f041c;
public static final int time = 0x7f0f0421;
public static final int title = 0x7f0f0076;
public static final int titleDividerNoCustom = 0x7f0f0085;
public static final int title_template = 0x7f0f0083;
@ -682,25 +682,25 @@ public final class R {
public static final int abc_search_dropdown_item_icons_2line = 0x7f040018;
public static final int abc_search_view = 0x7f040019;
public static final int abc_select_dialog_material = 0x7f04001a;
public static final int notification_action = 0x7f040126;
public static final int notification_action_tombstone = 0x7f040127;
public static final int notification_media_action = 0x7f040128;
public static final int notification_media_cancel_action = 0x7f040129;
public static final int notification_template_big_media = 0x7f04012a;
public static final int notification_template_big_media_custom = 0x7f04012b;
public static final int notification_template_big_media_narrow = 0x7f04012c;
public static final int notification_template_big_media_narrow_custom = 0x7f04012d;
public static final int notification_template_custom_big = 0x7f04012e;
public static final int notification_template_icon_group = 0x7f04012f;
public static final int notification_template_lines_media = 0x7f040130;
public static final int notification_template_media = 0x7f040131;
public static final int notification_template_media_custom = 0x7f040132;
public static final int notification_template_part_chronometer = 0x7f040133;
public static final int notification_template_part_time = 0x7f040134;
public static final int select_dialog_item_material = 0x7f04014a;
public static final int select_dialog_multichoice_material = 0x7f04014b;
public static final int select_dialog_singlechoice_material = 0x7f04014c;
public static final int support_simple_spinner_dropdown_item = 0x7f04016e;
public static final int notification_action = 0x7f040129;
public static final int notification_action_tombstone = 0x7f04012a;
public static final int notification_media_action = 0x7f04012b;
public static final int notification_media_cancel_action = 0x7f04012c;
public static final int notification_template_big_media = 0x7f04012d;
public static final int notification_template_big_media_custom = 0x7f04012e;
public static final int notification_template_big_media_narrow = 0x7f04012f;
public static final int notification_template_big_media_narrow_custom = 0x7f040130;
public static final int notification_template_custom_big = 0x7f040131;
public static final int notification_template_icon_group = 0x7f040132;
public static final int notification_template_lines_media = 0x7f040133;
public static final int notification_template_media = 0x7f040134;
public static final int notification_template_media_custom = 0x7f040135;
public static final int notification_template_part_chronometer = 0x7f040136;
public static final int notification_template_part_time = 0x7f040137;
public static final int select_dialog_item_material = 0x7f04014d;
public static final int select_dialog_multichoice_material = 0x7f04014e;
public static final int select_dialog_singlechoice_material = 0x7f04014f;
public static final int support_simple_spinner_dropdown_item = 0x7f040171;
}
public static final class string {
public static final int abc_action_bar_home_description = 0x7f080000;

View File

@ -532,7 +532,7 @@ public final class R {
public static final int notify_panel_notification_icon_bg = 0x7f02039c;
}
public static final class id {
public static final int action0 = 0x7f0f0414;
public static final int action0 = 0x7f0f0419;
public static final int action_bar = 0x7f0f0090;
public static final int action_bar_activity_content = 0x7f0f0000;
public static final int action_bar_container = 0x7f0f008f;
@ -540,17 +540,17 @@ public final class R {
public static final int action_bar_spinner = 0x7f0f0001;
public static final int action_bar_subtitle = 0x7f0f006e;
public static final int action_bar_title = 0x7f0f006d;
public static final int action_container = 0x7f0f0411;
public static final int action_container = 0x7f0f0416;
public static final int action_context_bar = 0x7f0f0091;
public static final int action_divider = 0x7f0f0418;
public static final int action_image = 0x7f0f0412;
public static final int action_divider = 0x7f0f041d;
public static final int action_image = 0x7f0f0417;
public static final int action_menu_divider = 0x7f0f0002;
public static final int action_menu_presenter = 0x7f0f0003;
public static final int action_mode_bar = 0x7f0f008d;
public static final int action_mode_bar_stub = 0x7f0f008c;
public static final int action_mode_close_button = 0x7f0f006f;
public static final int action_text = 0x7f0f0413;
public static final int actions = 0x7f0f0421;
public static final int action_text = 0x7f0f0418;
public static final int actions = 0x7f0f0426;
public static final int activity_chooser_view_content = 0x7f0f0070;
public static final int add = 0x7f0f002c;
public static final int alertTitle = 0x7f0f0084;
@ -558,9 +558,9 @@ public final class R {
public static final int beginning = 0x7f0f0049;
public static final int bottom = 0x7f0f0037;
public static final int buttonPanel = 0x7f0f0077;
public static final int cancel_action = 0x7f0f0415;
public static final int cancel_action = 0x7f0f041a;
public static final int checkbox = 0x7f0f0087;
public static final int chronometer = 0x7f0f041d;
public static final int chronometer = 0x7f0f0422;
public static final int collapseActionView = 0x7f0f004c;
public static final int contentPanel = 0x7f0f007a;
public static final int custom = 0x7f0f0081;
@ -570,42 +570,42 @@ public final class R {
public static final int disableHome = 0x7f0f0020;
public static final int edit_query = 0x7f0f0092;
public static final int end = 0x7f0f003b;
public static final int end_padder = 0x7f0f0426;
public static final int end_padder = 0x7f0f042b;
public static final int expand_activities_button = 0x7f0f0071;
public static final int expanded_menu = 0x7f0f0086;
public static final int home = 0x7f0f0009;
public static final int homeAsUp = 0x7f0f0021;
public static final int icon = 0x7f0f0075;
public static final int icon_group = 0x7f0f0422;
public static final int icon_group = 0x7f0f0427;
public static final int ifRoom = 0x7f0f004d;
public static final int image = 0x7f0f0072;
public static final int info = 0x7f0f041e;
public static final int iv_meituan_pull_down = 0x7f0f0705;
public static final int iv_meituan_release_refreshing = 0x7f0f0706;
public static final int iv_normal_refresh_footer_chrysanthemum = 0x7f0f0702;
public static final int iv_normal_refresh_header_arrow = 0x7f0f0708;
public static final int iv_normal_refresh_header_chrysanthemum = 0x7f0f0709;
public static final int line1 = 0x7f0f0423;
public static final int line3 = 0x7f0f0425;
public static final int info = 0x7f0f0423;
public static final int iv_meituan_pull_down = 0x7f0f070c;
public static final int iv_meituan_release_refreshing = 0x7f0f070d;
public static final int iv_normal_refresh_footer_chrysanthemum = 0x7f0f0709;
public static final int iv_normal_refresh_header_arrow = 0x7f0f070f;
public static final int iv_normal_refresh_header_chrysanthemum = 0x7f0f0710;
public static final int line1 = 0x7f0f0428;
public static final int line3 = 0x7f0f042a;
public static final int listMode = 0x7f0f001d;
public static final int list_item = 0x7f0f0074;
public static final int media_actions = 0x7f0f0417;
public static final int meiTuanView = 0x7f0f0704;
public static final int media_actions = 0x7f0f041c;
public static final int meiTuanView = 0x7f0f070b;
public static final int middle = 0x7f0f004a;
public static final int moocView = 0x7f0f0707;
public static final int moocView = 0x7f0f070e;
public static final int multiply = 0x7f0f002d;
public static final int never = 0x7f0f004e;
public static final int none = 0x7f0f0022;
public static final int normal = 0x7f0f001e;
public static final int notification_background = 0x7f0f041f;
public static final int notification_main_column = 0x7f0f041a;
public static final int notification_main_column_container = 0x7f0f0419;
public static final int notification_background = 0x7f0f0424;
public static final int notification_main_column = 0x7f0f041f;
public static final int notification_main_column_container = 0x7f0f041e;
public static final int parentPanel = 0x7f0f0079;
public static final int progress_circular = 0x7f0f000c;
public static final int progress_horizontal = 0x7f0f000d;
public static final int radio = 0x7f0f0089;
public static final int right_icon = 0x7f0f0420;
public static final int right_side = 0x7f0f041b;
public static final int right_icon = 0x7f0f0425;
public static final int right_side = 0x7f0f0420;
public static final int screen = 0x7f0f002e;
public static final int scrollIndicatorDown = 0x7f0f007f;
public static final int scrollIndicatorUp = 0x7f0f007b;
@ -630,21 +630,21 @@ public final class R {
public static final int src_atop = 0x7f0f002f;
public static final int src_in = 0x7f0f0030;
public static final int src_over = 0x7f0f0031;
public static final int status_bar_latest_event_content = 0x7f0f0416;
public static final int stickinessRefreshView = 0x7f0f070b;
public static final int status_bar_latest_event_content = 0x7f0f041b;
public static final int stickinessRefreshView = 0x7f0f0712;
public static final int submenuarrow = 0x7f0f008a;
public static final int submit_area = 0x7f0f009b;
public static final int tabMode = 0x7f0f001f;
public static final int text = 0x7f0f0107;
public static final int text2 = 0x7f0f0424;
public static final int text = 0x7f0f010d;
public static final int text2 = 0x7f0f0429;
public static final int textSpacerNoButtons = 0x7f0f007e;
public static final int time = 0x7f0f041c;
public static final int time = 0x7f0f0421;
public static final int title = 0x7f0f0076;
public static final int title_template = 0x7f0f0083;
public static final int top = 0x7f0f0040;
public static final int topPanel = 0x7f0f0082;
public static final int tv_normal_refresh_footer_status = 0x7f0f0703;
public static final int tv_normal_refresh_header_status = 0x7f0f070a;
public static final int tv_normal_refresh_footer_status = 0x7f0f070a;
public static final int tv_normal_refresh_header_status = 0x7f0f0711;
public static final int up = 0x7f0f001a;
public static final int useLogo = 0x7f0f0026;
public static final int withText = 0x7f0f004f;
@ -683,30 +683,30 @@ public final class R {
public static final int abc_search_dropdown_item_icons_2line = 0x7f040018;
public static final int abc_search_view = 0x7f040019;
public static final int abc_select_dialog_material = 0x7f04001a;
public static final int notification_action = 0x7f040126;
public static final int notification_action_tombstone = 0x7f040127;
public static final int notification_media_action = 0x7f040128;
public static final int notification_media_cancel_action = 0x7f040129;
public static final int notification_template_big_media = 0x7f04012a;
public static final int notification_template_big_media_custom = 0x7f04012b;
public static final int notification_template_big_media_narrow = 0x7f04012c;
public static final int notification_template_big_media_narrow_custom = 0x7f04012d;
public static final int notification_template_custom_big = 0x7f04012e;
public static final int notification_template_icon_group = 0x7f04012f;
public static final int notification_template_lines_media = 0x7f040130;
public static final int notification_template_media = 0x7f040131;
public static final int notification_template_media_custom = 0x7f040132;
public static final int notification_template_part_chronometer = 0x7f040133;
public static final int notification_template_part_time = 0x7f040134;
public static final int select_dialog_item_material = 0x7f04014a;
public static final int select_dialog_multichoice_material = 0x7f04014b;
public static final int select_dialog_singlechoice_material = 0x7f04014c;
public static final int support_simple_spinner_dropdown_item = 0x7f04016e;
public static final int view_normal_refresh_footer = 0x7f040209;
public static final int view_refresh_header_meituan = 0x7f04020a;
public static final int view_refresh_header_mooc_style = 0x7f04020b;
public static final int view_refresh_header_normal = 0x7f04020c;
public static final int view_refresh_header_stickiness = 0x7f04020d;
public static final int notification_action = 0x7f040129;
public static final int notification_action_tombstone = 0x7f04012a;
public static final int notification_media_action = 0x7f04012b;
public static final int notification_media_cancel_action = 0x7f04012c;
public static final int notification_template_big_media = 0x7f04012d;
public static final int notification_template_big_media_custom = 0x7f04012e;
public static final int notification_template_big_media_narrow = 0x7f04012f;
public static final int notification_template_big_media_narrow_custom = 0x7f040130;
public static final int notification_template_custom_big = 0x7f040131;
public static final int notification_template_icon_group = 0x7f040132;
public static final int notification_template_lines_media = 0x7f040133;
public static final int notification_template_media = 0x7f040134;
public static final int notification_template_media_custom = 0x7f040135;
public static final int notification_template_part_chronometer = 0x7f040136;
public static final int notification_template_part_time = 0x7f040137;
public static final int select_dialog_item_material = 0x7f04014d;
public static final int select_dialog_multichoice_material = 0x7f04014e;
public static final int select_dialog_singlechoice_material = 0x7f04014f;
public static final int support_simple_spinner_dropdown_item = 0x7f040171;
public static final int view_normal_refresh_footer = 0x7f04020d;
public static final int view_refresh_header_meituan = 0x7f04020e;
public static final int view_refresh_header_mooc_style = 0x7f04020f;
public static final int view_refresh_header_normal = 0x7f040210;
public static final int view_refresh_header_stickiness = 0x7f040211;
}
public static final class mipmap {
public static final int bga_refresh_loading01 = 0x7f030000;

View File

@ -17,16 +17,16 @@ public final class R {
public static final int ic_launcher = 0x7f020208;
}
public static final class id {
public static final int com_taobao_tae_sdk_web_view_title_bar = 0x7f0f00ff;
public static final int com_taobao_tae_sdk_web_view_title_bar_back_button = 0x7f0f0104;
public static final int com_taobao_tae_sdk_web_view_title_bar_close_button = 0x7f0f0106;
public static final int com_taobao_tae_sdk_web_view_title_bar_title = 0x7f0f0105;
public static final int login_layout = 0x7f0f0245;
public static final int com_taobao_tae_sdk_web_view_title_bar = 0x7f0f0105;
public static final int com_taobao_tae_sdk_web_view_title_bar_back_button = 0x7f0f010a;
public static final int com_taobao_tae_sdk_web_view_title_bar_close_button = 0x7f0f010c;
public static final int com_taobao_tae_sdk_web_view_title_bar_title = 0x7f0f010b;
public static final int login_layout = 0x7f0f024a;
}
public static final class layout {
public static final int com_taobao_tae_sdk_web_view_activity = 0x7f04003a;
public static final int com_taobao_tae_sdk_web_view_title_bar = 0x7f04003b;
public static final int login_hidden = 0x7f04009e;
public static final int com_taobao_tae_sdk_web_view_activity = 0x7f04003b;
public static final int com_taobao_tae_sdk_web_view_title_bar = 0x7f04003c;
public static final int login_hidden = 0x7f0400a0;
}
public static final class string {
public static final int action_settings = 0x7f080098;

View File

@ -19,24 +19,24 @@ public final class R {
public static final int com_taobao_nb_sdk_web_view_title_bar_close = 0x7f02009a;
}
public static final class id {
public static final int com_alibc_auth_progressbar = 0x7f0f00f7;
public static final int com_taobao_nb_sdk_web_view_title_bar = 0x7f0f0100;
public static final int com_taobao_nb_sdk_web_view_title_bar_back_button = 0x7f0f0101;
public static final int com_taobao_nb_sdk_web_view_title_bar_close_button = 0x7f0f0103;
public static final int com_taobao_nb_sdk_web_view_title_bar_title = 0x7f0f0102;
public static final int com_alibc_auth_progressbar = 0x7f0f00fd;
public static final int com_taobao_nb_sdk_web_view_title_bar = 0x7f0f0106;
public static final int com_taobao_nb_sdk_web_view_title_bar_back_button = 0x7f0f0107;
public static final int com_taobao_nb_sdk_web_view_title_bar_close_button = 0x7f0f0109;
public static final int com_taobao_nb_sdk_web_view_title_bar_title = 0x7f0f0108;
public static final int com_taobao_nb_sdk_webview_click = 0x7f0f0004;
public static final int com_taobao_tae_sdk_web_view_title_bar = 0x7f0f00ff;
public static final int open_auth_btn_cancel = 0x7f0f00f6;
public static final int open_auth_btn_close = 0x7f0f00f2;
public static final int open_auth_btn_grant = 0x7f0f00f5;
public static final int open_auth_desc = 0x7f0f00f4;
public static final int open_auth_rl = 0x7f0f00f1;
public static final int open_auth_title = 0x7f0f00f3;
public static final int com_taobao_tae_sdk_web_view_title_bar = 0x7f0f0105;
public static final int open_auth_btn_cancel = 0x7f0f00fc;
public static final int open_auth_btn_close = 0x7f0f00f8;
public static final int open_auth_btn_grant = 0x7f0f00fb;
public static final int open_auth_desc = 0x7f0f00fa;
public static final int open_auth_rl = 0x7f0f00f7;
public static final int open_auth_title = 0x7f0f00f9;
}
public static final class layout {
public static final int com_alibc_auth_actiivty = 0x7f040034;
public static final int com_taobao_nb_sdk_web_view_activity = 0x7f040038;
public static final int com_taobao_nb_sdk_web_view_title_bar = 0x7f040039;
public static final int com_alibc_auth_actiivty = 0x7f040035;
public static final int com_taobao_nb_sdk_web_view_activity = 0x7f040039;
public static final int com_taobao_nb_sdk_web_view_title_bar = 0x7f04003a;
}
public static final class raw {
public static final int keep = 0x7f070002;

File diff suppressed because it is too large Load Diff

View File

@ -707,14 +707,14 @@
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_btn_check_to_on_mtrl_000.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_input_voice_normal.png",
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_input_voice_normal.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_slide_toggle_on.png",
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_slide_toggle_on.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_message_input_voice_normal.png",
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_message_input_voice_normal.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"

View File

@ -1435,14 +1435,14 @@
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_setting_on.png",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_setting_on.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\bt_logout.9.png",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\bt_logout.9.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\umeng_socialize_nav_bar_bg_pad.9.png",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\umeng_socialize_nav_bar_bg_pad.9.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\bt_logout.9.png",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\bt_logout.9.png"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_goon_press.png",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_goon_press.png"

View File

@ -283,6 +283,10 @@
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\videolist_activity.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\videolist_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\changenickname_2b_activity.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\changenickname_2b_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_waitdialog.xml",
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_waitdialog.xml"
@ -1163,6 +1167,10 @@
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\lookatlist_activity.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\lookatlist_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\four_2b_fragment.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\four_2b_fragment.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_simplify_image_selected_item.xml",
"source": "C:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_simplify_image_selected_item.xml"
@ -1903,6 +1911,10 @@
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\brand_activity.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\brand_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\main_four_2b_control_activity.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\main_four_2b_control_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_bar_view_list_nav_layout.xml",
"source": "C:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_action_bar_view_list_nav_layout.xml"
@ -1943,6 +1955,10 @@
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\mass_message_activity.xml",
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\mass_message_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_four_2b_activity.xml",
"source": "C:\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_four_2b_activity.xml"
},
{
"merged": "C:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_actions_item_layout.xml",
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_actions_item_layout.xml"

View File

@ -1 +1 @@
#Tue Mar 13 17:31:05 CST 2018
#Thu Apr 19 19:10:43 CST 2018

View File

@ -1,4 +1,4 @@
#Tue Mar 13 17:31:01 CST 2018
#Thu Apr 19 19:10:39 CST 2018
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\umeng_comm_feed_item_top.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\umeng_comm_feed_item_top.png
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\layout\\abc_action_menu_layout.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\abc_action_menu_layout.xml
C\:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_richpush_actionbar_divider.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_richpush_actionbar_divider.png
@ -51,6 +51,7 @@ C\:\\ifish\\iFish7\\src\\main\\res\\drawable\\item_alpha.xml=C\:\\ifish\\iFish7\
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f414.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f414.png
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\layout\\umeng_comm_search_activity.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\umeng_comm_search_activity.xml
C\:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_actionbar_dark_back_icon.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\nim_actionbar_dark_back_icon.png
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\timesetting_four_2b_activity.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\timesetting_four_2b_activity.xml
C\:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_team_info_divider_item.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\nim_team_info_divider_item.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable-xhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f690.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f690.png
@ -138,6 +139,7 @@ C\:\\ifish\\iFish7\\src\\main\\res\\drawable\\nonet_bt_select.xml=C\:\\ifish\\iF
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-xxxhdpi-v4\\umeng_simplify_write.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xxxhdpi-v4\\umeng_simplify_write.png
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\shopsuserinfo_activity.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\shopsuserinfo_activity.xml
C\:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\swimmingfish0047.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\swimmingfish0047.png
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\main_four_2b_control_activity.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\main_four_2b_control_activity.xml
C\:\\ifish\\iFish7\\src\\main\\res\\drawable\\shadow.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\shadow.xml
C\:\\ifish\\iFish7\\src\\main\\res\\drawable-xhdpi\\bindtwo_more.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi\\bindtwo_more.png
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f606.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f606.png
@ -1565,7 +1567,9 @@ C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c1475
C\:\\Users\\Long\\.android\\build-cache\\07454ebfa4ea65a390b60f931cbc0dc5b608ccfb\\output\\res\\layout\\design_bottom_sheet_dialog.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\design_bottom_sheet_dialog.xml
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\head_lookat.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\head_lookat.xml
C\:\\Users\\Long\\.android\\build-cache\\74d444b7c4a31c244ac4715ad6b3118002c14758\\output\\res\\drawable\\abc_btn_borderless_material.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable\\abc_btn_borderless_material.xml
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\four_2b_fragment.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\four_2b_fragment.xml
C\:\\ifish\\umeng_community_library\\build\\intermediates\\bundles\\default\\res\\drawable-nodpi-v4\\emoji_1f645.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-nodpi-v4\\emoji_1f645.png
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\changenickname_2b_activity.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\changenickname_2b_activity.xml
C\:\\ifish\\iFish7\\src\\main\\res\\layout\\waitcamera_activity.xml=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\layout\\waitcamera_activity.xml
C\:\\ifish\\iFish7\\src\\main\\res\\drawable-hdpi\\ic_blue_2_press.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi\\ic_blue_2_press.png
C\:\\ifish\\JCVideo_Library\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\jc_enlarge.png=C\:\\ifish\\iFish7\\build\\intermediates\\res\\merged\\debug\\drawable-xhdpi-v4\\jc_enlarge.png

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,384 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:background="@color/color_F2F2F2"
android:id="@+id/rl_bg"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<include
android:id="@+id/in_daohang"
layout="@layout/title_layout" />
<LinearLayout
android:layout_below="@+id/in_daohang"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:background="@color/white"
android:layout_marginTop="12dp"
>
<View
android:id="@+id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv0"
android:layout_width="wrap_content"
android:layout_height="30dp"
android:layout_alignParentBottom="true"
android:src="@drawable/changename_2a_blue"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="水族箱"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv0"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_et"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="6"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="我的水族箱"
/>
</RelativeLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="12dp"
android:src="@drawable/changename_2a_small"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:background="@color/white"
>
<View
android:id="@id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/changename_2a_item"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="S1"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="@integer/change2AName_textLeng"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="@string/iconName"
/>
<View
android:layout_toRightOf="@+id/iv_iv"
style="@style/line_bottom"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:background="@color/white"
>
<View
android:id="@id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv2"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/changename_2a_item"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="S2"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv2"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_2"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="@integer/change2AName_textLeng"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="@string/iconName"
/>
<View
android:layout_toRightOf="@+id/iv_iv2"
style="@style/line_bottom"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:background="@color/white"
>
<View
android:id="@id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv3"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/changename_2a_item"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="S3"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv3"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_3"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="@integer/change2AName_textLeng"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="@string/iconName"
/>
<View
android:layout_toRightOf="@+id/iv_iv3"
style="@style/line_bottom"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:background="@color/white"
>
<View
android:id="@id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv4"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/changename_2a_item"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="S4"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv4"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_4"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="@integer/change2AName_textLeng"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="@string/iconName"
/>
<View
android:layout_toRightOf="@+id/iv_iv4"
style="@style/line_bottom"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:background="@color/white"
>
<View
android:id="@id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv5"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:src="@drawable/changename_2a_item"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="加热棒"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv5"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_5"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="@integer/change2AName_textLeng"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="@string/iconName"
/>
<View
android:layout_toRightOf="@+id/iv_iv5"
style="@style/line_bottom"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/change2AName_item_height"
android:visibility="invisible"
android:background="@color/white"
>
<View
android:id="@id/view_center"
android:layout_width="1dp"
android:layout_height="1dp"
android:layout_centerInParent="true"
android:layout_marginRight="@dimen/change2AName_item_right"
/>
<ImageView
android:id="@+id/iv_iv6"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:src="@drawable/changename_2a_end"
android:layout_marginLeft="@dimen/change2AName_item_left"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="S5"
android:layout_centerVertical="true"
android:textSize="16dp"
android:textColor="@color/black"
android:layout_toRightOf="@+id/iv_iv6"
android:layout_marginLeft="@dimen/change2AName_text_left"
/>
<com.ifish.view.ClearEditText
android:id="@+id/et_6"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@id/view_center"
android:background="@color/white"
android:maxLength="@integer/change2AName_textLeng"
android:textSize="16dp"
android:paddingRight="10dp"
android:layout_marginRight="10dp"
android:singleLine="true"
android:textColor="@color/black"
android:textColorHint="@color/shoplist_text_galy"
android:hint="@string/iconName"
/>
</RelativeLayout>
</LinearLayout>
<ProgressBar
android:id="@+id/mypro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:layout_centerInParent="true"
/>
</RelativeLayout>

View File

@ -0,0 +1,318 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:overScrollMode="never">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- 顶部三个块 -->
<LinearLayout
android:id="@+id/ll_top"
android:layout_width="fill_parent"
android:layout_height="@dimen/camera_device_height"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="100dp"
android:layout_height="@dimen/ic_device_height"
android:layout_centerInParent="true"
android:src="@drawable/ifish_logo_default" />
</RelativeLayout>
<View
android:layout_width="0.1dp"
android:layout_height="fill_parent"
android:background="@color/dddddd" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="vertical">
<view
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="2" />
<TextView
android:id="@+id/tv_water"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="--"
android:textColor="@color/FCBB3E"
android:textSize="30sp" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="室温"
android:layout_marginTop="10dp"
android:textColor="@color/color_cold"
android:textSize="12sp" />
<TextView
android:id="@+id/tv_room_temperature"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="--"
android:textColor="@color/FCBB3E"
android:textSize="18sp" />
<view
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1" />
</LinearLayout>
<View
android:layout_width="0.1dp"
android:layout_height="fill_parent"
android:background="@color/dddddd" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<ImageView
android:id="@+id/iv_setting"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerInParent="true"
android:src="@drawable/ic_setting_cameradevice" />
</RelativeLayout>
</LinearLayout>
<View
android:id="@+id/line_1"
android:layout_width="fill_parent"
android:layout_height="0.1dp"
android:layout_below="@id/ll_top"
android:background="@color/dddddd" />
<!-- 中间三个块 -->
<LinearLayout
android:id="@+id/ll_center"
android:layout_width="fill_parent"
android:layout_height="@dimen/camera_device_height"
android:layout_below="@id/line_1"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<com.ifish.view.SelectorImageView
android:id="@+id/iv_1"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/ic_blue_2_press"
app:selector_src="@drawable/ic_blue_2" />
<TextView
android:id="@+id/tv_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_1"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="S1"
android:textColor="@color/black" />
</RelativeLayout>
<View
android:layout_width="0.1dp"
android:layout_height="fill_parent"
android:background="@color/dddddd" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<com.ifish.view.SelectorImageView
android:id="@+id/iv_2"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/ic_blue_2_press"
app:selector_src="@drawable/ic_blue_2" />
<TextView
android:id="@+id/tv_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_2"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="S2"
android:textColor="@color/black" />
</RelativeLayout>
<View
android:layout_width="0.1dp"
android:layout_height="fill_parent"
android:background="@color/dddddd" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<com.ifish.view.SelectorImageView
android:id="@+id/iv_3"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/ic_blue_4_press"
app:selector_src="@drawable/ic_blue_4" />
<TextView
android:id="@+id/tv_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_3"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="杀菌灯"
android:textColor="@color/black" />
</RelativeLayout>
</LinearLayout>
<View
android:id="@+id/line_2"
android:layout_width="fill_parent"
android:layout_height="0.1dp"
android:layout_below="@id/ll_center"
android:background="@color/dddddd" />
<!-- 下面三个块 -->
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="fill_parent"
android:layout_height="@dimen/camera_device_height"
android:layout_below="@id/line_2"
android:orientation="horizontal">
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<com.ifish.view.SelectorImageView
android:id="@+id/iv_4"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/ic_blue_7_press"
app:selector_src="@drawable/ic_blue_7" />
<TextView
android:id="@+id/tv_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_4"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="氧泵"
android:textColor="@color/black" />
</RelativeLayout>
<View
android:layout_width="0.1dp"
android:layout_height="fill_parent"
android:background="@color/dddddd" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1">
<com.ifish.view.SelectorImageView
android:id="@+id/iv_5"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/ic_blue_6_press"
app:selector_src="@drawable/ic_blue_6" />
<TextView
android:id="@+id/tv_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_5"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="加热棒"
android:textColor="@color/black" />
</RelativeLayout>
<View
android:layout_width="0.1dp"
android:layout_height="fill_parent"
android:background="@color/dddddd" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="fill_parent"
android:layout_weight="1"
android:visibility="invisible">
<com.ifish.view.SelectorImageView
android:id="@+id/iv_6"
android:layout_width="@dimen/ic_device_height"
android:layout_height="@dimen/ic_device_height"
android:layout_centerHorizontal="true"
android:layout_marginTop="30dp"
android:src="@drawable/ic_blue_6_press"
app:selector_src="@drawable/ic_blue_6" />
<TextView
android:id="@+id/tv_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/iv_6"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
android:text="S5"
android:textColor="@color/black" />
</RelativeLayout>
</LinearLayout>
<View
android:id="@+id/line_3"
android:layout_width="fill_parent"
android:layout_height="0.1dp"
android:layout_below="@id/ll_bottom"
android:background="@color/dddddd" />
</RelativeLayout>
</ScrollView>
<ProgressBar
android:id="@+id/mypro"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="gone" />
</RelativeLayout>

View File

@ -122,7 +122,6 @@
>
<TextView
android:id="@+id/tv_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"

View File

@ -0,0 +1,445 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rl_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<!-- 顶部导航栏 -->
<include
android:id="@+id/in_daohang"
layout="@layout/title_layout_device"/>
<!-- 下拉刷新控件 居于导航栏下方 填充父容器-->
<ImageView
android:id="@+id/iv_img"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/in_daohang"
android:scaleType="fitXY"
/>
<com.ifish.view.SwipeRefreshLayout
android:id="@+id/sw"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_below="@id/in_daohang"
app:srlTextColor="@color/white_my"
app:srlTextSize="15.5sp"
>
<!-- 下拉刷新控件包裹的子控件(只能包裹一个儿子) -->
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
>
<LinearLayout
android:id="@+id/rl_brand"
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_marginTop="10dp"
android:orientation="horizontal"
>
<RelativeLayout
android:id="@+id/rl_left"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
>
<ImageView
android:id="@+id/iv_left"
android:layout_width="100dp"
android:layout_height="50dp"
android:layout_centerHorizontal="true"
android:src="@drawable/ifish_logo_default"
/>
<TextView
android:id="@+id/tv_left"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="3dp"
android:text="鱼影科技"
android:textColor="@color/white"
android:textSize="16sp"
/>
</RelativeLayout>
<View
android:layout_width="4dp"
android:layout_height="fill_parent"
android:background="@drawable/main_line"
/>
<RelativeLayout
android:id="@+id/rl_right"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1"
>
<ImageView
android:id="@+id/iv_right"
android:layout_width="100dp"
android:layout_height="35dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:src="@drawable/ic_setting_six"
/>
<TextView
android:id="@+id/tv_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="3dp"
android:text="水族箱设置"
android:textColor="@color/white"
android:textSize="16sp"
/>
</RelativeLayout>
</LinearLayout>
<!-- 中间的大数字温度布局 宽高填充父容器然后让文字居于父容器的centerInParent 保证文字在屏幕(除去导航栏)的正中央-->
<RelativeLayout
android:id="@+id/rl_watertemp"
android:layout_width="fill_parent"
android:layout_height="340dp"
android:layout_marginTop="60dp"
android:visibility="gone"
>
<!-- 泡泡背景图 -->
<ImageView
android:layout_width="290dp"
android:layout_height="290dp"
android:layout_centerInParent="true"
android:src="@drawable/main_paopao"
/>
<!-- 显示数字 -->
<TextView
android:id="@+id/tv_watertemp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textColor="@color/text_black_my"
android:textSize="80sp"
/>
<!-- 显示℃ -->
<TextView
android:id="@+id/tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignTop="@id/tv_watertemp"
android:layout_marginTop="50dp"
android:layout_toRightOf="@id/tv_watertemp"
android:text="℃"
android:textColor="@color/text_black_my"
android:textSize="25sp"
/>
<TextView
android:id="@+id/tv_heatWendu_text"
android:layout_below="@+id/tv_watertemp"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp"
/>
<TextView
android:id="@+id/tv_heatWendu"
android:layout_below="@+id/tv_heatWendu_text"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/text_black_my"
android:textSize="15sp"
/>
<ImageView
android:id="@+id/iv_dragonfish"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_below="@id/tv_unit"
android:layout_marginTop="28dp"
/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_offline"
android:layout_width="270dp"
android:layout_height="270dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="100dp"
android:visibility="gone"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/main_paopao"
android:gravity="center"
android:text="该设备已离线"
android:textColor="@color/text_black_my"
android:textSize="20sp"
/>
</RelativeLayout>
<!--底部鱼缸控制器按钮-->
<!-- 二个按钮 -->
<LinearLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_alignParentBottom="true"
android:orientation="horizontal"
>
<!-- 左边水泵的布局 -->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<!-- 显示loading用 默认隐藏 -->
<TextView
android:id="@+id/tv_control_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="Loading..."
android:textColor="@color/text_black_my"
android:textSize="10sp"
android:visibility="gone"
/>
<!-- 显示开关灯的选择imageview -->
<com.ifish.view.SelectorImageView
android:id="@+id/iv_control_4"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="11dp"
android:src="@drawable/ic_7_off"
app:selector_src="@drawable/ic_7_on"
/>
<!-- 水泵文字 -->
<TextView
android:id="@+id/tv_iconName_4"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="氧泵"
android:textColor="@color/main_text_icon"
android:textSize="12sp"
/>
</RelativeLayout>
<!-- 右边水泵的布局 -->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<!-- 显示loading用 默认隐藏 -->
<TextView
android:id="@+id/tv_control_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="Loading..."
android:textColor="@color/text_black_my"
android:textSize="10sp"
android:visibility="gone"
/>
<!-- 显示开关灯的选择imageview -->
<com.ifish.view.SelectorImageView
android:id="@+id/iv_control_5"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="11dp"
android:src="@drawable/ic_9_off"
app:selector_src="@drawable/ic_9_on"
/>
<!-- 灯文字 -->
<TextView
android:id="@+id/tv_iconName_5"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="加热棒"
android:textColor="@color/main_text_icon"
android:textSize="12sp"
/>
</RelativeLayout>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="invisible"
android:layout_weight="1"
>
<!-- 显示loading用 默认隐藏 -->
<TextView
android:id="@+id/tv_control_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="Loading..."
android:textColor="@color/text_black_my"
android:textSize="10sp"
android:visibility="gone"
/>
<!-- 显示开关灯的选择imageview -->
<com.ifish.view.SelectorImageView
android:id="@+id/iv_control_6"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="11dp"
android:src="@drawable/ic_9_off"
app:selector_src="@drawable/ic_9_on"
/>
<!-- 灯文字 -->
<TextView
android:id="@+id/tv_iconName_6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="S5"
android:textColor="@color/main_text_icon"
android:textSize="12sp"
/>
</RelativeLayout>
</LinearLayout>
<!-- 三个按钮 -->
<LinearLayout
android:id="@+id/ll_top"
android:layout_width="match_parent"
android:layout_height="88dp"
android:layout_above="@id/ll_bottom"
android:orientation="horizontal"
>
<!-- 左边灯的布局 -->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<!-- 显示loading用 默认隐藏 -->
<TextView
android:id="@+id/tv_control_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="Loading..."
android:textColor="@color/text_black_my"
android:textSize="10sp"
android:visibility="gone"
/>
<!-- 显示开关灯的选择imageview -->
<com.ifish.view.SelectorImageView
android:id="@+id/iv_control_1"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="11dp"
android:src="@drawable/ic_1_off"
app:selector_src="@drawable/ic_1_on"
/>
<!-- 灯1文字 -->
<TextView
android:id="@+id/tv_iconName_1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="S1"
android:textColor="@color/main_text_icon"
android:textSize="12sp"
/>
</RelativeLayout>
<!-- 中间灯的布局 -->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<!-- 显示loading用 默认隐藏 -->
<TextView
android:id="@+id/tv_control_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="Loading..."
android:textColor="@color/text_black_my"
android:textSize="10sp"
android:visibility="gone"
/>
<!-- 显示开关灯的选择imageview -->
<com.ifish.view.SelectorImageView
android:id="@+id/iv_control_2"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="11dp"
android:src="@drawable/ic_1_off"
app:selector_src="@drawable/ic_1_on"
/>
<!-- 灯2文字 -->
<TextView
android:id="@+id/tv_iconName_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="S2"
android:textColor="@color/main_text_icon"
android:textSize="12sp"
/>
</RelativeLayout>
<!-- 右边灯的布局 -->
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
>
<!-- 显示loading用 默认隐藏 -->
<TextView
android:id="@+id/tv_control_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:text="Loading..."
android:textColor="@color/text_black_my"
android:textSize="10sp"
android:visibility="gone"
/>
<!-- 显示开关灯的选择imageview -->
<com.ifish.view.SelectorImageView
android:id="@+id/iv_control_3"
android:layout_width="68dp"
android:layout_height="68dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="11dp"
android:src="@drawable/ic_2_off"
app:selector_src="@drawable/ic_2_on"
/>
<!-- 水泵文字 -->
<TextView
android:id="@+id/tv_iconName_3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:text="S3"
android:textColor="@color/main_text_icon"
android:textSize="12sp"
/>
</RelativeLayout>
</LinearLayout>
<!--底部鱼缸控制器按钮 结束-->
</RelativeLayout>
</com.ifish.view.SwipeRefreshLayout>
</RelativeLayout>

Some files were not shown because too many files have changed in this diff Show More