解决依赖问题

liushiyu
1 parent 72ccd29d
Showing 8 changed files with 48 additions and 61 deletions
CNLiveBusinessTools/Classes/CNLiveBusinessTools.h
CNLiveBusinessTools/Classes/CNLiveBusinessTools.m
CNLiveBusinessTools/Classes/CNLiveBusinessToolsHeader.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/CNLiveQQEmotionManager.m
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.h
CNLiveBusinessTools/Classes/CNLiveQQEmotionManager/QMUIEmotion+CNLiveEmotion.m
Example/CNLiveBusinessTools/CNLiveViewController.m
Example/Podfile
@@ -6,7 +6,13 @@
 //
 #import <Foundation/Foundation.h>
-
+#import <CNLiveEnvironment/CNLiveEnvironment.h>
+#import <CNLiveUserManagement/CNUserInfoManager.h>
+#import "CommonCrypto/CommonDigest.h"
+#import <CNLiveBaseKit/CNLiveBaseKit.h>
+#import "CNEmojiTextAttachment.h"
+#import <QMUIKit/QMUIEmotionView.h>
+#import "CNLiveQQEmotionManager.h"
 NS_ASSUME_NONNULL_BEGIN
 typedef NS_ENUM(NSInteger, CNStatType) {
     CNStatTypeContentCount = 0, //内容次数统计
@@ -7,13 +7,6 @@
 #import "CNLiveBusinessTools.h"
 #import <Photos/Photos.h>
-#import <CNLiveEnvironment/CNLiveEnvironment.h>
-#import <CNLiveUserManagement/CNUserInfoManager.h>
-#import "CommonCrypto/CommonDigest.h"
-#import <CNLiveBaseKit/CNLiveBaseKit.h>
-#import "CNEmojiTextAttachment.h"
-#import <QMUIKit/QMUIEmotionView.h>
-#import "CNLiveQQEmotionManager.h"
 #import <YYKit/YYKit.h>
 @implementation CNLiveBusinessTools
@@ -11,4 +11,3 @@
 #import "CNLiveBusinessTools.h"
 #import "CNLiveQQEmotionManager.h"
 #import "CNLiveEmotionHelper.h"
-#import "QMUIEmotion+CNLiveEmotion.h"
@@ -7,8 +7,8 @@
 //
 #import "CNLiveQQEmotionManager.h"
-#import "QMUIEmotion+CNLiveEmotion.h"
 #import "CNLiveEmotionHelper.h"
+
 /**
  *  加载Emoji图片资源失败标识
  */
@@ -139,7 +139,7 @@ static NSArray&lt;QMUIEmotion *&gt; *QQEmotionArray;
 }
 + (UIImage *)imageForQQEmotionWithIdentifier:(NSString *)identifier {
-    return [CNLiveEmotionHelper emotionImageInBundle:[CNLiveEmotionHelper emotionResourcesBundleWithName:CNLiveResourcesQQEmotionBundleName] withName:identifier];
+    return [CNLiveEmotionHelper emotionImageInBundle:[CNLiveEmotionHelper emotionResourcesBundleWithName:@"CNLive_QQEmotion.bundle"] withName:identifier];
 }
 + (NSArray<QMUIEmotion *> *)emotionsForQQ {
@@ -178,7 +178,7 @@ static NSArray&lt;QMUIEmotion *&gt; *QQEmotionArray;
     dispatch_async(dispatch_get_global_queue(0, 0), ^{
         for (QMUIEmotion *e in emotions) {
             if (e.image == nil) {
-                UIImage *image = [QMUIEmotion cnliveImageWithEmotion:e];
+                UIImage *image = [CNLiveEmotionHelper emotionImageInBundle:[CNLiveEmotionHelper emotionResourcesBundleWithName:@"CNLive_QQEmotion.bundle"] withName:e.identifier];//[QMUIEmotion cnliveImageWithEmotion:e];
                 if (image == nil) {
                     NSLog(@"加载emoji失败id:%@",e.identifier);
                     isLoadEmojiFailed = YES;
-//
-//  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
@@ -7,9 +7,14 @@
 //
 #import "CNLiveViewController.h"
+#import <QMUIKit/QMUIKit.h>
+//#import <CNLiveBusinessTools/CNLiveQQEmotionManager.h>
-@interface CNLiveViewController ()
+#define KScreenWidth ([UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height ? [UIScreen mainScreen].bounds.size.height : [UIScreen mainScreen].bounds.size.width)
+#define KScreenHeight ([UIScreen mainScreen].bounds.size.width > [UIScreen mainScreen].bounds.size.height ? [UIScreen mainScreen].bounds.size.width : [UIScreen mainScreen].bounds.size.height)
+@interface CNLiveViewController ()
+//@property (nonatomic, strong) CNLiveQQEmotionManager *emotionInputManager;
 @end
 @implementation CNLiveViewController
@@ -18,6 +23,7 @@
 {
     [super viewDidLoad];
 	// Do any additional setup after loading the view, typically from a nib.
+//    [self.view addSubview:self.emotionInputManager.emotionView];
 }
 - (void)didReceiveMemoryWarning
@@ -26,4 +32,29 @@
     // Dispose of any resources that can be recreated.
 }
+//-(CNLiveQQEmotionManager *)emotionInputManager
+//{
+//    if (!_emotionInputManager) {
+//        _emotionInputManager = [[CNLiveQQEmotionManager alloc] init];
+//        _emotionInputManager.emotionView.frame = CGRectMake(0, 200, KScreenWidth, 232);
+////        _emotionInputManager.boundTextView = self.toolbarTextView;
+//        _emotionInputManager.emotionView.qmui_borderPosition = QMUIToastViewPositionTop;
+//        _emotionInputManager.emotionView.sendButton.hidden = YES;
+//        _emotionInputManager.emotionView.numberOfRowsPerPage = 3;//{18, 18, 65, 18}
+//        _emotionInputManager.emotionView.paddingInPage = UIEdgeInsetsMake(18, 18, 50, 18);
+//        _emotionInputManager.emotionView.pageControlMarginBottom = 0;
+//        _emotionInputManager.emotionView.minimumEmotionHorizontalSpacing = 15;
+//        _emotionInputManager.emotionView.didSelectEmotionBlock = ^(NSInteger index, QMUIEmotion *emotion) {
+////            [weakSelf onInputSystemFace:index emotion:emotion];
+//        };
+//        _emotionInputManager.emotionView.didSelectDeleteButtonBlock = ^{
+////            if ([weakSelf.toolbarTextView.text isEqualToString:@""])
+//                return;
+//
+////            [weakSelf deleteEmotionDisplayNameAtCurrentTextView:weakSelf.toolbarTextView];
+//        };
+//    }
+//    return _emotionInputManager;
+//}
+
 @end
@@ -9,12 +9,12 @@ platform :ios, &#39;9.0&#39;
 target 'CNLiveBusinessTools_Example' do
   pod 'CNLiveBusinessTools', :path => '../'
-  pod 'CNLiveEnvironment'
-  pod 'CNLiveUserManagement'
-  pod 'CNLiveBaseKit'
-  pod 'CNLiveRequestBastKit'
-  pod 'CNLiveTripartiteManagement/QMUIKit'
-  pod 'CNLiveTripartiteManagement/YYKit'
+#  pod 'CNLiveEnvironment'
+#  pod 'CNLiveUserManagement'
+#  pod 'CNLiveBaseKit'
+#  pod 'CNLiveRequestBastKit'
+#  pod 'CNLiveTripartiteManagement/QMUIKit'
+#  pod 'CNLiveTripartiteManagement/YYKit'
   target 'CNLiveBusinessTools_Tests' do
     inherit! :search_paths