首页请求接口合并处理

cgx
Commit b8cc029b 由 cgx 编写于 2022-06-17 11:36:22 +0800
DreamSleep/DreamSleep.xcodeproj/project.pbxproj
DreamSleep/DreamSleep/Basement/Network/DSNetworkTool.m
DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
--- a/DreamSleep/DreamSleep.xcodeproj/project.pbxproj
查看文件 @b8cc029
+++ b/DreamSleep/DreamSleep.xcodeproj/project.pbxproj
查看文件 @b8cc029
@@ -2276,7 +2276,7 @@
 				CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepDebug.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 4NDZ6UX8PW;
 				ENABLE_BITCODE = NO;
@@ -2347,7 +2347,7 @@
 				CODE_SIGN_ENTITLEMENTS = DreamSleep/DreamSleep.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEVELOPMENT_TEAM = 4NDZ6UX8PW;
 				ENABLE_BITCODE = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2478,7 +2478,7 @@
 				CODE_SIGN_ENTITLEMENTS = DreamSleep/Basement/DSConfig/DreamSleepBeta.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 8;
+				CURRENT_PROJECT_VERSION = 9;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				DEVELOPMENT_TEAM = 4NDZ6UX8PW;
 				ENABLE_BITCODE = NO;

--- a/DreamSleep/DreamSleep/Basement/Network/DSNetworkTool.m
查看文件 @b8cc029
+++ b/DreamSleep/DreamSleep/Basement/Network/DSNetworkTool.m
查看文件 @b8cc029
@@ -66,7 +66,9 @@ NSString * const NetworkUnableError = @"网络不给力，请检查您的网络
                                                      success:(void (^)(NSDictionary *apiDic))success
                                                      failure:(void (^)(id failure))failure
 {
+    dispatch_async(dispatch_get_main_queue(), ^{
        [[UIApplication sharedApplication] setNetworkActivityIndicatorVisible:hasNetActivity];
+    });
    if (loadingInfo) {
        view ? [DSProgressHUD showProgressHUDWithInfo:loadingInfo inView:view] : [DSProgressHUD showProgressHUDWithInfo:loadingInfo];
    }

--- a/DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
查看文件 @b8cc029
+++ b/DreamSleep/DreamSleep/Class/HomeModule/Home/Controller/HomeViewController.m
查看文件 @b8cc029
@@ -22,6 +22,14 @@
 @property (nonatomic, strong) DSHomeView *homeTV;
 @property (nonatomic, strong) RescuePlanView *rescuePlanView;
 @property (nonatomic, strong) NoisePlayBar *noisePlayBar;
+/// banner列表数据
+@property (nonatomic, strong) NSArray *bannerListData;
+/// 舒眠课程列表数据
+@property (nonatomic, strong) NSArray *safeListData;
+/// 助眠音乐列表数据
+@property (nonatomic, strong) NSArray *helpListData;
+/// 所有白噪音类型数据
+@property (nonatomic, strong) NSArray *noiseTypeArr;
 @end
 @implementation HomeViewController
@@ -108,37 +116,87 @@
 #pragma mark - banner、舒眠课程、助眠音乐数据获取
 - (void)requestHomeData {
+    WS(weakSelf);
    self.homeTV.mj_header = [DSGifHeader headerWithRefreshingBlock:^{
+        [weakSelf muiltiRequest];
+    }];
+    [self.homeTV.mj_header beginRefreshing];
+}
+- (void)muiltiRequest {
+    // 创建信号量
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    // 创建全局并行
+    dispatch_queue_t queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
+    dispatch_group_t group = dispatch_group_create();
+    dispatch_group_async(group, queue, ^{
        // 获取首页banner数据
        [HomeRequestModel queryBannerListWithCompletion:^(HomeRequestModel * _Nonnull requestModel) {
-            [self.homeTV.mj_header endRefreshing];
            if (requestModel.resCode == DSResCodeSuccess) {
-                [self.homeTV refreshBarnner:requestModel.bannerListData];
+                DSLog(@"获取首页banner数据成功...");
+                dispatch_semaphore_signal(semaphore);
+                self.bannerListData = requestModel.bannerListData;
+            } else {
+                [self.homeTV.mj_header endRefreshing];
            }
        }];
+    });
+    dispatch_group_async(group, queue, ^{
        // 获取首页舒眠课程数据
        [SafeSleepRequestModel getCourseListDataWithSubID:6 isHome:YES completion:^(SafeSleepRequestModel * _Nonnull requestModel) {
-            [self.homeTV.mj_header endRefreshing];
            if (requestModel.resCode == DSResCodeSuccess) {
-                [self.homeTV updateCourseMusicCell:CellTypeCourse data:requestModel.courseListData];
+                DSLog(@"获取首页舒眠课程数据成功...");
+                dispatch_semaphore_signal(semaphore);
+                self.safeListData = requestModel.courseListData;
+            } else {
+                [self.homeTV.mj_header endRefreshing];
            }
        }];
+    });
+    dispatch_group_async(group, queue, ^{
        // 获取首页助眠音乐数据
        [SafeSleepRequestModel getCourseListDataWithSubID:18 isHome:YES completion:^(SafeSleepRequestModel * _Nonnull requestModel) {
            [self.homeTV.mj_header endRefreshing];
            if (requestModel.resCode == DSResCodeSuccess) {
-                [self.homeTV updateCourseMusicCell:CellTypeMusic data:requestModel.courseListData];
+                NSLog(@"获取首页助眠音乐数据成功...");
+                dispatch_semaphore_signal(semaphore);
+                self.helpListData = requestModel.courseListData;
+            } else {
+                [self.homeTV.mj_header endRefreshing];
            }
        }];
+    });
+    dispatch_group_async(group, queue, ^{
        // 获取白噪音类型请求
        [WhiteNoiseRequestModel queryRelaxWhiteNoiseTypeWithCompletion:^(WhiteNoiseRequestModel * _Nonnull requestModel) {
            [self.homeTV.mj_header endRefreshing];
            if (requestModel.resCode == DSResCodeSuccess) {
-                [self.homeTV updateNoiseAllTypeData:requestModel.noiseTypeArr];
+                NSLog(@"获取白噪音类型请求成功...");
+                dispatch_semaphore_signal(semaphore);
+                self.noiseTypeArr = requestModel.noiseTypeArr;
+            } else {
+                [self.homeTV.mj_header endRefreshing];
            }
        }];
-    }];
+    });
-    [self.homeTV.mj_header beginRefreshing];
+    dispatch_group_notify(group, queue, ^{
+        // 四个请求对应四次信号等待
+        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+        dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+        // 在这里进行请求后的方法，回到主线程
+        dispatch_async(dispatch_get_main_queue(), ^{
+            // 更新UI操作
+            [self.homeTV refreshBarnner:self.bannerListData];
+            [self.homeTV updateCourseMusicCell:CellTypeCourse data:self.safeListData];
+            [self.homeTV updateCourseMusicCell:CellTypeMusic data:self.helpListData];
+            [self.homeTV updateNoiseAllTypeData:self.noiseTypeArr];
+        });
+    });
 }
 #pragma mark - APP首次启动弹框