消息图片添加前缀

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"
     }

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"
     }

yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_session_tool_more_normal.imageset/Contents.json

@@ -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
-  }
-}

yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_cancel.imageset/Contents.json

@@ -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
-  }
-}

yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_first.imageset/Contents.json

@@ -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
-  }
-}

yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_second.imageset/Contents.json

@@ -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
-  }
-}

yinmeng-ios/yinmeng-ios/Assets.xcassets/Mew/session/message_tool_audio_record_third.imageset/Contents.json

@@ -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
-  }
-}

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"
     }

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"
     }

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"
     }

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
+  }
+}

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
+  }
+}

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"
     }

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
+  }
+}

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
+  }
+}

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
+  }
+}

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
+  }
+}

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"
     }

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;
     }

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;

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;

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 *firstImage = [UIImage imageNamed:@"mew_message_tool_audio_record_first"];
-		UIImage *secondImage = [UIImage imageNamed:@"message_tool_audio_record_second"];
+		UIImage *secondImage = [UIImage imageNamed:@"mew_message_tool_audio_record_second"];
-		UIImage *thirdImage = [UIImage imageNamed:@"message_tool_audio_record_third"];
+		UIImage *thirdImage = [UIImage imageNamed:@"mew_message_tool_audio_record_third"];
 		_logoImageView.animationImages = @[firstImage, secondImage, thirdImage];
 		_logoImageView.animationDuration = 1;
 		_logoImageView.animationRepeatCount = HUGE;

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:@"mew_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:UIControlStateSelected];
         [_failButton addTarget:self action:@selector(failButtonAction:) forControlEvents:UIControlEventTouchUpInside];
         _failButton.hidden = YES;
     }

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:@"mew_common_nav_back"] forState:UIControlStateNormal];
-        [_backButton setImage:[UIImage imageNamed:@"common_nav_back"] forState:UIControlStateSelected];
+        [_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:@"mew_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:UIControlStateSelected];
         [_reportButton addTarget:self action:@selector(reportButtonAction:) forControlEvents:UIControlEventTouchUpInside];
     }
     return _reportButton;

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:@"mew_message_session_tool_text"] forState:UIControlStateNormal];
-		[_changeButton setImage:[UIImage imageNamed:@"message_session_tool_audio"] forState:UIControlStateSelected];
+		[_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<MessageMenuModel *> *)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];
 	}