提交更改

梁星国
1 parent 04f9bf29
Showing 4 changed files with 52 additions and 22 deletions
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/Controller/CNLiveBOrganizationValidattionController.m
CNLiveOrganizationValidationModule/Classes/CNLiveOrganizationValidationModule/View/CNLiveBOrganizationDetailCell.m
Example/CNLiveOrganizationValidationModule/CNLIVEBAppDelegate.m
Example/CNLiveOrganizationValidationModule/CNLIVEBViewController.m
@@ -209,6 +209,13 @@
     if (!textField) {
         return;
     }
+    
+    NSLog(@"没有过滤前输入的字符串===%@",textField.text);
+    NSString *filterString = [self disableEmoji:textField.text];
+    NSLog(@"过滤Emoji表情后的字符串===%@",filterString);
+    textField.text = filterString;
+    
+    
     CNLiveBOrganizationTextField *TF = (CNLiveBOrganizationTextField *)textField;
  
     if (TF.tfIndexPath) {
@@ -281,14 +288,35 @@
     if (!textView) {
         return;
     }
+    
+    NSLog(@"没有过滤前输入的字符串===%@",textView.text);
+    NSString *filterString = [self disableEmoji:textView.text];
+    NSLog(@"过滤Emoji表情后的字符串===%@",filterString);
+    textView.text = filterString;
+
     CNLiveBOrganizationTextView *TV = (CNLiveBOrganizationTextView *)textView;
     if (TV.tvIndexPath) {
         if (TV.tvIndexPath.row == 4) {
             self.companyContent = [NSString stringWithFormat:@"%@",TV.text ? TV.text : @""];
         }
     }
+
  
-    
+}
+
+
+/**
+ *  正则过滤表情
+ */
+- (NSString *)disableEmoji:(NSString *)text
+{
+    if (!text.length) return text;
+    NSRegularExpression *regex = [NSRegularExpression regularExpressionWithPattern:@"[^\\u0020-\\u007E\\u00A0-\\u00BE\\u2E80-\\uA4CF\\uF900-\\uFAFF\\uFE30-\\uFE4F\\uFF00-\\uFFEF\\u0080-\\u009F\\u2000-\\u201f\r\n]" options:NSRegularExpressionCaseInsensitive error:nil];
+    NSString *modifiedString = [regex stringByReplacingMatchesInString:text
+                                                               options:0
+                                                                 range:NSMakeRange(0, [text length])
+                                                          withTemplate:@""];
+    return modifiedString;
 }
  
  
@@ -762,7 +790,7 @@
         NSDictionary *responseObjectDic = uploadModel.responseObject;
         if ([responseObjectDic containsObjectForKey:@"errorCode"]) {
             if ([[NSString stringWithFormat:@"%@",[responseObjectDic objectForKey:@"errorCode"]] isEqualToString:@"0"] && [responseObjectDic containsObjectForKey:@"data"]) {
-                NSDictionary *dataDic = [dic objectForKey:@"data"];
+                NSDictionary *dataDic = [responseObjectDic objectForKey:@"data"];
                 if ([dataDic containsObjectForKey:@"url"]) {
                     self.logoUrl = [NSString stringWithFormat:@"%@",[dataDic objectForKey:@"url"] ? [dataDic objectForKey:@"url"]:@""];
                 }
@@ -919,7 +947,7 @@
         return;
     }
  
-    if (!self.licenseImageUrl || self.companyShortName.length == 0) {
+    if (!self.licenseImageUrl || self.licenseImageUrl.length == 0) {
         [QMUITips showWithText:@"提交失败,请重试" inView:AppKeyWindow hideAfterDelay:0.5];
         return;
     }
@@ -961,8 +989,7 @@
  
     }.mutableCopy;
  
-    NSString *contentDic = [NSString stringWithFormat:@"%@",[self objectToJson:dict]];
-    contentDic = [contentDic stringByReplacingOccurrencesOfString:@"\\/" withString:@"/"];
+    NSString *contentDic = [NSString stringWithFormat:@"%@",[dict mj_JSONString]];
     NSMutableDictionary *dicCotent = [NSMutableDictionary dictionary];
     [dicCotent setValue:contentDic forKey:@"account"];
  
@@ -995,21 +1022,21 @@
  
 }
  
-- (NSString *)objectToJson:(id)obj{
-    if (obj == nil) {
-        return nil;
-    }
-    NSError *error = nil;
-    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:obj
-                                                       options:0
-                                                         error:&error];
-    
-    if ([jsonData length] && error == nil){
-        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-    }else{
-        return nil;
-    }
-}
+//- (NSString *)objectToJson:(id)obj{
+//    if (obj == nil) {
+//        return nil;
+//    }
+//    NSError *error = nil;
+//    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:obj
+//                                                       options:0
+//                                                         error:&error];
+//
+//    if ([jsonData length] && error == nil){
+//        return [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+//    }else{
+//        return nil;
+//    }
+//}
  
  
  
@@ -349,7 +349,7 @@
             self.titleL.text = titleStr;
             NSString *url = @"";
             if (isDetail) {
-                url = [NSString stringWithFormat:@"%@",detailModel.account.userLogo?detailModel.account.userLogo:@""];
+                url = [NSString stringWithFormat:@"%@",detailModel.account.logo?detailModel.account.logo:@""];
             }
             self.contentImageV.frame = CGRectMake(95, 10, 60, 60);
             [self.contentImageV sd_setImageWithURL:[NSURL URLWithString:url] placeholderImage:[UIImage imageNamedFromOrganization:@""]];
@@ -70,7 +70,7 @@ static NSString * uuid;
     CNUserShareModel.faceUrl = @"http://yweb0.cnliveimg.com/images/headImg/2019/1211/1576034177571_small.jpg";
     CNUserShareModel.nickname = @"";
     CNUserShareModel.mobile = @"15027621766";
-    CNUserShareModel.uid = @"10514575";
+    CNUserShareModel.uid = @"10514577";
  
 }
 - (NSString *)appUUIDString
@@ -17,6 +17,7 @@
 #import <CNLiveBeeHive/CNLiveBeeHive.h>
 #import "CNLiveBOrganizationValidationProtocol.h"
 #import <YYKit/YYKit.h>
+#import <QMUIKit/QMUIKit.h>
  
  
  
@@ -65,7 +66,9 @@
  
         [CNLiveNetworking setAllowRequestDefaultArgument:YES];
         [CNLiveNetworking setupShowDataResult:NO];
+        [QMUITips showLoadingInView:self.view];
         [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:strUrl Param:dict CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+            [QMUITips hideAllTipsInView:self.view];
  
             NSLog(@"点播详情数据 = %@",responseObject);