版本更新
This commit is contained in:
Long-PC\Long
@@ -26,5 +26,4 @@ dependencies {
|
||||
compile 'de.greenrobot:eventbus:2.4.0'
|
||||
compile files('libs/nim-basesdk-5.0.0.jar')
|
||||
compile files('libs/nim-lucene-5.0.0.jar')
|
||||
compile files('libs/nim-avchat-5.0.0.jar')
|
||||
}
|
||||
|
||||
@@ -531,14 +531,14 @@
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_loading_small_white.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_loading_small_white.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_cameras_hover.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_cameras_hover.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_loading_small_white.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_loading_small_white.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_actionbar_search_dark_icon.png",
|
||||
"source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_actionbar_search_dark_icon.png"
|
||||
|
||||
+4
-4
@@ -167,14 +167,14 @@
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_16dp.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_voice_search_api_mtrl_alpha.png",
|
||||
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_voice_search_api_mtrl_alpha.png"
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
@@ -76,7 +76,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
+11
-11
@@ -1,4 +1,4 @@
|
||||
#Tue Oct 16 02:51:29 CST 2018
|
||||
#Wed Nov 21 18:56:11 CST 2018
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_message_item_text.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_message_item_text.xml
|
||||
@@ -59,8 +59,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c0
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_watch_video_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_watch_video_activity.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_star_black_36dp.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_star_black_36dp.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_ic_failed.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_ic_failed.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_ic_clear_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_clear_mtrl_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_btn_check_to_on_mtrl_000.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_ic_clear_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_clear_mtrl_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_contact_hit_letter_bg.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_contact_hit_letter_bg.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_arrow_right.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_arrow_right.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_list_pressed_holo_dark.9.png
|
||||
@@ -112,9 +112,9 @@ C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c0
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable\\abc_btn_colored_material.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_btn_colored_material.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_btn_radio_to_on_mtrl_015.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_plus_location_pressed.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_plus_location_pressed.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_g_download_progress_bar_bg.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_g_download_progress_bar_bg.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_menu_dialog.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_menu_dialog.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable\\abc_list_selector_holo_dark.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_list_selector_holo_dark.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_g_download_progress_bar_bg.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_g_download_progress_bar_bg.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\e28e9f72cf7aaec0512af176b1c20a9d8a63785a\\output\\res\\layout\\design_navigation_menu.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\design_navigation_menu.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_scrubber_track_mtrl_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\layout\\abc_list_menu_item_checkbox.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_list_menu_item_checkbox.xml
|
||||
@@ -124,8 +124,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c0
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\anim\\abc_slide_out_top.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\anim\\abc_slide_out_top.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_moreoverflow_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_moreoverflow_mtrl_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_audio_animation_list_right_2.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\nim_audio_animation_list_right_2.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_contact_checkbox_unchecked.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_contact_checkbox_unchecked.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxhdpi-v17\\abc_ic_menu_cut_mtrl_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\layout\\select_dialog_singlechoice_material.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\select_dialog_singlechoice_material.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_message_item.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_message_item.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\indicator_bg_top.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\indicator_bg_top.xml
|
||||
@@ -261,8 +261,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_time_text_view_layout.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_time_text_view_layout.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-v21\\abc_edit_text_material.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-v21\\abc_edit_text_material.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_picker_image_normal.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\nim_picker_image_normal.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_popup_background_mtrl_mult.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_advanced_team_announce.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_advanced_team_announce.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_progress_bar_background.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\nim_progress_bar_background.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_activity_top_tip.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_activity_top_tip.9.png
|
||||
@@ -279,8 +279,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_message_item_name_layout.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_message_item_name_layout.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_message_plus_photo_selector.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\nim_message_plus_photo_selector.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\layout_toast.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\layout_toast.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable\\abc_ratingbar_full_material.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_ratingbar_full_material.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-mdpi-v17\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-mdpi-v17\\abc_spinner_mtrl_am_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable\\abc_ratingbar_full_material.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_ratingbar_full_material.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_red_round_button.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_red_round_button.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_video_play_icon_pressed.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\nim_video_play_icon_pressed.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xhdpi-v4\\abc_ic_go_search_api_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_ic_go_search_api_mtrl_alpha.png
|
||||
@@ -362,8 +362,8 @@ C\:\\Users\\Administrator\\.android\\build-cache\\e28e9f72cf7aaec0512af176b1c20a
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_btn_check_to_on_mtrl_015.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxxhdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_search_api_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_search_api_mtrl_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_crop_image_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_crop_image_activity.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_selector_disabled_holo_dark.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_crop_image_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_crop_image_activity.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_btn_rating_star_off_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_btn_rating_star_off_mtrl_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_textfield_search_default_mtrl_alpha.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_loading_small_white.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_loading_small_white.png
|
||||
@@ -403,8 +403,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_action_bar_right_clickable_tv.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_action_bar_right_clickable_tv.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_btn_radio_to_on_mtrl_000.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_ab_back_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxhdpi-v17\\abc_ic_ab_back_mtrl_am_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_message_input_emotion.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\nim_message_input_emotion.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xxhdpi-v17\\abc_ic_ab_back_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xxhdpi-v17\\abc_ic_ab_back_mtrl_am_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_menu_share_mtrl_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_input_send_normal.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_input_send_normal.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_ic_go_search_api_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ic_go_search_api_mtrl_alpha.png
|
||||
@@ -434,8 +434,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_ic_menu_moreoverflow_mtrl_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_ic_menu_moreoverflow_mtrl_alpha.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_input_emotion.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_input_emotion.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_message_input_voice_pressed.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\nim_message_input_voice_pressed.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\layout\\abc_list_menu_item_icon.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_list_menu_item_icon.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_ab_share_pack_mtrl_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\layout\\abc_list_menu_item_icon.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\abc_list_menu_item_icon.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_message_left_white_bg.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_message_left_white_bg.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\recording_backdrop.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\recording_backdrop.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_easy_alert_dialog_with_listview.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_easy_alert_dialog_with_listview.xml
|
||||
@@ -483,8 +483,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_picker_album_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_picker_album_activity.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\anim\\slide_in_from_top.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\anim\\slide_in_from_top.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_new_message_tip_layout.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_new_message_tip_layout.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-hdpi-v17\\abc_ic_menu_copy_mtrl_am_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_divider_mtrl_alpha.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_actions_item_layout.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_actions_item_layout.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_audio_animation_list_right.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\nim_audio_animation_list_right.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_default_img_failed.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_default_img_failed.png
|
||||
@@ -658,8 +658,8 @@ C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\dra
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_preview_image_from_local_activity.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_preview_image_from_local_activity.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-ldrtl-xhdpi-v17\\abc_ic_ab_back_mtrl_am_alpha.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-ldrtl-xhdpi-v17\\abc_ic_ab_back_mtrl_am_alpha.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxhdpi-v4\\abc_textfield_activated_mtrl_alpha.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_moon_page_selected.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_moon_page_selected.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_btn_switch_to_on_mtrl_00001.9.png
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable\\abc_tab_indicator_material.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable\\abc_tab_indicator_material.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xhdpi-v4\\abc_textfield_default_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xhdpi-v4\\abc_textfield_default_mtrl_alpha.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_message_fragment.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\layout\\nim_message_fragment.xml
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
@@ -1533,7 +1533,7 @@
|
||||
</attr><attr format="reference|boolean" name="ptrShowIndicator"/><attr format="reference" name="ptrDrawable"/><attr format="reference" name="ptrDrawableStart"/><attr format="reference" name="ptrDrawableEnd"/><attr format="reference|boolean" name="ptrOverScroll"/><attr name="ptrAnimationStyle">
|
||||
<flag name="rotate" value="0x0"/>
|
||||
<flag name="flip" value="0x1"/>
|
||||
</attr><attr format="reference|boolean" name="ptrScrollingWhileRefreshingEnabled"/><attr format="reference|boolean" name="ptrListViewExtrasEnabled"/><attr format="reference|boolean" name="ptrRotateDrawableWhilePulling"/><attr format="reference|color" name="ptrAdapterViewBackground"/><attr format="reference" name="ptrDrawableTop"/><attr format="reference" name="ptrDrawableBottom"/></declare-styleable><string name="team_invite">邀请他人权限</string><string name="team_invite_members_success">群成员邀请已发出</string><color name="split_line_grey_color_d9d9d9">#D9D9D9</color><string name="remove_member_failed">移除成员失败</string><dimen name="bubble_padding_bottom">12dip</dimen><item name="drag_handle" type="id"/><string name="gallery_invalid">你的手机没有图库程序</string><string name="repeat_download_message">重新下载?</string><string name="unknow_size">未知大小</string><color name="color_blue_0888ff">#0888ff</color><color name="color_yellow_796413">#796413</color><string name="delete_has_blank">删 除</string><string name="reach_team_member_capacity">成员数量不能超过%1$d</string><style name="horizontal_light_thin_divider">
|
||||
</attr><attr format="reference|boolean" name="ptrScrollingWhileRefreshingEnabled"/><attr format="reference|boolean" name="ptrListViewExtrasEnabled"/><attr format="reference|boolean" name="ptrRotateDrawableWhilePulling"/><attr format="reference|color" name="ptrAdapterViewBackground"/><attr format="reference" name="ptrDrawableTop"/><attr format="reference" name="ptrDrawableBottom"/></declare-styleable><string name="team_invite">邀请他人权限</string><string name="team_invite_members_success">群成员邀请已发出</string><color name="split_line_grey_color_d9d9d9">#D9D9D9</color><string name="remove_member_failed">移除成员失败</string><dimen name="bubble_padding_bottom">12dip</dimen><item name="drag_handle" type="id"/><string name="gallery_invalid">你的手机没有图库程序</string><string name="repeat_download_message">重新下载?</string><string name="unknow_size">未知大小</string><color name="color_blue_0888ff">#a6d4f2</color><color name="color_yellow_796413">#796413</color><string name="delete_has_blank">删 除</string><string name="reach_team_member_capacity">成员数量不能超过%1$d</string><style name="horizontal_light_thin_divider">
|
||||
<item name="android:layout_height">2px</item>
|
||||
<item name="android:layout_width">fill_parent</item>
|
||||
<item name="android:background">@color/color_gray_d9d9d9</item>
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Tue Oct 16 02:51:27 CST 2018
|
||||
#Wed Nov 21 18:56:09 CST 2018
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-xxhdpi-v4\\abc_spinner_mtrl_am_alpha.9.png
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_popup_menu_item_selector.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable\\nim_popup_menu_item_selector.xml
|
||||
C\:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_cab_background_top_mtrl_alpha.9.png
|
||||
|
||||
+1
-1
@@ -106,7 +106,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
File diff suppressed because one or more lines are too long
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Tue Oct 16 02:51:28 CST 2018
|
||||
#Wed Nov 21 18:56:10 CST 2018
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_portrait_mask_square.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_portrait_mask_square.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\layout\\nim_recent_contacts.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_recent_contacts.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_message_view_bottom.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_message_view_bottom.xml
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
File diff suppressed because one or more lines are too long
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Tue Oct 16 02:51:17 CST 2018
|
||||
#Wed Nov 21 18:55:57 CST 2018
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_portrait_mask_square.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_portrait_mask_square.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\layout\\nim_recent_contacts.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\layout\\nim_recent_contacts.xml
|
||||
C\:\\beifen\\ifish\\ifish\\uikit\\src\\main\\res\\drawable\\nim_message_view_bottom.xml=C\:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_message_view_bottom.xml
|
||||
|
||||
+1
-1
@@ -76,7 +76,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -106,7 +106,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
@@ -106,7 +106,7 @@
|
||||
<color name="color_black_ff333333">#ff333333</color>
|
||||
<color name="color_black_ff666666">#ff666666</color>
|
||||
<color name="color_black_ff999999">#ff999999</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="color_gray_bfc2c5">#bfc2c5</color>
|
||||
<color name="color_gray_cbd0d8">#cbd0d8</color>
|
||||
<color name="color_gray_d9d9d9">#d9d9d9</color>
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+26
-34
@@ -1,15 +1,7 @@
|
||||
package com.netease.nim.uikit.recent.viewholder;
|
||||
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.netease.nim.uikit.NimUIKit;
|
||||
import com.netease.nim.uikit.common.util.sys.TimeUtil;
|
||||
import com.netease.nim.uikit.session.helper.TeamNotificationHelper;
|
||||
import com.netease.nimlib.sdk.NIMClient;
|
||||
import com.netease.nimlib.sdk.RequestCallback;
|
||||
import com.netease.nimlib.sdk.avchat.constant.AVChatRecordState;
|
||||
import com.netease.nimlib.sdk.avchat.constant.AVChatType;
|
||||
import com.netease.nimlib.sdk.avchat.model.AVChatAttachment;
|
||||
import com.netease.nimlib.sdk.msg.MsgService;
|
||||
import com.netease.nimlib.sdk.msg.attachment.MsgAttachment;
|
||||
import com.netease.nimlib.sdk.msg.attachment.NotificationAttachment;
|
||||
@@ -84,32 +76,32 @@ public class CommonRecentViewHolder extends RecentViewHolder {
|
||||
recent.getFromAccount(),
|
||||
(NotificationAttachment) recent.getAttachment());
|
||||
case avchat:
|
||||
AVChatAttachment avchat = (AVChatAttachment) attachment;
|
||||
if (avchat.getState() == AVChatRecordState.Missed && !recent.getFromAccount().equals(NimUIKit.getAccount())) {
|
||||
// 未接通话请求
|
||||
StringBuilder sb = new StringBuilder("[未接");
|
||||
if (avchat.getType() == AVChatType.VIDEO) {
|
||||
sb.append("视频电话]");
|
||||
} else {
|
||||
sb.append("音频电话]");
|
||||
}
|
||||
return sb.toString();
|
||||
} else if (avchat.getState() == AVChatRecordState.Success) {
|
||||
StringBuilder sb = new StringBuilder();
|
||||
if (avchat.getType() == AVChatType.VIDEO) {
|
||||
sb.append("[视频电话]: ");
|
||||
} else {
|
||||
sb.append("[音频电话]: ");
|
||||
}
|
||||
sb.append(TimeUtil.secToTime(avchat.getDuration()));
|
||||
return sb.toString();
|
||||
} else {
|
||||
if (avchat.getType() == AVChatType.VIDEO) {
|
||||
return ("[视频电话]");
|
||||
} else {
|
||||
return ("[音频电话]");
|
||||
}
|
||||
}
|
||||
// AVChatAttachment avchat = (AVChatAttachment) attachment;
|
||||
// if (avchat.getState() == AVChatRecordState.Missed && !recent.getFromAccount().equals(NimUIKit.getAccount())) {
|
||||
// // 未接通话请求
|
||||
// StringBuilder sb = new StringBuilder("[未接");
|
||||
// if (avchat.getType() == AVChatType.VIDEO) {
|
||||
// sb.append("视频电话]");
|
||||
// } else {
|
||||
// sb.append("音频电话]");
|
||||
// }
|
||||
// return sb.toString();
|
||||
// } else if (avchat.getState() == AVChatRecordState.Success) {
|
||||
// StringBuilder sb = new StringBuilder();
|
||||
// if (avchat.getType() == AVChatType.VIDEO) {
|
||||
// sb.append("[视频电话]: ");
|
||||
// } else {
|
||||
// sb.append("[音频电话]: ");
|
||||
// }
|
||||
// sb.append(TimeUtil.secToTime(avchat.getDuration()));
|
||||
// return sb.toString();
|
||||
// } else {
|
||||
// if (avchat.getType() == AVChatType.VIDEO) {
|
||||
// return ("[视频电话]");
|
||||
// } else {
|
||||
// return ("[音频电话]");
|
||||
// }
|
||||
// }
|
||||
default:
|
||||
return "[自定义消息]";
|
||||
}
|
||||
|
||||
@@ -42,11 +42,9 @@ import com.netease.nimlib.sdk.Observer;
|
||||
import com.netease.nimlib.sdk.RequestCallback;
|
||||
import com.netease.nimlib.sdk.RequestCallbackWrapper;
|
||||
import com.netease.nimlib.sdk.ResponseCode;
|
||||
import com.netease.nimlib.sdk.avchat.model.AVChatAttachment;
|
||||
import com.netease.nimlib.sdk.msg.MessageBuilder;
|
||||
import com.netease.nimlib.sdk.msg.MsgService;
|
||||
import com.netease.nimlib.sdk.msg.MsgServiceObserve;
|
||||
import com.netease.nimlib.sdk.msg.attachment.AudioAttachment;
|
||||
import com.netease.nimlib.sdk.msg.attachment.FileAttachment;
|
||||
import com.netease.nimlib.sdk.msg.constant.AttachStatusEnum;
|
||||
import com.netease.nimlib.sdk.msg.constant.MsgDirectionEnum;
|
||||
@@ -412,10 +410,10 @@ public class MessageListPanel implements TAdapterDelegate {
|
||||
IMMessage item = items.get(index);
|
||||
item.setStatus(message.getStatus());
|
||||
item.setAttachStatus(message.getAttachStatus());
|
||||
if (item.getAttachment() instanceof AVChatAttachment
|
||||
|| item.getAttachment() instanceof AudioAttachment) {
|
||||
item.setAttachment(message.getAttachment());
|
||||
}
|
||||
// if (item.getAttachment() instanceof AVChatAttachment
|
||||
// || item.getAttachment() instanceof AudioAttachment) {
|
||||
// item.setAttachment(message.getAttachment());
|
||||
// }
|
||||
refreshViewHolderByIndex(index);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,7 +29,7 @@
|
||||
<color name="color_grey_555555">#555555</color>
|
||||
<color name="color_green_disable">#a2efe0</color>
|
||||
<color name="color_green_00d3a9">#ff00D3A9</color>
|
||||
<color name="color_blue_0888ff">#0888ff</color>
|
||||
<color name="color_blue_0888ff">#a6d4f2</color>
|
||||
<color name="action_bar_black_title_1f1f1f">#1f1f1f</color>
|
||||
<color name="action_bar_black_title_color">#252525</color>
|
||||
<color name="contact_search_hit">#02d3a9</color>
|
||||
|
||||
+3
-4
@@ -96,16 +96,15 @@
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" exported="" name="design-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-annotations-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="nim-lucene-5.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="universal-image-loader-1.9.5" level="project" />
|
||||
<orderEntry type="library" exported="" name="animated-vector-drawable-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="nim-avchat-5.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="eventbus-2.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="fastjson-1.1.34.android" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-v4-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="recyclerview-v7-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="nim-basesdk-5.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="support-vector-drawable-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="nim-lucene-5.0.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="universal-image-loader-1.9.5" level="project" />
|
||||
<orderEntry type="library" exported="" name="appcompat-v7-23.4.0" level="project" />
|
||||
<orderEntry type="library" exported="" name="org.apache.http.legacy-android-25" level="project" />
|
||||
</component>
|
||||
|
||||
Reference in New Issue
Block a user