diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_back_white_left.imageset/common_back_white_left@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_back_white_left.imageset/common_back_white_left@2x.png deleted file mode 100644 index 9ccecf8..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_back_white_left.imageset/common_back_white_left@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_back_white_left.imageset/common_back_white_left@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_back_white_left.imageset/common_back_white_left@3x.png deleted file mode 100644 index fdf4ecb..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_back_white_left.imageset/common_back_white_left@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_nav_back.imageset/common_nav_back@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_nav_back.imageset/common_nav_back@2x.png deleted file mode 100644 index 0c4829b..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_nav_back.imageset/common_nav_back@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_nav_back.imageset/common_nav_back@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_nav_back.imageset/common_nav_back@3x.png deleted file mode 100644 index 1855eee..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/common_nav_back.imageset/common_nav_back@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_nav_report.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/Contents.json similarity index 70% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_nav_report.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/Contents.json index 59cd74b..e939c6e 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_nav_report.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_nav_report@2x.png", + "filename" : "mew_common_back_white_left@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_nav_report@3x.png", + "filename" : "mew_common_back_white_left@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/mew_common_back_white_left@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/mew_common_back_white_left@2x.png new file mode 100644 index 0000000..004cc6c Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/mew_common_back_white_left@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/mew_common_back_white_left@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/mew_common_back_white_left@3x.png new file mode 100644 index 0000000..0ec8275 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_back_white_left.imageset/mew_common_back_white_left@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/Contents.json similarity index 71% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/Contents.json index 99db0b6..f0b27bb 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_tool_text@2x.png", + "filename" : "mew_common_nav_back@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_tool_text@3x.png", + "filename" : "mew_common_nav_back@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/mew_common_nav_back@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/mew_common_nav_back@2x.png new file mode 100644 index 0000000..586a822 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/mew_common_nav_back@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/mew_common_nav_back@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/mew_common_nav_back@3x.png new file mode 100644 index 0000000..d84cc5f Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Common/mew_common_nav_back.imageset/mew_common_nav_back@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/Session_Message_Game_InfoView_arrow.imageset/Session_Message_Game_InfoView_arrow@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/Session_Message_Game_InfoView_arrow.imageset/Session_Message_Game_InfoView_arrow@2x.png deleted file mode 100644 index 5aaa608..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/Session_Message_Game_InfoView_arrow.imageset/Session_Message_Game_InfoView_arrow@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/Session_Message_Game_InfoView_arrow.imageset/Session_Message_Game_InfoView_arrow@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/Session_Message_Game_InfoView_arrow.imageset/Session_Message_Game_InfoView_arrow@3x.png deleted file mode 100644 index 111bb9d..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/Session_Message_Game_InfoView_arrow.imageset/Session_Message_Game_InfoView_arrow@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_first.imageset/message_content_audio_playing_first@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_first.imageset/message_content_audio_playing_first@2x.png deleted file mode 100644 index ec4fff3..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_first.imageset/message_content_audio_playing_first@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_first.imageset/message_content_audio_playing_first@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_first.imageset/message_content_audio_playing_first@3x.png deleted file mode 100644 index 8e9a468..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_first.imageset/message_content_audio_playing_first@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_second.imageset/message_content_audio_playing_second@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_second.imageset/message_content_audio_playing_second@2x.png deleted file mode 100644 index 8768677..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_second.imageset/message_content_audio_playing_second@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_second.imageset/message_content_audio_playing_second@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_second.imageset/message_content_audio_playing_second@3x.png deleted file mode 100644 index f2a4fd1..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_second.imageset/message_content_audio_playing_second@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_third.imageset/message_content_audio_playing_third@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_third.imageset/message_content_audio_playing_third@2x.png deleted file mode 100644 index 5d9d85f..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_third.imageset/message_content_audio_playing_third@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_third.imageset/message_content_audio_playing_third@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_third.imageset/message_content_audio_playing_third@3x.png deleted file mode 100644 index f1a0db5..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_audio_playing_third.imageset/message_content_audio_playing_third@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_charm.imageset/message_content_upgrade_charm@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_charm.imageset/message_content_upgrade_charm@2x.png deleted file mode 100644 index 1f20a02..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_charm.imageset/message_content_upgrade_charm@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_charm.imageset/message_content_upgrade_charm@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_charm.imageset/message_content_upgrade_charm@3x.png deleted file mode 100644 index f281ebf..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_charm.imageset/message_content_upgrade_charm@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_expre.imageset/message_content_upgrade_expre@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_expre.imageset/message_content_upgrade_expre@2x.png deleted file mode 100644 index e456a2a..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_expre.imageset/message_content_upgrade_expre@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_expre.imageset/message_content_upgrade_expre@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_expre.imageset/message_content_upgrade_expre@3x.png deleted file mode 100644 index f00ef34..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_content_upgrade_expre.imageset/message_content_upgrade_expre@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/message_session_download_fail@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/message_session_download_fail@2x.png deleted file mode 100644 index 6e0d6cf..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/message_session_download_fail@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/message_session_download_fail@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/message_session_download_fail@3x.png deleted file mode 100644 index 00ff77b..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/message_session_download_fail@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/message_session_find_new_filtrate@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/message_session_find_new_filtrate@2x.png deleted file mode 100644 index 250a3a1..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/message_session_find_new_filtrate@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/message_session_find_new_filtrate@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/message_session_find_new_filtrate@3x.png deleted file mode 100644 index 2300a50..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/message_session_find_new_filtrate@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/message_session_game_Invite_bg@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/message_session_game_Invite_bg@2x.png deleted file mode 100644 index 4ea881f..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/message_session_game_Invite_bg@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/message_session_game_Invite_bg@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/message_session_game_Invite_bg@3x.png deleted file mode 100644 index 3effb65..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/message_session_game_Invite_bg@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_gift.imageset/message_session_menu_gift@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_gift.imageset/message_session_menu_gift@2x.png deleted file mode 100644 index 4aa182f..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_gift.imageset/message_session_menu_gift@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_gift.imageset/message_session_menu_gift@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_gift.imageset/message_session_menu_gift@3x.png deleted file mode 100644 index be62ed0..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_gift.imageset/message_session_menu_gift@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/message_session_menu_photo@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/message_session_menu_photo@2x.png deleted file mode 100644 index 79b7c6d..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/message_session_menu_photo@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/message_session_menu_photo@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/message_session_menu_photo@3x.png deleted file mode 100644 index 304f6e0..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/message_session_menu_photo@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_nav_report.imageset/message_session_nav_report@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_nav_report.imageset/message_session_nav_report@3x.png deleted file mode 100644 index 8c3ef80..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_nav_report.imageset/message_session_nav_report@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/message_session_tool_audio@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/message_session_tool_audio@2x.png deleted file mode 100644 index 9f9cce1..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/message_session_tool_audio@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/message_session_tool_audio@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/message_session_tool_audio@3x.png deleted file mode 100644 index 2000cee..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/message_session_tool_audio@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/Contents.json deleted file mode 100644 index fca1bed..0000000 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "message_session_tool_more_normal@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "message_session_tool_more_normal@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/message_session_tool_more_normal@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/message_session_tool_more_normal@2x.png deleted file mode 100644 index 0156946..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/message_session_tool_more_normal@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/message_session_tool_more_normal@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/message_session_tool_more_normal@3x.png deleted file mode 100644 index 8b25bb5..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/message_session_tool_more_normal@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/message_session_tool_text@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/message_session_tool_text@2x.png deleted file mode 100644 index a84cc5c..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/message_session_tool_text@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/message_session_tool_text@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/message_session_tool_text@3x.png deleted file mode 100644 index ab5e488..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_text.imageset/message_session_tool_text@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/Contents.json deleted file mode 100644 index 1411ebd..0000000 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "message_tool_audio_record_cancel@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "message_tool_audio_record_cancel@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/message_tool_audio_record_cancel@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/message_tool_audio_record_cancel@2x.png deleted file mode 100644 index 2c3cc12..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/message_tool_audio_record_cancel@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/message_tool_audio_record_cancel@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/message_tool_audio_record_cancel@3x.png deleted file mode 100644 index 66e3656..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/message_tool_audio_record_cancel@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/Contents.json deleted file mode 100644 index 9d755c4..0000000 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "message_tool_audio_record_first@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "message_tool_audio_record_first@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/message_tool_audio_record_first@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/message_tool_audio_record_first@2x.png deleted file mode 100644 index 0d7d0fa..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/message_tool_audio_record_first@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/message_tool_audio_record_first@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/message_tool_audio_record_first@3x.png deleted file mode 100644 index 748ac52..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/message_tool_audio_record_first@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/Contents.json deleted file mode 100644 index 3dfe592..0000000 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "message_tool_audio_record_second@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "message_tool_audio_record_second@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/message_tool_audio_record_second@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/message_tool_audio_record_second@2x.png deleted file mode 100644 index a0030e7..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/message_tool_audio_record_second@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/message_tool_audio_record_second@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/message_tool_audio_record_second@3x.png deleted file mode 100644 index 2a9a0b5..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/message_tool_audio_record_second@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/Contents.json deleted file mode 100644 index 1b04713..0000000 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "filename" : "message_tool_audio_record_third@2x.png", - "idiom" : "universal", - "scale" : "2x" - }, - { - "filename" : "message_tool_audio_record_third@3x.png", - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/message_tool_audio_record_third@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/message_tool_audio_record_third@2x.png deleted file mode 100644 index 0193645..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/message_tool_audio_record_third@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/message_tool_audio_record_third@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/message_tool_audio_record_third@3x.png deleted file mode 100644 index c94e48a..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/message_tool_audio_record_third@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/Contents.json similarity index 68% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/Contents.json index b01c2cb..84346d6 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_find_new_filtrate.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_find_new_filtrate@2x.png", + "filename" : "mew_message_session_download_fail@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_find_new_filtrate@3x.png", + "filename" : "mew_message_session_download_fail@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/mew_message_session_download_fail@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/mew_message_session_download_fail@2x.png new file mode 100644 index 0000000..cfb96d5 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/mew_message_session_download_fail@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/mew_message_session_download_fail@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/mew_message_session_download_fail@3x.png new file mode 100644 index 0000000..2a4a2e9 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_download_fail.imageset/mew_message_session_download_fail@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/Contents.json similarity index 69% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/Contents.json index 1cf480f..9d1d33e 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_game_Invite_bg.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_game_Invite_bg@2x.png", + "filename" : "mew_message_session_menu_photo@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_game_Invite_bg@3x.png", + "filename" : "mew_message_session_menu_photo@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/mew_message_session_menu_photo@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/mew_message_session_menu_photo@2x.png new file mode 100644 index 0000000..9c6f340 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/mew_message_session_menu_photo@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/mew_message_session_menu_photo@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/mew_message_session_menu_photo@3x.png new file mode 100644 index 0000000..9f81f21 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_menu_photo.imageset/mew_message_session_menu_photo@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/Contents.json similarity index 69% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/Contents.json index a1be4eb..de33771 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_menu_photo.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_menu_photo@2x.png", + "filename" : "mew_message_session_nav_report@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_menu_photo@3x.png", + "filename" : "mew_message_session_nav_report@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/mew_message_session_nav_report@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/mew_message_session_nav_report@2x.png new file mode 100644 index 0000000..af2e68f Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/mew_message_session_nav_report@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/mew_message_session_nav_report@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/mew_message_session_nav_report@3x.png new file mode 100644 index 0000000..1506551 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_nav_report.imageset/mew_message_session_nav_report@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/Contents.json new file mode 100644 index 0000000..ba29fa5 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_message_session_tool_audio@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_message_session_tool_audio@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/mew_message_session_tool_audio@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/mew_message_session_tool_audio@2x.png new file mode 100644 index 0000000..f816180 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/mew_message_session_tool_audio@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/mew_message_session_tool_audio@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/mew_message_session_tool_audio@3x.png new file mode 100644 index 0000000..03ea61f Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_audio.imageset/mew_message_session_tool_audio@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/Contents.json new file mode 100644 index 0000000..a09834a --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_message_session_tool_more_normal@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_message_session_tool_more_normal@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/mew_message_session_tool_more_normal@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/mew_message_session_tool_more_normal@2x.png new file mode 100644 index 0000000..37677fa Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/mew_message_session_tool_more_normal@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/mew_message_session_tool_more_normal@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/mew_message_session_tool_more_normal@3x.png new file mode 100644 index 0000000..690aa3d Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_more_normal.imageset/mew_message_session_tool_more_normal@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/Contents.json similarity index 69% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/Contents.json index 5323689..dd44211 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_download_fail.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_download_fail@2x.png", + "filename" : "mew_message_session_tool_text@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_download_fail@3x.png", + "filename" : "mew_message_session_tool_text@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/mew_message_session_tool_text@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/mew_message_session_tool_text@2x.png new file mode 100644 index 0000000..249f0b6 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/mew_message_session_tool_text@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/mew_message_session_tool_text@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/mew_message_session_tool_text@3x.png new file mode 100644 index 0000000..b780d0d Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_session_tool_text.imageset/mew_message_session_tool_text@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/Contents.json new file mode 100644 index 0000000..5802837 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_message_tool_audio_record_cancel@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_message_tool_audio_record_cancel@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/mew_message_tool_audio_record_cancel@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/mew_message_tool_audio_record_cancel@2x.png new file mode 100644 index 0000000..e31e8ac Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/mew_message_tool_audio_record_cancel@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/mew_message_tool_audio_record_cancel@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/mew_message_tool_audio_record_cancel@3x.png new file mode 100644 index 0000000..2cc341c Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_cancel.imageset/mew_message_tool_audio_record_cancel@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/Contents.json new file mode 100644 index 0000000..dee7dbe --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_message_tool_audio_record_first@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_message_tool_audio_record_first@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/mew_message_tool_audio_record_first@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/mew_message_tool_audio_record_first@2x.png new file mode 100644 index 0000000..8f3f619 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/mew_message_tool_audio_record_first@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/mew_message_tool_audio_record_first@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/mew_message_tool_audio_record_first@3x.png new file mode 100644 index 0000000..3c0a7b9 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_first.imageset/mew_message_tool_audio_record_first@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/Contents.json new file mode 100644 index 0000000..7b62de0 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_message_tool_audio_record_second@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_message_tool_audio_record_second@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/mew_message_tool_audio_record_second@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/mew_message_tool_audio_record_second@2x.png new file mode 100644 index 0000000..8204f75 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/mew_message_tool_audio_record_second@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/mew_message_tool_audio_record_second@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/mew_message_tool_audio_record_second@3x.png new file mode 100644 index 0000000..d023e06 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_second.imageset/mew_message_tool_audio_record_second@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/Contents.json new file mode 100644 index 0000000..d601939 --- /dev/null +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/Contents.json @@ -0,0 +1,22 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "mew_message_tool_audio_record_third@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "mew_message_tool_audio_record_third@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/mew_message_tool_audio_record_third@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/mew_message_tool_audio_record_third@2x.png new file mode 100644 index 0000000..12186c4 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/mew_message_tool_audio_record_third@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/mew_message_tool_audio_record_third@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/mew_message_tool_audio_record_third@3x.png new file mode 100644 index 0000000..2f6a5c2 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_message_tool_audio_record_third.imageset/mew_message_tool_audio_record_third@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/Contents.json b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/Contents.json similarity index 70% rename from yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/Contents.json rename to yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/Contents.json index 35e29e0..deae7c6 100644 --- a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_audio.imageset/Contents.json +++ b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/Contents.json @@ -5,12 +5,12 @@ "scale" : "1x" }, { - "filename" : "message_session_tool_audio@2x.png", + "filename" : "mew_session_list_clean@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "message_session_tool_audio@3x.png", + "filename" : "mew_session_list_clean@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/mew_session_list_clean@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/mew_session_list_clean@2x.png new file mode 100644 index 0000000..0bc4047 Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/mew_session_list_clean@2x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/mew_session_list_clean@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/mew_session_list_clean@3x.png new file mode 100644 index 0000000..791f97e Binary files /dev/null and b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/mew_session_list_clean.imageset/mew_session_list_clean@3x.png differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/session_list_clean.imageset/session_list_clean@2x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/session_list_clean.imageset/session_list_clean@2x.png deleted file mode 100644 index f065f5f..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/session_list_clean.imageset/session_list_clean@2x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/session_list_clean.imageset/session_list_clean@3x.png b/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/session_list_clean.imageset/session_list_clean@3x.png deleted file mode 100644 index d4aa8a1..0000000 Binary files a/yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/session_list_clean.imageset/session_list_clean@3x.png and /dev/null differ diff --git a/yinmeng-ios/yinmeng-ios/Base/UI/BaseNavigationController.m b/yinmeng-ios/yinmeng-ios/Base/UI/BaseNavigationController.m index efa8f8a..7bccac3 100644 --- a/yinmeng-ios/yinmeng-ios/Base/UI/BaseNavigationController.m +++ b/yinmeng-ios/yinmeng-ios/Base/UI/BaseNavigationController.m @@ -26,7 +26,7 @@ if(self.topViewController == viewController) return; if (self.childViewControllers.count > 0) { viewController.hidesBottomBarWhenPushed = YES; - UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"common_nav_back"] style:UIBarButtonItemStyleDone target:self action:@selector(backClick)]; + UIBarButtonItem *leftBarButtonItem = [[UIBarButtonItem alloc] initWithImage:[UIImage imageNamed:@"mew_common_nav_back"] style:UIBarButtonItemStyleDone target:self action:@selector(backClick)]; leftBarButtonItem.tintColor = [ThemeColor mainTextColor]; viewController.navigationItem.leftBarButtonItem = leftBarButtonItem; } diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.m index 3ffb08d..874ad3c 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Message/View/SessionList/MewSessionListViewController.m @@ -307,7 +307,7 @@ - (UIButton *)cleanMessageButton { if (!_cleanMessageButton) { _cleanMessageButton = [[UIButton alloc] init]; - [_cleanMessageButton setBackgroundImage:kImage(@"session_list_clean") forState:UIControlStateNormal]; + [_cleanMessageButton setBackgroundImage:kImage(@"mew_session_list_clean") forState:UIControlStateNormal]; [_cleanMessageButton addTarget:self action:@selector(cleanMessageButtonAction) forControlEvents:UIControlEventTouchUpInside]; } return _cleanMessageButton; diff --git a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m index 253dabb..51d7368 100644 --- a/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m +++ b/yinmeng-ios/yinmeng-ios/Main/Mew/Mine/View/MewRechargeViewController.m @@ -72,7 +72,7 @@ - (UIButton *)backButton { if (!_backButton) { _backButton = [[UIButton alloc] init]; - [_backButton setImage:[UIImage imageNamed:@"common_back_white_left"] forState:UIControlStateNormal]; + [_backButton setImage:[UIImage imageNamed:@"mew_common_back_white_left"] forState:UIControlStateNormal]; [_backButton addTarget:self action:@selector(backButtonAction) forControlEvents:UIControlEventTouchUpInside]; } return _backButton; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionAudioRecordView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionAudioRecordView.m index dd9d4d7..2f2a7ec 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionAudioRecordView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionAudioRecordView.m @@ -114,9 +114,9 @@ if (!_logoImageView) { _logoImageView = [[UIImageView alloc] init]; _logoImageView.userInteractionEnabled = YES; - UIImage *firstImage = [UIImage imageNamed:@"message_tool_audio_record_first"]; - UIImage *secondImage = [UIImage imageNamed:@"message_tool_audio_record_second"]; - UIImage *thirdImage = [UIImage imageNamed:@"message_tool_audio_record_third"]; + UIImage *firstImage = [UIImage imageNamed:@"mew_message_tool_audio_record_first"]; + UIImage *secondImage = [UIImage imageNamed:@"mew_message_tool_audio_record_second"]; + UIImage *thirdImage = [UIImage imageNamed:@"mew_message_tool_audio_record_third"]; _logoImageView.animationImages = @[firstImage, secondImage, thirdImage]; _logoImageView.animationDuration = 1; _logoImageView.animationRepeatCount = HUGE; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionMessageCell.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionMessageCell.m index b08ded8..c73a538 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionMessageCell.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionMessageCell.m @@ -323,8 +323,8 @@ - (UIButton *)failButton { if (!_failButton) { _failButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_failButton setImage:[UIImage imageNamed:@"message_session_download_fail"] forState:UIControlStateNormal]; - [_failButton setImage:[UIImage imageNamed:@"message_session_download_fail"] forState:UIControlStateSelected]; + [_failButton setImage:[UIImage imageNamed:@"mew_message_session_download_fail"] forState:UIControlStateNormal]; + [_failButton setImage:[UIImage imageNamed:@"mew_message_session_download_fail"] forState:UIControlStateSelected]; [_failButton addTarget:self action:@selector(failButtonAction:) forControlEvents:UIControlEventTouchUpInside]; _failButton.hidden = YES; } diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m index 370fcef..b259872 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionNavView.m @@ -122,8 +122,8 @@ - (UIButton *)backButton { if (!_backButton) { _backButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateNormal]; - [_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateSelected]; + [_backButton setImage:[UIImage imageNamed:@"mew_common_nav_back"] forState:UIControlStateNormal]; + [_backButton setImage:[UIImage imageNamed:@"mew_common_nav_back"] forState:UIControlStateSelected]; [_backButton addTarget:self action:@selector(backButtonAction:) forControlEvents:UIControlEventTouchUpInside]; // [_backButton setEnlargeEdgeWithTop:10 right:10 bottom:10 left:10]; } @@ -159,8 +159,8 @@ - (UIButton *)reportButton { if (!_reportButton) { _reportButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_reportButton setImage:[UIImage imageNamed:@"message_session_nav_report"] forState:UIControlStateNormal]; - [_reportButton setImage:[UIImage imageNamed:@"message_session_nav_report"] forState:UIControlStateSelected]; + [_reportButton setImage:[UIImage imageNamed:@"mew_message_session_nav_report"] forState:UIControlStateNormal]; + [_reportButton setImage:[UIImage imageNamed:@"mew_message_session_nav_report"] forState:UIControlStateSelected]; [_reportButton addTarget:self action:@selector(reportButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _reportButton; diff --git a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionToolbarView.m b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionToolbarView.m index 3f4caa2..7e76fbf 100644 --- a/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionToolbarView.m +++ b/yinmeng-ios/yinmeng-ios/Main/YinMeng/Message/View/Session/SessionToolbarView.m @@ -296,7 +296,7 @@ [self.audioRecordView mas_makeConstraints:^(MASConstraintMaker *make) { make.center.mas_equalTo(self.audioRecordView.superview); }]; - [self.audioRecordView configAudioRecord:@"message_tool_audio_record_first" title:@"手指上滑，取消发送" isAnimation:YES]; + [self.audioRecordView configAudioRecord:@"mew_message_tool_audio_record_first" title:@"手指上滑，取消发送" isAnimation:YES]; [self.audioRecordView beginAudioRecord]; } @@ -318,12 +318,12 @@ - (void)audioTouchDragEnterAction { ///手指上滑 取消发送 - [self.audioRecordView configAudioRecord:@"message_tool_audio_record_first" title:@"手指上滑，取消发送" isAnimation:YES]; + [self.audioRecordView configAudioRecord:@"mew_message_tool_audio_record_first" title:@"手指上滑，取消发送" isAnimation:YES]; } - (void)audioTouchDragExitAction { ///松开手指 取消发送 - [self.audioRecordView configAudioRecord:@"message_tool_audio_record_cancel" title:@"松开手指 取消发送" isAnimation:NO]; + [self.audioRecordView configAudioRecord:@"mew_message_tool_audio_record_cancel" title:@"松开手指 取消发送" isAnimation:NO]; } #pragma mark - Getters And Setters @@ -364,8 +364,8 @@ - (UIButton *)changeButton { if (!_changeButton) { _changeButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_changeButton setImage:[UIImage imageNamed:@"message_session_tool_text"] forState:UIControlStateNormal]; - [_changeButton setImage:[UIImage imageNamed:@"message_session_tool_audio"] forState:UIControlStateSelected]; + [_changeButton setImage:[UIImage imageNamed:@"mew_message_session_tool_text"] forState:UIControlStateNormal]; + [_changeButton setImage:[UIImage imageNamed:@"mew_message_session_tool_audio"] forState:UIControlStateSelected]; [_changeButton addTarget:self action:@selector(changeButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } return _changeButton; @@ -426,7 +426,7 @@ - (UIButton *)moreButton { if (!_moreButton) { _moreButton = [UIButton buttonWithType:UIButtonTypeCustom]; - [_moreButton setImage:[UIImage imageNamed:@"message_session_tool_more_normal"] forState:UIControlStateNormal]; + [_moreButton setImage:[UIImage imageNamed:@"mew_message_session_tool_more_normal"] forState:UIControlStateNormal]; [_moreButton setImage:[UIImage imageNamed:@"message_session_tool_more_select"] forState:UIControlStateSelected]; [_moreButton addTarget:self action:@selector(moreButtonAction:) forControlEvents:UIControlEventTouchUpInside]; } @@ -461,12 +461,10 @@ - (NSArray *)menuList { if (!_menuList) { MessageMenuModel * phototModel = [[MessageMenuModel alloc] init]; - phototModel.imageName = @"message_session_menu_photo"; + phototModel.imageName = @"mew_message_session_menu_photo"; phototModel.type= MessageMenuType_Photo; - MessageMenuModel * giftModel = [[MessageMenuModel alloc] init]; - giftModel.imageName = @"message_session_menu_gift"; - giftModel.type= MessageMenuType_Gift; + _menuList = @[phototModel]; }