code review

GMPhobos/Classes/NewPhobos.m

@@ -420,14 +420,15 @@ static NewPhobos *_sharedClient;
  * 处理发送数据
  */
 + (void)disposeSendDataWithImmediately:(BOOL)immediately {
-    NSArray<PhobosSendDataEntity *> *entities = [PhobosDataManager fetchToBeSendDataEntities];
-    if (immediately || entities.count >= PhobosShardCount) {
-        [PhobosDataManager updateDataEntities:entities sendStatus:PhobosDataSendStatusSending];
-        [PhobosSendManager sendDataWithEntities:entities completion:^(NSArray<PhobosSendDataEntity *> * _Nonnull finishEntities, NSInteger code) {
-            [PhobosDataManager updateDataEntities:finishEntities sendStatus:(code == 200 ? PhobosDataSendStatusFinish : PhobosDataSendStatusError)];
+    NSInteger count = [PhobosDataManager fetchCountOfToBeSendEntities];
+    if (immediately || count >= PhobosShardCount) {
+        [PhobosDataManager fetchToBeSendDataEntitiesWithEntitiesBlock:^(NSArray<PhobosSendDataEntity *> *entities) {
+            [PhobosDataManager updateDataEntities:entities sendStatus:PhobosDataSendStatusSending];
+            [PhobosSendManager sendDataWithEntities:entities completion:^(NSArray<PhobosSendDataEntity *> * _Nonnull finishEntities, NSInteger code) {
+                [PhobosDataManager updateDataEntities:finishEntities sendStatus:(code == 200 ? PhobosDataSendStatusFinish : PhobosDataSendStatusError)];
+            }];
         }];
     }
-    
 }
 
 @end
@@ -441,7 +442,14 @@ static NewPhobos *_sharedClient;
 
 /** 获取待发送埋点数据, 用同步来保障异步获取数据 */
 + (NSArray *)fetchToBeSendPhobosData {
-    return [PhobosDataManager fetchToBeSendDataEntities];
+    dispatch_semaphore_t semaphore = dispatch_semaphore_create(0);
+    __block NSArray<PhobosSendDataEntity *> *entityArray;
+    [PhobosDataManager fetchToBeSendDataEntitiesWithEntitiesBlock:^(NSArray<PhobosSendDataEntity *> *entities) {
+        entityArray = entities;
+        dispatch_semaphore_signal(semaphore);
+    }];
+    dispatch_semaphore_wait(semaphore, DISPATCH_TIME_FOREVER);
+    return entityArray;
 }
 
 /** 清除待发送埋点数据缓存 */

GMPhobos/Classes/PhobosDataManager.h

@@ -21,12 +21,12 @@ typedef NS_ENUM(NSInteger, PhobosDataSendStatus) {
 @interface PhobosDataManager : NSObject
 
 /** 获取待发送数据，包含待发送数据和发送失败数据 */
-+ (NSArray<PhobosSendDataEntity *> *)fetchToBeSendDataEntities;
++ (void)fetchToBeSendDataEntitiesWithEntitiesBlock:(nonnull void (^)(NSArray<PhobosSendDataEntity *> *entities))entitiesBlock;
 
 /**
  * 通过 searchFilter 获取数据
  */
-+ (NSArray<PhobosSendDataEntity *> *)fetchDataEntitiesWithPredicate:(NSPredicate *)searchFilter;
++ (void)fetchDataEntitiesWithPredicate:(NSPredicate *)searchFilter entitiesBlock:(nonnull void (^)(NSArray<PhobosSendDataEntity *> *entities))entitiesBlock;
 
 /**
  * 获取待发送和发送失败的数据数量
@@ -36,7 +36,7 @@ typedef NS_ENUM(NSInteger, PhobosDataSendStatus) {
 /**
  * 通过 searchFilter 获取数据数量
  */
-+ (NSUInteger)fetchCountOfEntities;
++ (NSUInteger)fetchCountOfEntitiesWithPredicate:(NSPredicate *)searchFilter;
 
 /**
  * 插入埋点数据

GMPhobos/Classes/PhobosDataManager.m

@@ -46,27 +46,30 @@ static dispatch_semaphore_t phobos_rd_semaphore_t;
         
         /** 将上次没有获取到发送结果的数据的状态修改为发送失败，待下次重新发送 */
         NSPredicate *predicate = [NSPredicate predicateWithFormat:@"status = %d", PhobosDataSendStatusSending];
-        NSArray<PhobosSendDataEntity *> *entities = [self fetchDataEntitiesWithPredicate:predicate];
-        [self updateDataEntities:entities sendStatus:PhobosDataSendStatusError];
+        [self fetchDataEntitiesWithPredicate:predicate entitiesBlock:^(NSArray<PhobosSendDataEntity *> *entities) {
+            [self updateDataEntities:entities sendStatus:PhobosDataSendStatusError];
+        }];
         
         /** 将发送成功的数据删除 */
         NSPredicate *finishPredicate = [NSPredicate predicateWithFormat:@"status = %d", PhobosDataSendStatusFinish];
-//        [PhobosSendDataEntity MR_deleteAllMatchingPredicate:finishPredicate];
-        NSArray<PhobosSendDataEntity *> *finishEntities = [self fetchDataEntitiesWithPredicate:finishPredicate];
-        [self deleteDataEntities:finishEntities];
+        [self fetchDataEntitiesWithPredicate:finishPredicate entitiesBlock:^(NSArray<PhobosSendDataEntity *> *entities) {
+            [self deleteDataEntities:entities];
+        }];
     });
 }
 
-+ (NSArray<PhobosSendDataEntity *> *)fetchToBeSendDataEntities {
++ (void)fetchToBeSendDataEntitiesWithEntitiesBlock:(void (^)(NSArray<PhobosSendDataEntity *> *))entitiesBlock {
     NSPredicate *predicate = [NSPredicate predicateWithFormat:@"status = %d or status = %d", PhobosDataSendStatusToBeSend, PhobosDataSendStatusError];
-    return [self fetchDataEntitiesWithPredicate:predicate];
+    [self fetchDataEntitiesWithPredicate:predicate entitiesBlock:entitiesBlock];
 }
 
-+ (NSArray<PhobosSendDataEntity *> *)fetchDataEntitiesWithPredicate:(NSPredicate *)searchFilter {
++ (void)fetchDataEntitiesWithPredicate:(NSPredicate *)searchFilter entitiesBlock:(nonnull void (^)(NSArray<PhobosSendDataEntity *> *))entitiesBlock {
     dispatch_semaphore_wait(phobos_semaphore_t, DISPATCH_TIME_FOREVER);
     NSArray<PhobosSendDataEntity *> *entities = [PhobosSendDataEntity MR_findAllWithPredicate:searchFilter inContext:PhobosDefaultContext];
+    if (entitiesBlock) {
+        entitiesBlock(entities);
+    }
     dispatch_semaphore_signal(phobos_semaphore_t);
-    return entities;
 }
 
 + (NSUInteger)fetchCountOfToBeSendEntities {