睿美四控
This commit is contained in:
@@ -43,14 +43,14 @@
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_video_play_icon.png",
|
||||
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_video_play_icon.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_textfield_search_activated_mtrl_alpha.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_ic_menu_copy_mtrl_am_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_ic_failed.png",
|
||||
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_ic_failed.png"
|
||||
@@ -388,16 +388,16 @@
|
||||
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_video_play_icon_pressed.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png"
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_focused_holo.9.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_list_focused_holo.9.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\nim_dialog_toast_bg.png",
|
||||
"source": "C:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_dialog_toast_bg.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_list_focused_holo.9.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_list_focused_holo.9.png"
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-hdpi-v4\\abc_scrubber_control_to_pressed_mtrl_000.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-hdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
|
||||
|
||||
+4
-4
@@ -15,14 +15,14 @@
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_star_black_16dp.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_ab_back_mtrl_am_alpha.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_ab_back_mtrl_am_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_paste_mtrl_am_alpha.png"
|
||||
},
|
||||
{
|
||||
"merged": "C:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png",
|
||||
"source": "C:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-xxxhdpi-v4\\abc_ic_menu_selectall_mtrl_alpha.png"
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:10:54 CST 2018
|
||||
#Tue Apr 24 16:45:54 CST 2018
|
||||
C\:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-mdpi-v4\\abc_list_focused_holo.9.png=C\:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_list_focused_holo.9.png
|
||||
C\:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png
|
||||
C\:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png=C\:\\ifish\\uikit\\build\\intermediates\\res\\merged\\androidTest\\debug\\drawable-mdpi-v4\\abc_scrubber_primary_mtrl_alpha.9.png
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:10:47 CST 2018
|
||||
#Tue Apr 24 16:45:44 CST 2018
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-hdpi\\nim_dialog_toast_bg.png=C\:\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-hdpi-v4\\nim_dialog_toast_bg.png
|
||||
C\:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-mdpi-v4\\abc_list_focused_holo.9.png=C\:\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_list_focused_holo.9.png
|
||||
C\:\\Users\\Long\\.android\\build-cache\\987cf2337e0fd7a523836038303ff19ff7e22b1c\\output\\res\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png=C\:\\ifish\\uikit\\build\\intermediates\\res\\merged\\debug\\drawable-mdpi-v4\\abc_menu_hardkey_panel_mtrl_mult.9.png
|
||||
|
||||
+2
-2
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:10:50 CST 2018
|
||||
#Tue Apr 24 16:45:48 CST 2018
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-hdpi\\nim_video_play_icon_pressed.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_video_play_icon_pressed.png
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable\\nim_message_item_round_bg.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_message_item_round_bg.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-xhdpi\\nim_team_member_delete_pressed.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_team_member_delete_pressed.png
|
||||
@@ -23,8 +23,8 @@ C\:\\ifish\\uikit\\src\\main\\res\\drawable-xhdpi\\nim_record_start.png=C\:\\ifi
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-hdpi\\nim_moon_page_unselected.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_moon_page_unselected.png
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-xhdpi\\nim_audio_animation_list_right_1.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-xhdpi-v4\\nim_audio_animation_list_right_1.png
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\layout\\nim_actions_item_layout.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_actions_item_layout.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\layout\\nim_round_loading_progress_bar.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_round_loading_progress_bar.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable\\nim_cancel_record_red_bg.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_cancel_record_red_bg.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\layout\\nim_round_loading_progress_bar.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_round_loading_progress_bar.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\layout\\nim_easy_alert_dialog_with_listview.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\layout\\nim_easy_alert_dialog_with_listview.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable\\nim_video_play_icon_selector.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable\\nim_video_play_icon_selector.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-hdpi\\nim_emoji_icon.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\debug\\res\\drawable-hdpi-v4\\nim_emoji_icon.png
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
#Thu Apr 19 19:10:19 CST 2018
|
||||
#Tue Apr 24 16:45:05 CST 2018
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-hdpi\\nim_video_play_icon_pressed.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-hdpi-v4\\nim_video_play_icon_pressed.png
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable\\nim_message_item_round_bg.xml=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable\\nim_message_item_round_bg.xml
|
||||
C\:\\ifish\\uikit\\src\\main\\res\\drawable-xhdpi\\nim_team_member_delete_pressed.png=C\:\\ifish\\uikit\\build\\intermediates\\bundles\\default\\res\\drawable-xhdpi-v4\\nim_team_member_delete_pressed.png
|
||||
|
||||
Reference in New Issue
Block a user