1、更换图标；

2、修复由首页跳转下页后返回一定概率崩溃的问题；
3、首页“为你推荐”列表及任务大厅列表添加点击等待提示框；
4、领取任务页面布局调整修复列表显示不全的bug；
5、个人资料页添加等待提示框；

Author: 秦程 MacBook Pro

Podfile

@@ -1,4 +1,3 @@
-source 'https://github.com/CocoaPods/Specs.git'
 platform :ios,'9.0'
 use_frameworks!
 target'taskApp' do

taskApp/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,62 +1,62 @@
 {
   "images" : [
     {
-      "size" : "20x20",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "20x20",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "40x40",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "size" : "60x60",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "1024x1024",
+      "filename" : "icon.png",
       "idiom" : "ios-marketing",
-      "filename" : "logostore_1024pt.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

taskApp/Assets.xcassets/AppIcon.appiconset/[email protected]

@@ -195,27 +195,30 @@ - (CGFloat)collectionView:(UICollectionView *)collectionView layout:(UICollectio
     return 1;
 }
 -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPath:(NSIndexPath *)indexPath{
+    [self showDGActView];
     ListModel * model =self.listArr[indexPath.row];
     [HttpTool get:API_POST_taskInfo dic:@{@"id":model.listID} success:^(id  _Nonnull responce) {
-        if ([responce[@"code"] intValue]==200) {
+        [self stopDGActView];
+        if ([responce[@"code"] intValue] == 200) {
             if ([responce[@"data"][@"cateid"] intValue]==1) {
-                
                 RegisDetailVC * VC =[[RegisDetailVC alloc]init];
                 VC.hidesBottomBarWhenPushed=YES;
                 VC.homeIndex=101;
                 VC.dataDic =responce[@"data"];
                 [self.navigationController pushViewController:VC animated:YES];
-                
-            }else{
+            }else {
                 OrdinaryVC * VC =[[OrdinaryVC alloc]init];
                 VC.hidesBottomBarWhenPushed=YES;
                 VC.dataDic =responce[@"data"];
                 VC.homeIndex=101;
                 [self.navigationController pushViewController:VC animated:YES];
             }
+        }else {
+            [self showToastInView:self.view message:responce[@"message"] duration:0.8];
         }
     } faile:^(NSError * _Nonnull erroe) {
-        
+        [self stopDGActView];
+        [self showToastInView:self.view message: @"网络错误" duration:0.8];
     }];
 }
 -(void)chuanZhiType:(int)indexType{

taskApp/Assets.xcassets/AppIcon.appiconset/[email protected]

@@ -45,7 +45,7 @@ - (void)viewDidLoad {
         make.centerX.mas_equalTo(self.view.mas_centerX);
         make.height.mas_equalTo(height(40));
         make.width.mas_equalTo(width(345));
-        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-height(80));
+        make.bottom.mas_equalTo(self.view.mas_bottom).offset(-height(34.0) - kSafeAreaBottomHeight);
     }];
     [[sureBtn rac_signalForControlEvents:UIControlEventTouchUpInside] subscribeNext:^(__kindof UIControl * _Nullable x) {
 
@@ -93,11 +93,12 @@ -(void)load_lingQu_drawTask{
 }
 -(UITableView*)tableView{
     if (!_tableView) {
-        _tableView =[[UITableView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight) style:UITableViewStyleGrouped];
+        _tableView =[[UITableView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, kScreenHeight - NavHeight) style:UITableViewStyleGrouped];
         _tableView.backgroundColor =[UIColor whiteColor];
         _tableView.separatorStyle = UITableViewCellSeparatorStyleNone;
         _tableView.delegate =self;
         _tableView.dataSource =self;
+        _tableView.tableFooterView = [[UIView alloc] initWithFrame: CGRectMake(0.0, 0.0, kScreenWidth, height(108))];
         [_tableView registerClass:[TaskDetailCell0 class] forCellReuseIdentifier:@"TaskDetailCell0"];
         [_tableView registerClass:[TaskDetailCell2 class] forCellReuseIdentifier:@"TaskDetailCell2"];
     }

taskApp/Assets.xcassets/AppIcon.appiconset/[email protected]

@@ -67,30 +67,33 @@ -(void)load_userIndex{
 
     }];
 }
--(void)load_home_index{
-    [self.coverUrlArr removeAllObjects];
-     [self.coverArr removeAllObjects];
-    [self.lableArr removeAllObjects];
+
+-(void)load_home_index {
     [HttpTool get:API_POST_Home_index dic:@{@"client":@"2"} success:^(id  _Nonnull responce) {
-        self.homenCollection.ly_emptyView =[MyDIYEmpty diyNoDataEmpty];
+        self.homenCollection.ly_emptyView = [MyDIYEmpty diyNoDataEmpty];
         [self.homenCollection.mj_header endRefreshing];
         if ([responce[@"code"] intValue]==200) {
+            [self.coverUrlArr removeAllObjects];
+            [self.coverArr removeAllObjects];
+            [self.lableArr removeAllObjects];
+            
             [responce[@"data"][@"banner"] enumerateObjectsUsingBlock:^(NSDictionary* obj, NSUInteger idx, BOOL * _Nonnull stop) {
                 [self.coverArr addObject:obj[@"cover"]];
-                 [self.coverUrlArr addObject:obj[@"url"]];
+                [self.coverUrlArr addObject:obj[@"url"]];
             }];
-            self.listArr =[ListModel mj_objectArrayWithKeyValuesArray:responce[@"data"][@"list"]];
+            self.listArr = [ListModel mj_objectArrayWithKeyValuesArray:responce[@"data"][@"list"]];
             [responce[@"data"][@"list"] enumerateObjectsUsingBlock:^(NSDictionary * dic, NSUInteger idx, BOOL * _Nonnull stop) {
                 [self.lableArr addObject:[LableModel mj_objectArrayWithKeyValuesArray:dic[@"label"]]];
             }];
-            
-            
+            [self.homenCollection reloadData];
+        }else {
+            [self showToastInView:self.view message:responce[@"message"] duration:0.8];
         }
-        [self.homenCollection reloadData];
     } faile:^(NSError * _Nonnull erroe) {
-        
+        [self showToastInView:self.view message: @"网络错误\n请稍后下拉刷新页面" duration:0.8];
     }];
 }
+
 -(UICollectionView*)homenCollection{
     if (!_homenCollection) {
          UICollectionViewFlowLayout * flow =[[UICollectionViewFlowLayout alloc]init];
@@ -138,12 +141,10 @@ - (__kindof UICollectionViewCell *)collectionView:(UICollectionView *)collection
     else{
         HomeCell4 * cell4=[collectionView dequeueReusableCellWithReuseIdentifier:@"HomeCell4" forIndexPath:indexPath];
 
-        cell4.backgroundColor =BassColor(255,255,255);
-        if (self.listArr.count==0) {
-            
-        }else{
+        cell4.backgroundColor = BassColor(255,255,255);
+        if (indexPath.row < self.lableArr.count) {
             ListModel * model =self.listArr[indexPath.row];
-            cell4.numLable.text =[NSString stringWithFormat:@"%ld",indexPath.row+1];
+            cell4.numLable.text =[NSString stringWithFormat:@"%ld",indexPath.row + 1];
             [cell4 chuanZhiListModel:model modelArr:self.lableArr[indexPath.row]];
         }
 
@@ -223,47 +224,49 @@ -(void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPat
         VC.mmodel=self.cellModel;
         [self.navigationController pushViewController:VC animated:YES];
     }else if (self.listArr.count > indexPath.row) {
+        [self showDGActView];
         ListModel * model = self.listArr[indexPath.row];
         [HttpTool get:API_POST_taskInfo dic:@{@"id":model.listID} success:^(id  _Nonnull responce) {
+            [self stopDGActView];
             if ([responce[@"code"] intValue]==200) {
                 if ([responce[@"data"][@"cateid"] intValue]==1) {
-                    
                     RegisDetailVC * VC =[[RegisDetailVC alloc]init];
                     VC.hidesBottomBarWhenPushed=YES;
-                    VC.dataDic =responce[@"data"];
-                    VC.homeIndex=102;
+                    VC.dataDic = responce[@"data"];
+                    VC.homeIndex = 102;
                     [self.navigationController pushViewController:VC animated:YES];
-                    
-                }else{
+                }else {
                     OrdinaryVC * VC =[[OrdinaryVC alloc]init];
                     VC.hidesBottomBarWhenPushed=YES;
                     VC.homeIndex=102;
                     VC.dataDic =responce[@"data"];
                     [self.navigationController pushViewController:VC animated:YES];
                 }
+            }else {
+                [self showToastInView:self.view message: @"暂时无法查看" duration:0.8];
             }
         } faile:^(NSError * _Nonnull erroe) {
-            
+            [self stopDGActView];
+            [self showToastInView:self.view message: @"网络错误，暂时无法查看" duration:0.8];
         }];
     }
 }
--(void)clickBtn{
+
+-(void)clickBtn {
 
 }
-/*
-#pragma mark - Navigation
 
-// In a storyboard-based application, you will often want to do a little preparation before navigation
-- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
-    // Get the new view controller using [segue destinationViewController].
-    // Pass the selected object to the new view controller.
-}
-*/
--(void)goToWeb:(NSInteger)index{
-    HomeWebViC * webVC =[[HomeWebViC alloc]init];
-   // webVC.name = @"用户协议";
-    webVC.urlStr = self.coverUrlArr[index];
-    webVC.hidesBottomBarWhenPushed =YES;
-    [self.navigationController pushViewController:webVC animated:YES];
+-(void)goToWeb:(NSInteger)index {
+    if (index < self.coverUrlArr.count) {
+        NSString* urlStr = self.coverUrlArr[index];
+        if ([[UIApplication sharedApplication] canOpenURL: [NSURL URLWithString: urlStr]]) {
+            HomeWebViC * webVC =[[HomeWebViC alloc]init];
+            webVC.urlStr = urlStr;
+            webVC.hidesBottomBarWhenPushed = YES;
+            [self.navigationController pushViewController:webVC animated:YES];
+            return;
+        }
+    }
+    [self showToastInView:self.view message: @"无法打开该页面" duration: 0.8];
 }
 @end

taskApp/Assets.xcassets/AppIcon.appiconset/[email protected]

@@ -25,15 +25,14 @@ - (void)viewDidLoad {
     self.view.backgroundColor =BassColor(241, 241, 241);
     [self setLeftButton:@"" imgStr:@"2fanhui" selector:@selector(goToBack)];
     // 正文
-      UIWebView *webView = [[UIWebView alloc] init];
-        webView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight);
-
+    UIWebView *webView = [[UIWebView alloc] init];
+    webView.frame = CGRectMake(0, 0, kScreenWidth, kScreenHeight);
+    
 
     webView.delegate = self;
     webView.scrollView.scrollEnabled = YES;
     [self.view addSubview:webView];
     _webView = webView;
-  
 
     if (@available(iOS 11.0, *)) {
 

taskApp/Assets.xcassets/AppIcon.appiconset/[email protected]

@@ -10,6 +10,8 @@
 #import "PersinDataCell1.h"
 #import "PersinDataCell0.h"
 #import "RealNameVC.h"
+#import "UIView+Toast.h"
+
 @interface PersonalDataVC ()<UIImagePickerControllerDelegate,UINavigationControllerDelegate,UITableViewDelegate,UITableViewDataSource,PersinDataCell0Delegate>
 @property(nonatomic,strong)UITableView * tableView;
 @property(nonatomic,strong)NSDictionary * dataDic;
@@ -23,6 +25,7 @@ @implementation PersonalDataVC
 -(void)clickBtn{
     [self.navigationController popViewControllerAnimated:YES];
 }
+
 - (void)viewDidLoad {
     [super viewDidLoad];
     self.view.backgroundColor =BassColor(241, 241, 241);
@@ -95,21 +98,32 @@ -(void)load_API_POST_userUpdate{
         [self showToastInView:self.view message:@"网络错误" duration:0.8];
     }];
 }
+
 -(void)load_userIndex{
+    [self showDGActView];
     [HttpTool get:API_POST_userIndex dic:@{} success:^(id  _Nonnull responce) {
+        [self stopDGActView];
         if ([responce[@"code"] intValue]==200) {
             self.dataDic = responce[@"data"];
             NSData *data = [NSData dataWithContentsOfURL:[NSURL URLWithString:responce[@"data"][@"headimg"]]];
             self.img=[UIImage imageWithData:data];
-        }else{
-            
+            [self.tableView reloadData];
+        }else {
+            [self.view hideAllToasts];
+            [self.view makeToast: responce[@"message"] duration:0.8 position:CSToastPositionCenter title:nil image:nil style:nil completion:^(BOOL didTap) {
+                [self.navigationController popViewControllerAnimated:true];
+            }];
         }
-        [self.tableView reloadData];
     } faile:^(NSError * _Nonnull erroe) {
-        
+        [self stopDGActView];
+        [self.view hideAllToasts];
+        [self.view makeToast: @"网络错误" duration:0.8 position:CSToastPositionCenter title:nil image:nil style:nil completion:^(BOOL didTap) {
+            [self.navigationController popViewControllerAnimated:true];
+        }];
     }];
 }
--(UITableView*)tableView{
+
+-(UITableView*)tableView {
     if (!_tableView) {
         _tableView =[[UITableView alloc]initWithFrame:CGRectMake(0, 0, kScreenWidth, height(435)) style:UITableViewStyleGrouped];
         _tableView.backgroundColor =BassColor(241, 241, 241);