add

coderZsq · Feb 27, 2019 · ca57a90 · ca57a90
1 parent 7d24dd9
commit ca57a90
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 17 deletions.
diff --git a/...m/SQFitnessProgram_Viper/Classes/TrainingCapacity/Service/SQTrainingCapacityDataManager.m b/...m/SQFitnessProgram_Viper/Classes/TrainingCapacity/Service/SQTrainingCapacityDataManager.m
@@ -55,7 +55,7 @@ - (void)fetchDataSourceWithTitle:(NSString *)title type:(SQTrainingCapacityMuscl
     NSAssert([NSThread isMainThread], @"main thread only, otherwise use lock to make thread safety");
     SQTrainingCapacityDataBase * dataBase = [SQSqliteModelTool queryModels:self.dataBase.class columnName:@"key" relation:(ColumnNameToValueRelationTypeEqual) value:[NSString stringWithFormat:@"%ld-%@", type, title] uid:nil].firstObject;
     if (!dataBase) {
-        [self addTrainingActionWithCompletion:nil];
+        [self addTrainingAction];
         return;
     }
     NSMutableArray * dataSource = [NSMutableArray array];
@@ -104,13 +104,10 @@ - (void)storeDataSourceWithTitle:(NSString *)title type:(SQTrainingCapacityMuscl
     [SQSqliteModelTool saveOrUpdateModel:self.dataBase uid:nil];
 }
 
-- (void)addTrainingActionWithCompletion:(void(^)(void))completion {
+- (void)addTrainingAction {
     SQTrainingCapacityCellPresenter * p = [SQTrainingCapacityCellPresenter new];
     p.model = [SQTrainingCapacityModel new];
     [self.data addObject:p];
-    if (completion) {
-        completion();
-    }
 }
 
 @end
diff --git a/...m/SQFitnessProgram_Viper/Classes/TrainingCapacity/Service/SQTrainingCapacityDataService.h b/...m/SQFitnessProgram_Viper/Classes/TrainingCapacity/Service/SQTrainingCapacityDataService.h
@@ -18,6 +18,6 @@
 
 - (void)storeDataSourceWithTitle:(NSString *)title type:(SQTrainingCapacityMuscleType)type dataSource:(nonnull NSArray *)dataSource completion:(nonnull void (^)(void))completion;
 
-- (void)addTrainingActionWithCompletion:(void(^)(void))completion;
+- (void)addTrainingAction;
 
 @end
diff --git a/...essProgram_Viper/Classes/TrainingCapacity/Viper/Interactor/SQTrainingCapacityInteractor.m b/...essProgram_Viper/Classes/TrainingCapacity/Viper/Interactor/SQTrainingCapacityInteractor.m
@@ -45,12 +45,8 @@ - (void)storeDataSourceWithTitle:(NSString *)title type:(SQTrainingCapacityMuscl
     }];
 }
 
-- (void)addTrainingActionWithCompletion:(void (^)(void))completion {
-    [self.trainingCapacityDataService addTrainingActionWithCompletion:^{
-        if (completion) {
-            completion();
-        }
-    }];
+- (void)addTrainingAction {
+    [self.trainingCapacityDataService addTrainingAction];
 }
 
 @end
diff --git a/...ogram_Viper/Classes/TrainingCapacity/Viper/Interactor/SQTrainingCapacityInteractorInput.h b/...ogram_Viper/Classes/TrainingCapacity/Viper/Interactor/SQTrainingCapacityInteractorInput.h
@@ -19,7 +19,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (void)storeDataSourceWithTitle:(NSString *)title type:(SQTrainingCapacityMuscleType)type dataSource:(nonnull NSArray *)dataSource;
 
-- (void)addTrainingActionWithCompletion:(void(^)(void))completion;
+- (void)addTrainingAction;
 
 - (NSArray *)fetchDataSource;
 

diff --git a/...tnessProgram_Viper/Classes/TrainingCapacity/Viper/Presenter/SQTrainingCapacityPresenter.m b/...tnessProgram_Viper/Classes/TrainingCapacity/Viper/Presenter/SQTrainingCapacityPresenter.m
@@ -62,10 +62,8 @@ - (NSArray *)fetchDataSourceFromDB {
 }
 
 - (void)didTouchNavigationBarAddButton {
-    __weak typeof(self) _self = self;
-    [self.interactor addTrainingActionWithCompletion:^{
-        [_self.view setupTableView];
-    }];
+    [self.interactor addTrainingAction];
+    [self.view setupTableView];
 }
 
 - (void)keyboardWillShow:(NSNotification *)sender {