This commit is contained in:
Long-PC\Long
2019-04-25 21:00:10 +08:00
parent 5f619f30f8
commit 834a5daba1
213 changed files with 8044 additions and 6407 deletions
@@ -539,14 +539,14 @@
"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_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"
},
{
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_messages_list_empty_bg.png",
"source": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_messages_list_empty_bg.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"
},
{
"merged": "C:\\beifen\\ifish\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_star_half_black_16dp.png",
"source": "C:\\Users\\Administrator\\.android\\build-cache\\11982d809c03cd8a7be9921cf899c01db787b380\\output\\res\\drawable-hdpi-v4\\abc_ic_star_half_black_16dp.png"
@@ -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_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_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_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"
@@ -1,4 +1,4 @@
#Tue Apr 16 01:31:57 CST 2019
#Thu Apr 25 20:52:21 CST 2019
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
@@ -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\:\\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\:\\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\\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
@@ -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\:\\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-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\:\\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
@@ -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\\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\:\\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\:\\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
@@ -1,4 +1,4 @@
#Tue Apr 16 01:31:56 CST 2019
#Thu Apr 25 20:52:18 CST 2019
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,4 +1,4 @@
#Tue Apr 16 01:31:56 CST 2019
#Thu Apr 25 20:52:19 CST 2019
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,4 +1,4 @@
#Tue Apr 16 01:31:49 CST 2019
#Thu Apr 25 20:52:07 CST 2019
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
Binary file not shown.
Binary file not shown.