瀏覽代碼

聊天屏蔽UI 逻辑 暂时提交

yanxuyao 1 年之前
父節點
當前提交
6bda5229ec

二進制
MiMoLive/MiMoLive.xcworkspace/xcuserdata/yanxuyao.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 1
MiMoLive/MiMoLive/Classes/Infomation/MOChatViewController.m

@@ -167,7 +167,6 @@
             NSLog(@"%@",[[NSString alloc] initWithData:[NSJSONSerialization dataWithJSONObject:data options:0 error:nil] encoding:NSUTF8StringEncoding]);
             weakSelf.userSetData = [MOUserSetBaseData modelObjectWithDictionary:data[@"data"]];
             weakSelf.userData.blacklist = weakSelf.userSetData.userSetData.result;
-            [MOChatHttpManage shareManager].canSend = weakSelf.userSetData.canSend;
             [weakSelf updateViewUI];
         }
         else{
@@ -179,6 +178,8 @@
 
 - (void)updateViewUI{
     
+    [MOChatHttpManage shareManager].canSend = self.userSetData.canSend;
+    
     self.chatController.direction = self.userSetData.userSetData.direction;
     self.chatController.isBlackUser = self.userData.blacklist;
     self.chatController.canSend = self.userSetData.canSend;

+ 3 - 0
MiMoLive/Pods/EaseIMKit/EaseIMKit/EaseIMKit/Classes/Chat/EaseChatViewController.h

@@ -37,6 +37,9 @@ typedef void (^AsyncRequestBlock)(void (^httpBlock)(BOOL result));
 // 用来执行外部异步请求的 Block
 @property (nonatomic, copy) AsyncRequestBlock externalRequestBlock;
 
+/// 收起编辑器
+- (void)overTheEdit;
+
 + (EaseChatViewController *)initWithConversationId:(NSString *)aConversationId
                       conversationType:(EMConversationType)aType
                                      chatViewModel:(EaseChatViewModel *)aModel;

+ 11 - 1
MiMoLive/Pods/EaseIMKit/EaseIMKit/EaseIMKit/Classes/Chat/EaseChatViewController.m

@@ -650,7 +650,7 @@
     if ([extMenuArray count] <= 0) {
         return;
     }
-    if(self.isBlackUser){
+    if(self.isBlackUser || !self.canSend){
         return;
     }
 
@@ -1001,10 +1001,20 @@
                 EMTextMessageBody *body = [[EMTextMessageBody alloc] initWithText:aText];
                 [weakSelf sendMessageWithBody:body ext:aExt];
             }
+            else{
+                [weakSelf overTheEdit];
+            }
         });
     }
 }
 
+- (void)overTheEdit{
+    [self.view endEditing:YES];
+    [self.chatBar clearMoreViewAndSelectedButton];
+    [self hideLongPressView];
+    [self scrollToBottomRow];
+}
+
 #pragma mark - Data
 
 - (NSArray *)formatMessages:(NSArray<EMChatMessage *> *)aMessages