no message

zhangxiaowen
1 parent 31b90639
Showing 11 changed files with 68 additions and 25 deletions
CNLiveGifFace.podspec
CNLiveGifFace/Classes/Controller/CNChatGifDetailsViewController.h
CNLiveGifFace/Classes/Controller/CNChatGifDetailsViewController.m
CNLiveGifFace/Classes/Controller/CNGifFaceListViewController.m
CNLiveGifFace/Classes/Controller/CNMyGifFaceViewController.m
CNLiveGifFace/Classes/Tools/CNGifManager.m
CNLiveGifFace/Classes/View/CNGifFaceListHeaderView.m
CNLiveGifFace/Classes/View/CNGifFaceListTableViewCell.m
CNLiveGifFace/Classes/View/CNMyGifFaceTableViewCell.m
Example/CNLiveGifFace.xcodeproj/project.pbxproj
Example/Podfile
@@ -9,7 +9,7 @@
 Pod::Spec.new do |s|
   s.name             = 'CNLiveGifFace'
   s.version          = '0.0.1'
-  s.summary          = 'A short description of CNLiveGifFace.'
+  s.summary          = 'GIF表情.'
 # This description is used to generate tags and improve search results.
 #   * Think: What does it do? Why did you write it? What is the focus?
@@ -48,5 +48,8 @@ TODO: Add long description of the pod here.
   s.dependency 'CNLiveCustomUI'
   s.dependency 'WebViewJavascriptBridge'
   s.dependency 'SSZipArchive'
+  s.dependency 'CNLiveCommonCategory'
+  s.dependency 'CNLiveCommonClass'
+  s.dependency 'IMBaseSDK'
 end
@@ -8,6 +8,9 @@
 #import "CNCommonViewController.h"
 #import "CNChatViewController.h"
+#import "TIMAdapter.h"
+#import "CommonLibrary.h"
+
 NS_ASSUME_NONNULL_BEGIN
 @interface CNChatGifDetailsViewController : CNCommonViewController
@@ -15,6 +15,11 @@
 #import "CNMessageForwardingController.h"
 #import "CNGifFaceModel.h"
+#import "CNLiveDefinesHeader.h"
+#import <QMUIKit/QMUIKit.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
+#import <YYKit/YYKit.h>
+
 @interface CNChatGifDetailsViewController ()<UIGestureRecognizerDelegate>
 @property (nonatomic, strong) YYAnimatedImageView *webImageView;
 @property (nonatomic, strong) UILabel *nameLabel;
@@ -14,10 +14,13 @@
 #import "CNLiveDownLoadManager.h"
 #import "CNLiveArchiveManager.h"
 #import <AFNetworking/AFNetworking.h>
-#import "CNUserAgreementRequst.h"
-#import "CNReportAndComplaintWebController.h"
+//#import "CNUserAgreementRequst.h"
+//#import "CNReportAndComplaintWebController.h"
 #import "UIColor+CNLiveExtension.h"
-#import "CNNavigationController.h"
+//#import "CNNavigationController.h"
+#import <QMUIKit/QMUIKit.h>
+#import "CNUserInfoManager.h"
+#import "CNLiveDefinesHeader.h"
 @interface CNGifFaceListViewController ()<UITableViewDelegate, UITableViewDataSource, CNGifFaceListTableViewCellDelegate>{
     BOOL _isDownload;
@@ -10,7 +10,10 @@
 #import "CNGifFaceListHeaderView.h"
 #import "CNMyGifFaceTableViewCell.h"
 #import "CNGifFaceModel.h"
-
+#import "Masonry.h"
+#import "MJExtension.h"
+#import "CNLiveDefinesHeader.h"
+#import "CNUserInfoManager.h"
 @interface CNMyGifFaceViewController ()<UITableViewDelegate,UITableViewDataSource,CNMyGifFaceTableViewCellDelegate>
 @property (nonatomic, strong) UITableView *tableView;
@@ -145,7 +148,7 @@
         _data = [[NSMutableArray alloc] init];
         NSFileManager *fileManager = [NSFileManager defaultManager];
         NSString *docPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-        NSString *filePath = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/%@",[UserInformationModel manager].uid,@"GifFaceList.plist"]];
+        NSString *filePath = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/%@",CNUserShareModelUid,@"GifFaceList.plist"]];
         ///var/mobile/Containers/Data/Application/94E0C70B-9F4D-4716-8EAF-7BF0C53AEAEE/Documents/10514405/GifFace/GifFaceList.plist
         BOOL result = [fileManager fileExistsAtPath:filePath];
         if(result){
@@ -7,6 +7,8 @@
 //
 #import "CNGifManager.h"
+#import "CNUserInfoManager.h"
+
 #define timeInterval @(600)
 #define tolerance    @(0.01)
@@ -227,7 +229,7 @@ typedef NS_ENUM(NSInteger, GIFSize) {
 + (NSString *)makingGIFforTimePoints:(NSArray *)timePoints fromURL:(NSURL *)url fileProperties:(NSDictionary *)fileProperties frameProperties:(NSDictionary *)frameProperties frameCount:(int)frameCount gifSize:(GIFSize)gifSize needCompression:(BOOL)isNeedCompression compressionWidth:(float)compressionWidth compressionHeight:(float)compressionHeight{
     NSString *docPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-    NSString *filePath = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/DownLoad/Personal",[UserInformationModel manager].uid]];
+    NSString *filePath = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/DownLoad/Personal",[CNUserInfoManager manager].userInfoModel.uid]];
     NSFileManager *fileManager = [NSFileManager defaultManager];
     BOOL result = [fileManager fileExistsAtPath:filePath];
@@ -8,6 +8,7 @@
 #import "CNGifFaceListHeaderView.h"
 #import "UIColor+CNLiveExtension.h"
+#import "CNLiveDefinesHeader.h"
 @interface CNGifFaceListHeaderView()
 /** 内部的label */
@@ -31,12 +32,12 @@ static const NSInteger margin = 10;
         [self.contentView addSubview:label];
         self.label = label;
-        UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, kMainScreenWidth, 0.5)];
+        UIView *topLine = [[UIView alloc] initWithFrame:CGRectMake(0, 0, KScreenWidth, 0.5)];
         topLine.backgroundColor = CNLiveColorWithHexString(@"EBEBEB");
         [self.contentView addSubview:topLine];
         self.topLine = topLine;
-        UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(margin, 45*RATIO-0.5, kMainScreenWidth-margin, 0.5)];
+        UIView *bottomLine = [[UIView alloc] initWithFrame:CGRectMake(margin, 45*RATIO-0.5, KScreenWidth-margin, 0.5)];
         bottomLine.backgroundColor = CNLiveColorWithHexString(@"EBEBEB");
         [self.contentView addSubview:bottomLine];
         self.bottomLine = bottomLine;
@@ -10,6 +10,11 @@
 #import "CNGifFaceModel.h"
 #import "UIColor+CNLiveExtension.h"
 #import <AFNetworking/AFNetworking.h>
+#import "UIImageView+WebCache.h"
+#import "Masonry.h"
+#import "CNLiveDefinesHeader.h"
+#import <QMUIKit/QMUIKit.h>
+#import <CNLiveRequestBastKit/CNLiveNetworking.h>
 @interface CNGifFaceListTableViewCell()
 @property (nonatomic, strong) UIImageView *leftImage;
@@ -144,15 +149,14 @@ static const NSInteger margin = 10;
 }
 #pragma mark - Action
 - (void)clickAddBtn:(UIButton *)btn{
+    if(![CNLiveNetworking isNetworking]){
+        [QMUITips showWithText:@"无法连接网络" inView:[UIApplication sharedApplication].delegate.window hideAfterDelay:1];
+        return ;
+    }
+    
     _addBtn.hidden = YES;
     _processView.hidden = NO;
-    AFNetworkReachabilityManager *manager = [AFNetworkReachabilityManager sharedManager];
-    if(manager.networkReachabilityStatus == AFNetworkReachabilityStatusNotReachable || manager.networkReachabilityStatus == AFNetworkReachabilityStatusUnknown){
-        [QMUITips showWithText:@"无法连接网络" inView:AppKeyWindow hideAfterDelay:1];
-        return;
-    }
-    
     if (self.delegate && [self.delegate respondsToSelector:@selector(clickedAddBtn:)]) {
         [self.delegate clickedAddBtn:self.model.downloadUrl];//滑动响应实现
     }
@@ -11,8 +11,13 @@
 #import "CNGifFaceModel.h"
 #import "CNLiveDownLoadManager.h"
 #import "CNLiveArchiveManager.h"
-//#import "UIColor+CNLiveExtension.h"
+#import "UIColor+CNLiveExtension.h"
 #import "CNFaceThemeModel.h"
+#import "Masonry.h"
+#import "MJExtension.h"
+#import "CNUserInfoManager.h"
+#import "CNLiveDefinesHeader.h"
+#import <QMUIKit/QMUIKit.h>
 @interface CNMyGifFaceTableViewCell()
 @property (nonatomic, strong) UIImageView *leftImage;
@@ -37,7 +42,7 @@ static const NSInteger margin = 10;
 #pragma mark - Data
 - (void)setGroupName:(NSString *)groupName{
     _groupName = groupName;
-    NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject]stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/Download/%@",[UserInformationModel manager].uid,groupName]];
+    NSString *path = [[NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) lastObject]stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/Download/%@",CNUserShareModelUid,groupName]];
     //设置图片
     NSString *image = [path stringByAppendingPathComponent:[NSString stringWithFormat:@"%@_left0",groupName]];
@@ -112,11 +117,11 @@ static const NSInteger margin = 10;
 #pragma mark - Action
 - (void)clickRemoveBtn:(UIButton *)btn{
-    [QMUITips showLoading:@"移除中..." inView:AppKeyWindow];
+    [QMUITips showLoading:@"移除中..." inView:[UIApplication sharedApplication].delegate.window];
     //1先删除plist文件
     NSString *docPath = [NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES) objectAtIndex:0];
-    NSString *filePath1 = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/%@",[UserInformationModel manager].uid,@"GifFaceList.plist"]];
+    NSString *filePath1 = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/%@",CNUserShareModelUid,@"GifFaceList.plist"]];
     ///var/mobile/Containers/Data/Application/94E0C70B-9F4D-4716-8EAF-7BF0C53AEAEE/Documents/10514405/GifFace/GifFaceList.plist
     NSFileManager *fileManager = [NSFileManager defaultManager];
     BOOL result1 = [fileManager fileExistsAtPath:filePath1];
@@ -133,7 +138,7 @@ static const NSInteger margin = 10;
     }
     //2然后删除文件夹中的表情包
-    NSString *filePath2 = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/Download/%@",[UserInformationModel manager].uid,_groupName]];
+    NSString *filePath2 = [docPath stringByAppendingPathComponent:[NSString stringWithFormat:@"%@/GifFace/Download/%@",CNUserShareModelUid,_groupName]];
     BOOL result2 = [fileManager fileExistsAtPath:filePath2];
     if(result2){
         //读取已存在的表情包列表
@@ -147,7 +152,7 @@ static const NSInteger margin = 10;
         [self.delegate refreshGifFaceTableView:self];
          [[NSNotificationCenter defaultCenter] postNotificationName:@"RemoveGifFacePackageSuccess" object:nil userInfo:@{@"sectionId":_groupName}];
     }
-    [QMUITips hideAllTipsInView:AppKeyWindow];
+    [QMUITips hideAllTipsInView:[UIApplication sharedApplication].delegate.window];
 //    QMUITips *tips = [QMUITips showSucceed:@"移除成功" inView:AppKeyWindow hideAfterDelay:1];
 //    tips.backgroundColor = [UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:0.6];
@@ -207,7 +207,7 @@
 				6003F586195388D20070C39A /* Sources */,
 				6003F587195388D20070C39A /* Frameworks */,
 				6003F588195388D20070C39A /* Resources */,
-				ECAC1BD9552FAE4C176008DA /* [CP] Embed Pods Frameworks */,
+				B29AB0376DAA7DACC0EC6B74 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -341,7 +341,7 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		ECAC1BD9552FAE4C176008DA /* [CP] Embed Pods Frameworks */ = {
+		B29AB0376DAA7DACC0EC6B74 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -349,18 +349,22 @@
 			inputFileListPaths = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveGifFace_Example/Pods-CNLiveGifFace_Example-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-CNLiveGifFace_Example/Pods-CNLiveGifFace_Example-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBaseKit/CNLiveBaseKit.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveCommonCategory/CNLiveCommonCategory.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCommonClass/CNLiveCommonClass.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveCustomUI/CNLiveCustomUI.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveGifFace/CNLiveGifFace.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
+				"${BUILT_PRODUCTS_DIR}/FLAnimatedImage/FLAnimatedImage.framework",
+				"${BUILT_PRODUCTS_DIR}/IMBaseSDK/IMBaseSDK.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
 				"${BUILT_PRODUCTS_DIR}/MJRefresh/MJRefresh.framework",
 				"${BUILT_PRODUCTS_DIR}/Masonry/Masonry.framework",
 				"${BUILT_PRODUCTS_DIR}/QMUIKit/QMUIKit.framework",
+				"${BUILT_PRODUCTS_DIR}/Realm/Realm.framework",
 				"${BUILT_PRODUCTS_DIR}/SDWebImage/SDWebImage.framework",
 				"${BUILT_PRODUCTS_DIR}/SSZipArchive/SSZipArchive.framework",
 				"${BUILT_PRODUCTS_DIR}/WebViewJavascriptBridge/WebViewJavascriptBridge.framework",
@@ -372,15 +376,19 @@
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBaseKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonCategory.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCommonClass.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveCustomUI.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveGifFace.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FLAnimatedImage.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IMBaseSDK.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJRefresh.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Masonry.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/QMUIKit.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Realm.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SDWebImage.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SSZipArchive.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/WebViewJavascriptBridge.framework",
@@ -388,7 +396,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-CNLiveGifFace_Example/Pods-CNLiveGifFace_Example-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-CNLiveGifFace_Example/Pods-CNLiveGifFace_Example-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -528,6 +536,7 @@
 			baseConfigurationReference = 2051FF30CDCC583E98B8C708 /* Pods-CNLiveGifFace_Example.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveGifFace/CNLiveGifFace-Prefix.pch";
@@ -544,6 +553,7 @@
 			baseConfigurationReference = E069E0E0388F846BD9FDC4C8 /* Pods-CNLiveGifFace_Example.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				DEVELOPMENT_TEAM = 94X49GG3ZW;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "CNLiveGifFace/CNLiveGifFace-Prefix.pch";
@@ -13,3 +13,7 @@ target &#39;CNLiveGifFace_Example&#39; do
   end
 end
+pre_install do |installer|
+    # workaround for https://github.com/CocoaPods/CocoaPods/issues/3289
+    Pod::Installer::Xcode::TargetValidator.send(:define_method, :verify_no_static_framework_transitive_dependencies) {}
+end