Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveBusinessTools

# Conflicts: # CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.h # CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.m

Merge branch 'master' of bj.gitlab.cnlive.com:ios-team/CNLiveBusinessTools
# Conflicts: # CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.h # CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.m
liushiyu
2 parents ae82a742 ad2c35ba
Showing 39 changed files with 62 additions and 2 deletions
.gitignore
.travis.yml
CNLiveBusinessTools.podspec
CNLiveBusinessTools/Assets/.gitkeep
CNLiveBusinessTools/Assets/CNLive_QQEmotion.bundle/Contents/Resources/smiley_78.png
CNLiveBusinessTools/Classes/.gitkeep
CNLiveBusinessTools/Classes/CNLiveBusinessTools.h
CNLiveBusinessTools/Classes/CNLiveBusinessTools.m
CNLiveBusinessTools/Classes/CNLiveBusinessToolsHeader.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNEmojiTextAttachment.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNEmojiTextAttachment.m
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNLiveEmotionHelper.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNLiveEmotionHelper.m
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNLiveQQEmotionManager.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNLiveQQEmotionManager.m
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.m
CNLiveBusinessTools/Classes/HttpService.h
CNLiveBusinessTools/Classes/HttpService.m
Example/CNLiveBusinessTools.xcodeproj/project.pbxproj
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveBusinessTools'
-  s.version          = '0.1.22'
+  s.version          = '0.1.23'
   s.summary          = '业务工具集合组件.'
  
 # This description is used to generate tags and improve search results.
@@ -28,7 +28,7 @@ Pod::Spec.new do |s|
   s.source           = { :git => 'http://bj.gitlab.cnlive.com/ios-team/CNLiveBusinessTools.git', :tag => s.version.to_s }
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
  
-  s.ios.deployment_target = '9.0'
+  s.ios.deployment_target = '10.0'
  
   s.source_files = 'CNLiveBusinessTools/Classes/**/*'
  
@@ -1074,6 +1074,24 @@
                         [attStr replaceCharactersInRange:result.range withAttributedString:imageStr];
                         NSLog(@"\n11111:text%@,range:%@",text,NSStringFromRange(result.range));
                     }
+                    else if([[text substringWithRange:result.range] cn_containsString:emojiArr[j].identifier])
+                    {
+                        NSString *resultStr = [text substringWithRange:result.range];
+                        resultStr = [resultStr stringByReplacingOccurrencesOfString:@"[" withString:@""];
+                        resultStr = [resultStr stringByReplacingOccurrencesOfString:@"]" withString:@""];
+                        if ([resultStr isEqualToString:emojiArr[j].identifier]) {
+
+                            CNEmojiTextAttachment *textAttachment = [[CNEmojiTextAttachment alloc]init];
+                            textAttachment.image = emojiArr[j].image;
+                            textAttachment.bounds = CGRectMake(0, -4.7, 20*RATIO, 20*RATIO);
+                            textAttachment.emojiText = emojiArr[j].displayName;
+                            
+                            NSAttributedString *imageStr = [NSAttributedString attributedStringWithAttachment:textAttachment];
+                            [attStr replaceCharactersInRange:result.range withAttributedString:imageStr];
+                            NSLog(@"\n11111:text%@,range:%@",text,NSStringFromRange(result.range));
+                        }
+                        
+                    }
                 }
             }else
             {//目前只有 暂时没有判断是否是url办法 表情和url
+//
+//  QMUIEmotion+CNLiveEmotion.h
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2018/11/3.
+//  Copyright © 2018 cnlive. All rights reserved.
+//
+
+#import <QMUIKit/QMUIKit.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+#define CNLiveResourcesQQEmotionBundleName @"CNLive_QQEmotion.bundle"
+
+@interface QMUIEmotion (CNLiveEmotion)
+
++ (UIImage *)cnliveImageWithEmotion:(QMUIEmotion *)emotion;
+
+@end
+
+NS_ASSUME_NONNULL_END
+//
+//  QMUIEmotion+CNLiveEmotion.m
+//  CNLiveNetAdd
+//
+//  Created by 张旭 on 2018/11/3.
+//  Copyright © 2018 cnlive. All rights reserved.
+//
+
+#import "QMUIEmotion+CNLiveEmotion.h"
+#import "CNLiveEmotionHelper.h"
+@implementation QMUIEmotion (CNLiveEmotion)
+
++ (UIImage *)cnliveImageWithEmotion:(QMUIEmotion *)emotion
+{
+    UIImage *image = [CNLiveEmotionHelper emotionImageInBundle:[CNLiveEmotionHelper emotionResourcesBundleWithName:CNLiveResourcesQQEmotionBundleName] withName:emotion.identifier];
+    return image;
+}
+
+
+
+@end