no message

zhangxiaowen
1 parent c9c80a3e
Showing 7 changed files with 68 additions and 44 deletions
CNLiveQrCodeModule.podspec
CNLiveQrCodeModule/Classes/Controller/CNLiveGroupQrCodeController.m
CNLiveQrCodeModule/Classes/Controller/CNLiveMyQrCodeController.m
CNLiveQrCodeModule/Classes/View/CNLiveMyQrCodeView.m
Example/CNLiveQrCodeModule.xcodeproj/project.pbxproj
Example/CNLiveQrCodeModule/CNLIVEAppDelegate.m
Example/Podfile
@@ -29,7 +29,7 @@ TODO: 网家家-二维码模块.
   # s.social_media_url = 'https://twitter.com/<TWITTER_USERNAME>'
   s.ios.deployment_target = '9.0'
-
+  
 #  s.source_files = 'CNLiveQrCodeModule/Classes/**/*'
   s.resource_bundles = {
@@ -75,8 +75,14 @@ TODO: 网家家-二维码模块.
   # 服务层
   s.dependency 'CNLiveServices'
+  
+  # 环境
+  s.dependency 'CNLiveEnvironment'
+
+  # 数据请求
+  s.dependency 'CNLiveRequestBastKit'
   # 用户信息本地化
   s.dependency 'CNLiveUserManagement'
-   
+      
 end
@@ -11,6 +11,9 @@
 #import "QMUIKit.h"
 #import "SGQRCode.h"//二维码库
+//#import "CNLiveShareManager.h"
+//#import "CNLiveShareToolDefine.h"
+
 #import "CNLiveQrCodeNavigationBar.h"
 #import "CNLiveGroupQrcodeView.h"
 #import "CNLiveQrCodeNavigationBar.h"
@@ -169,12 +172,12 @@ static const NSInteger margin = 10;
     UIImage *image = [self generateImage:self.groupView];
     NSArray *imageArray = @[@"sport_china_download"].copy;
     NSArray *titleArray = @[@"保存"].copy;
-    __weak typeof(self) weakSelf = self;
 //    [CNLiveShareManager showShareViewWithParamForShareTitle:nil ShareUrl:nil ShareDesc:nil ShareImage:image ScreenFull:NO HiddenWjj:NO HiddenQQ:NO HiddenWB:NO HiddenWechat:NO HiddenSafari:YES TopImage:imageArray TopTitles:titleArray PlatformType:CNLiveSharePlatformTypeAll TouchActionBlock:^(NSString *title) {
 //
 //    } CompleterBlock:^(CNLiveShareResultType resultType, CNLiveSharePlatformType platformType, NSString *typtString) {
 //
 //    }];
+    
 }
 // UIView转UIImage
@@ -116,12 +116,10 @@ static const CGFloat timeValue = 1.5;
     } completionHandler:^(BOOL success, NSError * _Nullable error) {
         dispatch_async(dispatch_get_main_queue(), ^{
-            if (error) {
-                NSLog(@"%@",@"保存失败");
-                [QMUITips showError:@"保存失败" inView:self.view hideAfterDelay:timeValue];
-            } else {
-                NSLog(@"%@",@"保存成功");
+            if (success) {
                 [QMUITips showSucceed:@"保存成功" inView:self.view hideAfterDelay:timeValue];
+            } else {
+                [QMUITips showError:@"保存失败" inView:self.view hideAfterDelay:timeValue];
             }
         });
@@ -180,7 +178,6 @@ static const CGFloat timeValue = 1.5;
         QMUIAlertAction *cancel = [QMUIAlertAction actionWithTitle:@"取消" style:QMUIAlertActionStyleCancel handler:^(__kindof QMUIAlertController *aAlertController, QMUIAlertAction *action) {
               __strong typeof(weakSelf) strongSelf = weakSelf;
               if(!strongSelf) return ;
-              [strongSelf.qrCodeView generateQRCode:@"reset"];
               self.navigationBar.right.userInteractionEnabled = YES;
           }];
@@ -224,7 +221,7 @@ static const CGFloat timeValue = 1.5;
 }
 - (CNLiveMyQrCodeView *)qrCodeView {
     if (!_qrCodeView) {
-        _qrCodeView = [[CNLiveMyQrCodeView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-2*margin, 420)];
+        _qrCodeView = [[CNLiveMyQrCodeView alloc]initWithFrame:CGRectMake(0, 0, SCREEN_WIDTH-2*margin, SCREEN_WIDTH-2*margin+40)];
         _qrCodeView.center = self.view.center;
     }
     return _qrCodeView;
@@ -12,6 +12,9 @@
 #import "QMUIKit.h"
 #import "SGQRCode.h"//二维码库
+#import "CNLiveNetworking.h"
+#import "CNLiveEnvironment.h"
+
 @interface CNLiveMyQrCodeView ()
 @property (nonatomic, strong) UIImageView *header;
 @property (nonatomic, strong) UILabel *name;
@@ -40,7 +43,7 @@ static const CGFloat timeValue = 1.5;
 }
 - (void)dealloc {
-    NSLog(@"XWMyQrCodeView -- dealloc");
+    NSLog(@"CNLiveMyQrCodeView -- dealloc");
 }
@@ -72,11 +75,11 @@ static const CGFloat timeValue = 1.5;
         make.height.equalTo(self.name.mas_height);
     }];
-    
+
     [_qrCode mas_makeConstraints:^(MASConstraintMaker *make) {
         make.centerX.equalTo(self.mas_centerX).with.offset(0);
         make.top.equalTo(self.header.mas_bottom).with.offset(margin);
-        make.width.height.equalTo(self.mas_width).with.offset(-4*margin);
+        make.width.height.equalTo(self.mas_width).with.offset(-6*margin);
     }];
@@ -91,35 +94,39 @@ static const CGFloat timeValue = 1.5;
 // 重置二维码
 - (void)generateQRCode:(NSString *)type{
-//    NSDictionary *params = @{
-//                                @"appId":@"AppId",
-//                                @"sid":@"uid",
-//                                @"type":type
-//                                };
-//    __weak typeof(self) weakSelf = self;
-//    [GetViewData POST:XWGenOrResetCodeUrl params:params success:^(NSString * _Nullable code, id  _Nullable dataObj) {
-//        if (dataObj) {
-//            __strong typeof(weakSelf) strongSelf = weakSelf;
-//            if(!strongSelf) return ;
-//            NSDictionary *dic = @{@"content":[XWCryptoDES encryptUseDES:[self  dictionaryToJsonString:@{@"name":@"张晓文",@"id":@"1243124"}] key:AppDESKey],@"type":@"user"};
-//            NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:nil];
-//            NSString *jsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-//            UIImage *image = [UIImage xw_getImageName:@"qr_code_icon" bundle:@"XWMyModule.bundle/XWMyModule" targetClass:[XWMyQrCodeView class]];
-//            strongSelf.qrCode.image = [SGQRCodeObtain generateQRCodeWithData:jsonStr size:180.0 logoImage:image ratio:0.2];
-//        }else{
-//            [XWAlertView alertErrorViewWithTextMessage:@"生成失败" view:XW_AppKeyWindow];
-//
-//        }
-//    } failure:^(NSError * _Nullable error) {
-//        [XWAlertView alertErrorViewWithTextMessage:@"生成失败" view:XW_AppKeyWindow];
-//
-//    }];
-//    NSDictionary *dic = @{@"content":[XWCryptoDES encryptUseDES:[self  dictionaryToJsonString:@{@"name":@"张晓文",@"id":@"1243124"}] key:AppDESKey],@"type":@"user"};
-//    NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:nil];
-//    NSString *jsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
-//    UIImage *image = [self xw_getImageName:@"qr_code_icon" bundleName:@"XWMyModule.bundle/XWMyModule" targetClass:[XWMyQrCodeView class]];
-//    self.qrCode.image = [SGQRCodeObtain generateQRCodeWithData:jsonStr size:180.0 logoImage:image ratio:0.2];
-//    
+    NSDictionary *params = @{
+                                @"appId":AppId,
+                                @"sid":@"10514405",
+                                @"type":type
+                                };
+    [CNLiveNetworking setAllowRequestDefaultArgument:YES];
+    [CNLiveNetworking setupShowDataResult:NO];
+    [QMUITips showLoadingInView:self];
+    __weak typeof(self) weakSelf = self;
+
+    [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGenOrResetCodeUrl Param:params CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
+        __strong typeof(weakSelf) strongSelf = weakSelf;
+        if(!strongSelf) return;
+        [QMUITips hideAllToastInView:strongSelf animated:YES];
+        if(!error){
+            //对content 先加密 再转为 json 字符串
+//             NSDictionary *dic = @{@"content":[EncryptAndDecrypt base64StringFromText:data[@"qrcode"] encryptKey:AppDESKey],@"type":@"user"};
+//             NSData *jsonData = [NSJSONSerialization dataWithJSONObject:dic options:NSJSONWritingPrettyPrinted error:nil];
+//             NSString *jsonStr = [[NSString alloc] initWithData:jsonData encoding:NSUTF8StringEncoding];
+            
+            strongSelf.qrCode.image = [SGQRCodeObtain generateQRCodeWithData:@"群组id" size:SCREEN_WIDTH-12*margin logoImage:nil ratio:0.2];
+            if([type isEqualToString:@"reset"]){
+                [QMUITips showSucceed:@"重置成功" inView:strongSelf hideAfterDelay:timeValue];
+            }
+
+        }else{
+            if([type isEqualToString:@"reset"]){
+                [QMUITips showError:@"重置失败" inView:strongSelf hideAfterDelay:timeValue];
+            }
+
+        }
+    }];
+    
 }
 // 字典转json字符串
@@ -144,7 +151,6 @@ static const CGFloat timeValue = 1.5;
 - (UIImageView *)header {
     if (!_header) {
         _header = [[UIImageView alloc] init];
-        _header.backgroundColor = [UIColor redColor];
         _header.layer.masksToBounds = YES;
         _header.layer.cornerRadius = 5;
         UIImage *xw_image = [self xw_getImageName:@"default_avatar_f" bundleName:@"CNLiveQrCodeModule" targetClass:[CNLiveMyQrCodeView class]];
@@ -349,8 +349,11 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-CNLiveQrCodeModule_Example/Pods-CNLiveQrCodeModule_Example-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/AFNetworking/AFNetworking.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveBeeHive/CNLiveBeeHive.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveEnvironment/CNLiveEnvironment.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveQrCodeModule/CNLiveQrCodeModule.framework",
+				"${BUILT_PRODUCTS_DIR}/CNLiveRequestBastKit/CNLiveRequestBastKit.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveTripartiteManagement/CNLiveTripartiteManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/CNLiveUserManagement/CNLiveUserManagement.framework",
 				"${BUILT_PRODUCTS_DIR}/MJExtension/MJExtension.framework",
@@ -361,8 +364,11 @@
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AFNetworking.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveBeeHive.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveEnvironment.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveQrCodeModule.framework",
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveRequestBastKit.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveTripartiteManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CNLiveUserManagement.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/MJExtension.framework",
@@ -11,6 +11,10 @@
 #import "CNLiveScanQrCodeController.h"
 #import "CNLiveGroupQrCodeController.h"
 #import "CNLiveScanResultController.h"
+#import "CNLiveEnvironmentManager.h"
+
+#import "CNLiveNetworking.h"
+#import "CNLiveEnvironment.h"
 @implementation CNLIVEAppDelegate
@@ -18,6 +22,8 @@
 {
     // Override point for customization after application launch.
+    [CNLiveEnvironmentManager setEnvironment:CNLiveDebugAppStore];
+//    [self networkParamAction];
     self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
     CNLiveMyQrCodeController *vc = [[CNLiveMyQrCodeController alloc] init];
@@ -5,7 +5,7 @@ platform :ios, &#39;9.0&#39;
 target 'CNLiveQrCodeModule_Example' do
   pod 'CNLiveQrCodeModule', :path => '../'
-
+  
   target 'CNLiveQrCodeModule_Tests' do
     inherit! :search_paths