云测bug修复

yanglingyu
1 parent 96992613
Showing 5 changed files with 38 additions and 15 deletions
CNLiveCMineModule/Classes/CNCSubMine/ViewController/CNMinePersonNicknameController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineCollectController.m
CNLiveCMineModule/Classes/Colletion/ViewController/CNMineGoodsCollectViewController.m
CNLiveCMineModule/Classes/inte/Controller/CNLiveCMineInteViewController.m
Example/CNLiveCMineModule/CNLiveCMineViewModuleImpl.m
@@ -436,13 +436,13 @@ static NSString *sexCellId = @&quot;sexCellId&quot;;
     UITextPosition *position = [textField positionFromPosition:selectedRange.start offset:0];
     NSInteger maxLength = (_type == SettingTypeNick) ? _nickMaxLength : _locMaxLength;
-    if (range.length > maxLength) {
+    if (range.length >= maxLength) {
         return NO;
     }
     // 没有高亮选择的字，则对已输入的文字进行字数统计和限制,防止中文被截断
     if (!position || !selectedRange){
         NSInteger maxLength = (_type == SettingTypeNick) ? _nickMaxLength : _locMaxLength;
-        if (toBeString.length > maxLength){
+        if (toBeString.length >= maxLength){
             //中文和emoj表情存在问题，需要对此进行处理
             NSRange rangeRange = [toBeString rangeOfComposedCharacterSequencesForRange:NSMakeRange(0, maxLength)];
             textField.text = [toBeString substringWithRange:rangeRange];
@@ -30,6 +30,19 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
 @implementation CNMineCollectController
 #pragma mark - Data
 - (void)loadData{
+    if (![CNLiveBusinessTools connectedToNetwork]) {
+        if (self.data.count == 0) {
+            [self.tableView.mj_footer endRefreshing];
+            [self showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_wifi_no"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
+            [self setCNAPIErrorEmptyView];
+            self.tableView.mj_footer.hidden = self.data.count == 0;
+            
+        }else{
+            [QMUITips showInfo:@"无法连接网络"];
+        }
+            
+            return;
+    }
     weakself
     [CNCCollectionPresent loadCollectionNewsWithPage:_pageNo succeed:^(NSArray *dataArr) {
             [QMUITips hideAllTipsInView:AppKeyWindow];
@@ -58,6 +71,7 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
         }
         }
+        [weakSelf.emptyView removeFromSuperview];
         weakSelf.tableView.mj_footer.hidden = weakSelf.data.count == 0;
         [weakSelf.tableView reloadData];
     } error:^{
@@ -79,12 +93,8 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
 }
 #pragma mark - Networking
-- (void)cn_noNetworking {
-    [self showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_wifi_no"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
-    [self setCNNoNetworkingEmptyView];
-}
-
 - (void)cn_wifiOrWWANNetworking {
+    self.pageNo = 1;
     [self loadData];
 }
@@ -94,8 +104,6 @@ static NSString * const kCNLiveWebViewForCollectionRefreshKey = @&quot;kCNLiveWebView
         if(self.data.count > 0){
             _pageNo = 1;
             _isRefreshing = NO;
-            [self.data removeAllObjects];
-
         }
         [self loadData];
@@ -24,6 +24,19 @@
     NSLog(@"收藏销毁了");
 }
 - (void)requestData:(NSInteger)pageNumber{
+    if (![CNLiveBusinessTools connectedToNetwork]) {
+        if (self.data.count == 0) {
+            [self.tableView.mj_footer endRefreshing];
+            [self showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_wifi_no"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
+            [self setCNAPIErrorEmptyView];
+            self.tableView.mj_footer.hidden = self.data.count == 0;
+            
+        }else{
+            [QMUITips showInfo:@"无法连接网络"];
+        }
+            
+            return;
+    }
     weakself
     [CNCCollectionPresent loadCollectGoods:pageNumber succeed:^(NSArray *dataArr) {
         [self hideEmptyView];
@@ -57,7 +70,9 @@
         if (weakSelf.data.count == 0) {
             [weakSelf showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_wifi_no"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
             [weakSelf setCNAPIErrorEmptyView];
-            weakSelf.tableView.mj_footer.hidden = self.data.count == 0;
+            [weakSelf.data removeAllObjects];
+            weakSelf.tableView.mj_footer.hidden = weakSelf.data.count == 0;
+            [weakSelf.tableView reloadData];
         }
     }];
 }
@@ -87,10 +102,6 @@
 }
 #pragma mark - Networking
-- (void)cn_noNetworking {
-    [self showEmptyViewWithImage:[UIImage imageNamed:@"c_mine_wifi_no"] text:@"无法连接网络" detailText:@"别紧张，试试看刷新页面~" buttonTitle:@"     重试     " buttonAction:@selector(loadData)];
-    [self setCNNoNetworkingEmptyView];
-}
 - (void)cn_wifiOrWWANNetworking {
     [self loadData];
@@ -111,7 +111,7 @@
 }
 -(CGSize)collectionView:(UICollectionView*)collectionView layout:(UICollectionViewLayout*)collectionViewLayout referenceSizeForHeaderInSection:(NSInteger)section
 {
-    return CGSizeMake(kScreenWidth, self.announModel ? 310 : 260);
+    return CGSizeMake(kScreenWidth, self.announModel ? 260 + 50 *RATIO : 210 + 50*RATIO);
 }
 - (UICollectionReusableView *)collectionView:(UICollectionView *)collectionView viewForSupplementaryElementOfKind:(NSString*)kind atIndexPath:(NSIndexPath*)indexPath {
     // 判断返回表头类型 还是表尾类型
@@ -162,4 +162,8 @@
 - (void)skipType:(NSString*)type to:(NSString*)to shopType:(NSString*)shopType currentVC:(UIViewController*)currentVC{
 }
+///base64加密
+- (NSString *)base64StringDecrypt:(NSString *)str encryptKey:(NSString *)encryptKey{
+    return str;
+}
 @end