云测bug修复

yanglingyu
1 parent 36c3a597
Showing 8 changed files with 27 additions and 20 deletions
CNLiveCMineModule.podspec
CNLiveCMineModule/Classes/CNCMine/View/CNTopImageView.m
CNLiveCMineModule/Classes/CNCMine/ViewController/CNLiveMineVC.m
CNLiveCMineModule/Classes/CNCSubMine/Present/CNCSubMinePresent.h
CNLiveCMineModule/Classes/CNCSubMine/Present/CNCSubMinePresent.m
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMineCodeVC.m
CNLiveCMineModule/Classes/CNWallet/ViewController/CNMineWalletController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
@@ -8,7 +8,7 @@
  
 Pod::Spec.new do |s|
   s.name             = 'CNLiveCMineModule'
-  s.version          = '0.2.0'
+  s.version          = '0.2.1'
   s.summary          = '网家家C端个人中心'
  
 # This description is used to generate tags and improve search results.
@@ -53,17 +53,17 @@
         make.width.mas_equalTo(DS_adapt_length(105));
     }];
     [self.iconImage mas_makeConstraints:^(MASConstraintMaker *make) {
-        make.top.equalTo(self).offset(kStatusHeight+DS_adapt_length(23));
+        make.top.equalTo(self).offset(kStatusHeight+DS_adapt_length(35));
         make.left.equalTo(self).offset(DS_adapt_length(12));
         make.width.height.mas_equalTo(DS_adapt_length(60));
     }];
     [self.titleLabel mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.mas_equalTo(DS_adapt_length(82.5));
-        make.top.mas_equalTo(kStatusHeight+DS_adapt_length(27));
+        make.top.mas_equalTo(kStatusHeight+DS_adapt_length(39));
     }];
     [self.homelandBtn mas_makeConstraints:^(MASConstraintMaker *make) {
         make.left.equalTo(self.titleLabel);
-        make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 23+30));
+        make.top.mas_equalTo(kStatusHeight+DS_adapt_length( 35+30));
         make.height.mas_equalTo(DS_adapt_length(26));
         make.width.mas_equalTo(DS_adapt_length(86.5));
     }];
@@ -107,6 +107,8 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
         self.toolView.top = self.activityView.bottom + DS_adapt_length(16);
         self.versionLabel.top = self.toolView.bottom + DS_adapt_length(16);
         self.bgScrollView.contentSize = CGSizeMake(kScreenWidth, self.versionLabel.bottom + DS_adapt_length(8));
+    }else{
+        [self.topImageView uploadViews];
     }
     [self loadData];
  
@@ -163,12 +165,12 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
 #pragma mark - UIScrollViewDelegate
 - (void)scrollViewDidScroll:(UIScrollView *)scrollView{
     CGFloat contentOffetY = scrollView.offsetY + kStatusHeight;
-    if (contentOffetY <= DS_adapt_length(23)  && contentOffetY > 0) {
-        self.topSmallView.alpha = contentOffetY/DS_adapt_length(23) ;
+    if (contentOffetY <= DS_adapt_length(35)  && contentOffetY > 0) {
+        self.topSmallView.alpha = contentOffetY/DS_adapt_length(35) ;
         [AppKeyWindow addSubview:self.topImageView.codesView];
         [AppKeyWindow addSubview:self.topImageView.iconImage];
         [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(23)  - contentOffetY);
+            make.top.equalTo(self.view).offset(kStatusHeight+DS_adapt_length(35)  - contentOffetY);
             make.left.equalTo(self.view).offset(DS_adapt_length( 12));
             make.width.height.mas_equalTo(DS_adapt_length(60) - self.topSmallView.alpha * DS_adapt_length(28));
         }];
@@ -179,7 +181,7 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
             make.height.mas_equalTo(DS_adapt_length(30));
             make.width.mas_equalTo(DS_adapt_length(105));
         }];
-    }else if (contentOffetY > DS_adapt_length(23)){
+    }else if (contentOffetY > DS_adapt_length(35)){
         self.topSmallView.alpha = 1;
         [self.topSmallView addSubview:self.topImageView.codesView];
         [self.topSmallView addSubview:self.topImageView.iconImage];
@@ -200,7 +202,7 @@ static NSString *const CNSobotNotification_NewMessage = @&quot;CNSobotNotification_Ne
         [self.topImageView addSubview:self.topImageView.codesView];
         [self.topImageView addSubview:self.topImageView.iconImage];
         [self.topImageView.iconImage mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self.topImageView).offset(kStatusHeight+DS_adapt_length(23));
+            make.top.equalTo(self.topImageView).offset(kStatusHeight+DS_adapt_length(35));
             make.left.equalTo(self.topImageView).offset(DS_adapt_length(12));
             make.width.height.mas_equalTo(DS_adapt_length(60));
         }];
@@ -17,7 +17,7 @@ typedef void (^CNLoginResponseBlock)(NSURLSessionTask *requestTask, id responseO
 /// 请求刷新二维码
 /// @param type 请求类型
 /// @param response 返回数据
-+ (void) requestGenCodeWith:(NSString *)type response:(void(^)(NSDictionary *data))response;
++ (void) requestGenCodeWith:(NSString *)type response:(void(^)(NSDictionary *data,NSError *error))response;
  
 /// 获取设置本地数据
 + (NSMutableArray <CNMySettingListModel*> *)settingDataSource:(NSString *)status;
@@ -25,17 +25,16 @@
     });
     return _singleton;
 }
-+ (void)requestGenCodeWith:(NSString *)type response:(nonnull void (^)(NSDictionary * _Nonnull))response
++ (void)requestGenCodeWith:(NSString *)type response:(nonnull void (^)(NSDictionary * _Nonnull, NSError * _Nonnull))response
 {
     NSDictionary * paramDic = @{
                                 @"appId":AppId,
                                 @"sid":CNUserShareModel.uid?CNUserShareModel.uid:@"",
                                 @"type":type
                                 };
+    [CNLiveNetworking setupShowDataResult:YES];
     [CNLiveNetworking requestNetworkWithMethod:CNLiveRequestMethodPOST URLString:CNGenOrResetCodeUrl Param:paramDic CacheType:CNLiveNetworkCacheTypeNetworkOnly CompletionBlock:^(NSURLSessionTask *requestTask, id responseObject, NSError *error) {
-        if (!error) {
-            response(responseObject);
-        }
+            response(responseObject,error);
     }];
 }
 + (NSMutableArray <CNMySettingListModel*>*)settingDataSource:(NSString *)status{
@@ -27,10 +27,17 @@
  
 @implementation CNMineCodeVC
 -(void)requestSource:(NSString *)type{
+    [self.loading startAnimating];
     weakself
-    [CNCSubMinePresent requestGenCodeWith:type response:^(NSDictionary * _Nonnull data) {
-        weakSelf.codeView.image = [[CNLiveCMineService shareMineProtocol] loadSGQRCodeGenImage:data[@"qrcode"] type:@"user"];
-        [[SDImageCache sharedImageCache] storeImage:weakSelf.codeView.image forKey:CNUserShareModel.uid toDisk:YES completion:NULL];
+    [CNCSubMinePresent requestGenCodeWith:type response:^(NSDictionary * _Nonnull data, NSError * _Nonnull error) {
+        [weakSelf.loading stopAnimating];
+        if (!error) {
+            weakSelf.codeView.image = [[CNLiveCMineService shareMineProtocol] loadSGQRCodeGenImage:data[@"qrcode"] type:@"user"];
+            [[SDImageCache sharedImageCache] storeImage:weakSelf.codeView.image forKey:CNUserShareModel.uid toDisk:YES completion:NULL];
+        }else{
+            [QMUITips showWithText:error.localizedDescription inView:self.view hideAfterDelay:1.5];
+        }
+       
     }];
 }
 - (void)viewDidLoad {
@@ -352,7 +352,6 @@
     if (!_transferBalanceItemView) {
         _transferBalanceItemView = [[CNLiveMyExchangeBalanceView alloc]initWithFrame:CGRectMake(0, 0, KScreenWidth, 50) title:@"转余额" image:[CNLiveCMineService imageWithMineName:@"transfer_balance_icon"]];
         _transferBalanceItemView.block = ^{
-#warning 交互
             [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:14 param:@{} contentVC:self];
         };
     }
@@ -201,10 +201,10 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
  
         cell.selectImageActionBlock = ^(NSArray *images, NSArray *imageUrls, NSArray * thumbUrlsArr, SDAnimatedImageView *currentImage) {
  
-            [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:14 param:[model mj_keyValues] contentVC:self];
+            [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:15 param:[model mj_keyValues] contentVC:self];
         };
         cell.selectVideoActionBlock = ^(CNMineCollectionCell *cell, NSString *vid, UIImageView *curroutImage) {
-            [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:14 param:[model mj_keyValues] contentVC:self];
+            [[CNLiveCMineService shareMineProtocol] pushCMineContentForCMainPlatWithType:15 param:[model mj_keyValues] contentVC:self];
         };
  
         return cell;