RAUploadManager.m 22 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601602603604605606607608609610611612613614615616617618619620621622623624625626627628629630631632633634635636637638639640641642643644645646647648649650651652653654655656657658659660661662663664665666667668669670671672673674675676677678679680681682683684685686687688689690691692693694695696697698699700701
  1. //
  2. // RAUploadManager.m
  3. // test_autolayout
  4. //
  5. // Created by Ray on 02/05/2017.
  6. // Copyright © 2017 USAI. All rights reserved.
  7. //
  8. #import <UIKit/UIKit.h>
  9. #import "RAUploadManager.h"
  10. #import "NetworkUtils.h"
  11. #import "RAUtils.h"
  12. NSString *const kUploadSetting = @"UploadSettingKey";
  13. NSString *const UPLOAD_FINISH_NOTIFICATION = @"upload_finish_notification";
  14. NSString *const UPLOAD_COUNT_CHANGE_NOTIFICATION = @"upload_count_change_notification";
  15. NSString *const UPLOAD_REFRESH_UI_NOTIFICATION = @"upload_refresh_ui_notification";
  16. @interface RAUploadManager ()
  17. @property (nonatomic,strong) NSTimer *retryTimer;
  18. @property (nonatomic,strong) NSMutableArray<RAUploadOperation *> *retryArr;
  19. @property (nonatomic,assign) BOOL isNotReachable;
  20. @end
  21. @implementation RAUPloadManagerConfigure
  22. - (instancetype)init {
  23. if (self = [super init]) {
  24. NSDictionary *param = [[NSUserDefaults standardUserDefaults] objectForKey:kUploadSetting];
  25. if (param) {
  26. BOOL autoUpload = [[param objectForKey:@"auto_upload"] boolValue];
  27. BOOL autoRmFinish = [[param objectForKey:@"auto_rm_finish"] boolValue];
  28. BOOL autoRmErr = [[param objectForKey:@"auto_rm_error"] boolValue];
  29. BOOL onlyWiFi = [[param objectForKey:@"only_wifi"] boolValue];
  30. BOOL monitorNetwork = [[param objectForKey:@"monitor_network"] boolValue];
  31. int retryCount = [[param objectForKey:@"retry_count"] intValue];
  32. NSNumber *timeInterval = [param objectForKey:@"retry_time_interval"];
  33. if (timeInterval != nil) {
  34. self.retryTimeIntetval = [timeInterval intValue];
  35. } else {
  36. self.retryTimeIntetval = 300;
  37. }
  38. self.autoUpload = autoUpload;
  39. self.autoRemoveFinish = autoRmFinish;
  40. self.autoRemoveError = autoRmErr;
  41. self.retryCount = retryCount;
  42. self.onlyWIFI = onlyWiFi;
  43. self.monitorNetwork = monitorNetwork;
  44. } else {
  45. self.autoUpload = YES;
  46. self.autoRemoveFinish = NO;
  47. self.autoRemoveError = NO;
  48. self.retryCount = 5;
  49. self.onlyWIFI = NO;
  50. self.retryTimeIntetval = 300;
  51. self.monitorNetwork = YES;
  52. }
  53. }
  54. return self;
  55. }
  56. - (void)save {
  57. NSDictionary *param = @{
  58. @"auto_upload" : @(self.autoUpload),
  59. @"auto_rm_finish" : @(self.autoRemoveFinish),
  60. @"auto_rm_error" : @(self.autoRemoveError),
  61. @"retry_count" : @(self.retryCount),
  62. @"only_wifi" : @(self.onlyWIFI),
  63. @"retry_time_interval" : @(self.retryTimeIntetval),
  64. @"monitor_network" : @(self.monitorNetwork)
  65. };
  66. [[NSUserDefaults standardUserDefaults] setObject:param forKey:kUploadSetting];
  67. [[NSUserDefaults standardUserDefaults] synchronize];
  68. }
  69. @end
  70. @implementation RAUploadManager
  71. + (void)configureUploadManager:(void(^)(RAUPloadManagerConfigure *configure))configure {
  72. if (configure) {
  73. RAUPloadManagerConfigure *cfg = [[RAUPloadManagerConfigure alloc] init];
  74. configure(cfg);
  75. [cfg save];
  76. }
  77. }
  78. /*!
  79. * Called by Reachability whenever status changes.
  80. */
  81. - (void) reachabilityChanged:(NSNotification *)note
  82. {
  83. [self handleReachability:self.reach];
  84. }
  85. - (void)handleReachability:(Reachability *)reachability {
  86. NetworkStatus netStatus = [reachability currentReachabilityStatus];
  87. if (self.monitorNetwork) {
  88. if (netStatus == NotReachable) { // 网络断开
  89. self.isNotReachable = YES;
  90. [self.retryArr removeAllObjects];
  91. [self stopAllTasks];
  92. } else if ((self.onlyWiFi && netStatus != ReachableViaWiFi)) { // 网络连接正常,但是onlyWifi
  93. self.isNotReachable = NO;
  94. [self.retryArr removeAllObjects];
  95. [self stopAllTasks];
  96. } else { // 网络正常连接
  97. if (self.isNotReachable) { // 重启任务
  98. [self restartAllTask];
  99. }
  100. self.isNotReachable = NO;
  101. }
  102. } else {
  103. if ((self.onlyWiFi && netStatus != ReachableViaWiFi)) {
  104. DebugLog(@"not wifi & stop task");
  105. [self.retryArr removeAllObjects];
  106. [self stopAllTasks];
  107. }
  108. }
  109. }
  110. - (instancetype)init {
  111. if (self = [super init]) {
  112. /*
  113. Observe the kNetworkReachabilityChangedNotification. When that notification is posted, the method reachabilityChanged will be called.
  114. */
  115. [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
  116. NSString *remoteHostName = @"www.apple.com";
  117. self.reach = [Reachability reachabilityWithHostName:remoteHostName];
  118. [self.reach startNotifier];
  119. [self handleReachability:self.reach];
  120. self.queue_status = QueueStatusDefault;
  121. NSDictionary *param = [[NSUserDefaults standardUserDefaults] objectForKey:kUploadSetting];
  122. if (param) {
  123. BOOL autoUpload = [[param objectForKey:@"auto_upload"] boolValue];
  124. BOOL autoRmFinish = [[param objectForKey:@"auto_rm_finish"] boolValue];
  125. BOOL autoRmErr = [[param objectForKey:@"auto_rm_error"] boolValue];
  126. BOOL onlyWiFi = [[param objectForKey:@"only_wifi"] boolValue];
  127. int retryCount = [[param objectForKey:@"retry_count"] intValue];
  128. NSNumber *timeInterval = [param objectForKey:@"retry_time_interval"];
  129. BOOL monitorNetwork = [[param objectForKey:@"monitor_network"] boolValue];
  130. if (timeInterval != nil) {
  131. self.retryTimeInterval = [timeInterval intValue];
  132. } else {
  133. self.retryTimeInterval = 300;
  134. }
  135. self.autoStart = autoUpload;
  136. self.removeFinish = autoRmFinish;
  137. // self.removeError = autoRmErr;
  138. self.maxRetry = retryCount;
  139. self.onlyWiFi = onlyWiFi;
  140. self.monitorNetwork = monitorNetwork;
  141. } else {
  142. self.autoStart = YES;
  143. self.removeFinish = NO;
  144. // self.removeError = NO;
  145. self.maxRetry = 5;
  146. self.onlyWiFi = NO;
  147. self.retryTimeInterval = 300;
  148. self.monitorNetwork = YES;
  149. }
  150. self.newtaskStatus = TaskStatusWait;
  151. self.maxThread = 3;
  152. // self.autoStart = true;
  153. // self.removeError=true;
  154. // self.removeFinish = true;
  155. self.operation_queue = [NSOperationQueue new];
  156. self.operation_queue.maxConcurrentOperationCount = self.maxThread;
  157. [self.operation_queue addObserver:self
  158. forKeyPath:@"operationCount"
  159. options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld)
  160. context:@"queueFinished changed"];
  161. //load task 要在监听arr_queue之前
  162. [self loadTasks];
  163. [self addObserver:self
  164. forKeyPath:@"arr_queue"
  165. options:(NSKeyValueObservingOptionNew|NSKeyValueObservingOptionOld)
  166. context:@"arr_queue changed"];
  167. // self.arr_queue_lock = [NSLock new];
  168. // [self.arr_queue_lock lock];
  169. // [self.arr_queue_lock lock];
  170. // [self.arr_queue_lock unlock];
  171. // [self.arr_queue_lock unlock];
  172. // self.backgroundColor = [UIColor clearColor];
  173. }
  174. return self;
  175. }
  176. -(void) dealloc
  177. {
  178. [self destructRetryTimer];
  179. [[NSNotificationCenter defaultCenter] removeObserver:self name:kReachabilityChangedNotification object:nil];
  180. [self.operation_queue removeObserver:self forKeyPath:@"operationCount"];
  181. [self.operation_queue removeObserver:self forKeyPath:@"arr_queue"];
  182. }
  183. - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
  184. {
  185. if([keyPath isEqualToString:@"operationCount"])
  186. {
  187. // [self checkRetryOperations];
  188. if(self.operation_queue.operationCount == 0 && self.retryArr.count == 0)
  189. {
  190. for(NSMutableDictionary* task in self.arr_queue)
  191. {
  192. if([task[@"status"] intValue] == TaskStatusError)
  193. {
  194. self.queue_status = QueueStatusFinishWithError;
  195. return;
  196. }
  197. }
  198. self.queue_status = QueueStatusFinish;
  199. }
  200. }
  201. if([keyPath isEqualToString:@"arr_queue"])
  202. {
  203. NSArray* newqueue=[change objectForKey:NSKeyValueChangeNewKey];
  204. NSArray* oldqueue=[change objectForKey:NSKeyValueChangeOldKey];
  205. if([newqueue isKindOfClass:[NSNull class]])
  206. newqueue=nil;
  207. if([oldqueue isKindOfClass:[NSNull class]])
  208. oldqueue=nil;
  209. if(newqueue.count>oldqueue.count)
  210. {
  211. self.queue_status = QueueStatusAdd;
  212. return;
  213. }
  214. [[NSNotificationCenter defaultCenter] postNotificationName:UPLOAD_COUNT_CHANGE_NOTIFICATION object:nil];
  215. }
  216. }
  217. //-(void) upload:(NSString*) url
  218. //{
  219. // while(self.activeThread<self.maxThread)
  220. // {
  221. // bool nomore=false;
  222. // for(int i=0;i<self.arr_queue.count;i++)
  223. // {
  224. // NSMutableDictionary* task = self.arr_queue[i];
  225. //
  226. // TaskStatus ts=[task[@"status"] intValue];
  227. // if (ts==TaskStatusWait) {
  228. // self.activeThread--;
  229. // [self uploadTask:task url:url];
  230. // break;
  231. // }
  232. // if(i==self.arr_queue.count-1)
  233. // nomore=true;
  234. //
  235. // }
  236. // if(nomore)
  237. // break;
  238. // }
  239. //}
  240. -(void) addTask:(NSMutableDictionary*) task
  241. {
  242. // [self.arr_queue addObject:task];
  243. // [self.arr_queue_lock lock];
  244. // [[self mutableArrayValueForKey:@"arr_queue"] addObject:task];
  245. // [self.arr_queue_lock unlock];
  246. @synchronized(self) {
  247. // [[self mutableArrayValueForKey:@"arr_queue"] addObject:task];
  248. [[self mutableArrayValueForKey:@"arr_queue"] insertObject:task atIndex:0];
  249. }
  250. if(self.newtaskStatus==TaskStatusWait)
  251. {
  252. [self startTask:task];
  253. }
  254. // self.queue_status = QueueStatusAdd;
  255. }
  256. -(void) addTasks:(NSMutableArray*) tasks
  257. {
  258. // [self.arr_queue_lock lock];
  259. // [[self mutableArrayValueForKey:@"arr_queue"] addObjectsFromArray:tasks];
  260. // [self.arr_queue_lock unlock];
  261. @synchronized(self) {
  262. // [[self mutableArrayValueForKey:@"arr_queue"] addObjectsFromArray:tasks];
  263. // NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([self mutableArrayValueForKey:@"arr_queue"].count,tasks.count )];
  264. NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange(0,tasks.count )];
  265. [[self mutableArrayValueForKey:@"arr_queue"] insertObjects:tasks atIndexes:indexSet];
  266. }
  267. if(self.newtaskStatus==TaskStatusWait)
  268. {
  269. for(NSMutableDictionary* task in tasks)
  270. [self startTask:task];
  271. }
  272. // self.queue_status = QueueStatusAdd;
  273. }
  274. -(void) removeTasks:(NSMutableArray*) tasks
  275. {
  276. for(NSMutableDictionary* task in tasks)
  277. {
  278. [self stopTask:task];
  279. // 文件上传成功才移除文件
  280. // NSFileManager* fmanager = [NSFileManager new];
  281. // NSError* error = nil;
  282. // bool bdel=[fmanager removeItemAtPath:[self filePath:task] error:&error];
  283. // if(!bdel)
  284. // DebugLog(@"file delete failed path:%@",[self filePath:task]);
  285. }
  286. // [self.arr_queue_lock lock];
  287. // [[self mutableArrayValueForKey:@"arr_queue"] removeObjectsInArray:tasks];
  288. // [self.arr_queue_lock unlock];
  289. @synchronized(self) {
  290. // [[self mutableArrayValueForKey:@"arr_queue"] removeObjectsInArray:tasks];
  291. // NSIndexSet *indexSet = [NSIndexSet indexSetWithIndexesInRange:NSMakeRange([self mutableArrayValueForKey:@"arr_queue"].count,tasks.count )];
  292. NSIndexSet *indexSet = [self.arr_queue indexesOfObjectsPassingTest:^BOOL(id _Nonnull obj, NSUInteger idx, BOOL * _Nonnull stop)
  293. {
  294. return [tasks containsObject:obj];
  295. // return [tasks indexOfObject:obj];
  296. }];
  297. // [NSIndexSet new];
  298. // for(NSMutableDictionary* task in tasks)
  299. // {
  300. //
  301. // [self.arr_queue indexOfObject:task];
  302. // indexSet set
  303. // }
  304. [[self mutableArrayValueForKey:@"arr_queue"] removeObjectsAtIndexes:indexSet];
  305. // -removeObjectFrom<Key>AtIndex
  306. // [ insertObjects:tasks atIndexes:indexSet];
  307. }
  308. // if (self.delegate && [self.delegate respondsToSelector:@selector(uploadManager:didRemoveTasks:)]) {
  309. // [self.delegate uploadManager:self didRemoveTasks:tasks];
  310. // }
  311. }
  312. -(void) removeTask:(NSMutableDictionary*) task
  313. {
  314. // [self.arr_queue addObject:task];
  315. [self stopTask:task];
  316. // 上传成功才删除文件
  317. // NSFileManager* fmanager = [NSFileManager new];
  318. // NSError* error = nil;
  319. // bool bdel=[fmanager removeItemAtPath:[self filePath:task] error:&error];
  320. // if(!bdel)
  321. // DebugLog(@"file delete failed path:%@",[self filePath:task]);
  322. // [self.arr_queue_lock lock];
  323. // DebugLog(@"lock");
  324. // [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
  325. // DebugLog(@"unlock");
  326. // [self.arr_queue_lock unlock];
  327. // [self.arr_queue_lock lock];
  328. // [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
  329. // [self.arr_queue_lock unlock];
  330. @synchronized(self) {
  331. [[self mutableArrayValueForKey:@"arr_queue"] removeObject:task];
  332. }
  333. // if (self.delegate && [self.delegate respondsToSelector:@selector(uploadManager:didRemoveTasks:)]) {
  334. // [self.delegate uploadManager:self didRemoveTasks:@[task]];
  335. // }
  336. }
  337. //-(NSString*)filePath:(NSMutableDictionary*)task
  338. //{
  339. //
  340. // NSString *path = [RAUtils appCacheDirectory];
  341. // path= [path stringByAppendingPathComponent:task[@"path"]];
  342. // path= [path stringByAppendingPathComponent:task[@"file"]];
  343. // return path;
  344. //}
  345. -(void) saveTasks
  346. {
  347. NSUserDefaults *defaults =[NSUserDefaults standardUserDefaults];
  348. [defaults setObject:self.arr_queue forKey:@"upload_queue"];
  349. [defaults synchronize];
  350. }
  351. -(void) loadTasks
  352. {
  353. [self stopAllTasks];
  354. self.arr_queue = [NSMutableArray new];
  355. NSMutableArray* arr = [[[NSUserDefaults standardUserDefaults] objectForKey:@"upload_queue"] mutableCopy];
  356. // if(arr==nil)
  357. for(NSDictionary* task in arr)
  358. {
  359. NSMutableDictionary* newtask =[task mutableCopy];
  360. [self.arr_queue addObject:newtask];
  361. if(self.autoStart&&[task[@"status"] intValue]!=TaskStatusError&&[task[@"status"] intValue]!=TaskStatusFinish)
  362. [self startTask:newtask];
  363. }
  364. // NSDictionary* ddd = arr[0] ;
  365. // NSMutableDictionary* eee = [ddd mutableCopy];
  366. //
  367. // eee=[NSMutableDictionary dictionaryWithDictionary:ddd];
  368. // if(arr!=nil)
  369. // self.arr_queue=arr;
  370. // else
  371. // self.arr_queue= [[NSMutableArray alloc] init];
  372. //
  373. // for(__strong NSMutableDictionary* task in arr)
  374. // {
  375. //
  376. // task=[NSMutableDictionary dictionaryWithDictionary:task];
  377. //// if([task[@"status"] intValue]==TaskStatusStart)
  378. //// task[@"status"]=[NSNumber numberWithInteger:TaskStatusWait];
  379. // // NSMutableDictionary *new_task = [task mutableCopy];
  380. // if(self.autoStart&&[task[@"status"] intValue]!=TaskStatusError&&[task[@"status"] intValue]!=TaskStatusFinish)
  381. // [self startTask:task];
  382. // }
  383. }
  384. -(void) stopAllTasks
  385. {
  386. for(NSMutableDictionary* task in self.arr_queue)
  387. {
  388. [self stopTask:task];
  389. }
  390. }
  391. -(void) stopTask:(NSMutableDictionary*) task
  392. {
  393. if([task[@"status"] intValue]!=TaskStatusStart&&[task[@"status"] intValue]!=TaskStatusWait)
  394. {
  395. task[@"operation"]=nil;
  396. return; // task 已停止,返回
  397. }
  398. DebugLog(@"stop task");
  399. RAUploadOperation* operation = task[@"operation"];
  400. [operation cancel];
  401. task[@"operation"]=nil;
  402. task[@"status"] = [NSNumber numberWithInt:TaskStatusStop] ;
  403. task[@"progress"] = [NSNumber numberWithDouble:0.0];
  404. }
  405. -(void) startAllTasks
  406. {
  407. for(NSMutableDictionary* task in self.arr_queue)
  408. [self startTask:task];
  409. }
  410. -(void) startTask:(NSMutableDictionary*) task
  411. {
  412. if (self.onlyWiFi && self.reach.currentReachabilityStatus != ReachableViaWiFi) {
  413. return;
  414. }
  415. /*__block*/ NSMutableDictionary* block_task = task;
  416. __weak typeof(self) weakSelf = self;
  417. if([task[@"status"] intValue]==TaskStatusStart||[task[@"status"] intValue]==TaskStatusWait)
  418. return; // task 已在执行队列,返回
  419. RAUploadOperation* operation = [[RAUploadOperation alloc] initWithTaskinfo:task retry:self.maxRetry];
  420. [operation setCompletionBlock:^{
  421. switch ([block_task[@"status"] intValue]) {
  422. case TaskStatusFinish:
  423. {
  424. if(weakSelf.removeFinish)
  425. [self removeTask:block_task];
  426. [[NSNotificationCenter defaultCenter] postNotificationName:UPLOAD_FINISH_NOTIFICATION object:nil userInfo:block_task];
  427. }
  428. break;
  429. case TaskStatusError:
  430. {
  431. // if(weakSelf.removeError)
  432. // [self removeTask:block_task];
  433. }
  434. break;
  435. default:
  436. break;
  437. }
  438. }];
  439. task[@"msg"] = nil;
  440. task[@"operation"] = operation;
  441. task[@"status"] = [NSNumber numberWithInt:self.newtaskStatus] ;
  442. [self.operation_queue addOperation:operation];
  443. dispatch_async(dispatch_get_main_queue(), ^{
  444. [[NSNotificationCenter defaultCenter] postNotificationName:UPLOAD_REFRESH_UI_NOTIFICATION object:nil];
  445. });
  446. }
  447. - (void)restartAllTask {
  448. for(NSMutableDictionary* task in self.arr_queue) {
  449. TaskStatus status = [task[@"status"] intValue];
  450. if (status == TaskStatusWait || status == TaskStatusStop) {
  451. [self startTask:task];
  452. }
  453. }
  454. }
  455. //- (void) uploadTask:(NSMutableDictionary*) task url:(NSString*)url{
  456. //
  457. //// __weak typeof(self) weakself = self;
  458. //
  459. //
  460. //
  461. //
  462. //}
  463. - (BOOL)canUpload {
  464. if (self.onlyWiFi && self.reach.currentReachabilityStatus != ReachableViaWiFi) {
  465. return NO;
  466. }
  467. return YES;
  468. }
  469. #pragma mark - Retry
  470. - (NSMutableArray<RAUploadOperation *> *)retryArr {
  471. if (!_retryArr) {
  472. _retryArr = [NSMutableArray array];
  473. }
  474. return _retryArr;
  475. }
  476. - (void)addRetryOperation:(RAUploadOperation *)operation {
  477. if (self.retryTimer == nil) {
  478. // self.retryTimer = [NSTimer scheduledTimerWithTimeInterval:60 target:self selector:@selector(checkRetryOperations) userInfo:nil repeats:YES];
  479. self.retryTimer = [NSTimer timerWithTimeInterval:60 target:self selector:@selector(checkRetryOperations) userInfo:nil repeats:YES];
  480. [[NSRunLoop mainRunLoop] addTimer:self.retryTimer forMode:NSRunLoopCommonModes];
  481. }
  482. [self.retryArr addObject:operation];
  483. // 升序
  484. [self.retryArr sortUsingComparator:^NSComparisonResult(RAUploadOperation* _Nonnull operation1, RAUploadOperation* _Nonnull opertation2) {
  485. if (operation1.theRestOfWaitTimeInterval < opertation2.theRestOfWaitTimeInterval) {
  486. return NSOrderedAscending;
  487. } else {
  488. return NSOrderedDescending;
  489. }
  490. }];
  491. }
  492. - (void)checkRetryOperations {
  493. // 检查是否有需要重试的任务
  494. if (self.retryArr.count == 0) {
  495. return;
  496. }
  497. // 检查Wi-Fi Only
  498. if (![self canUpload]) {
  499. return;
  500. }
  501. NSMutableArray<RAUploadOperation *> *nextStartOperations = [NSMutableArray array];
  502. // // 检查当前上传队列等待数量是否小于最大并发数
  503. // if (self.operation_queue.operationCount < self.maxThread) {
  504. //
  505. //// // 根据最大并发数将剩余Operation全部添加进去
  506. //// NSInteger minCount = MIN(self.retryArr.count, self.maxThread - self.operation_queue.operationCount);
  507. // for (int i = 0; i < self.retryArr.count; i++) {
  508. // RAUploadOperation *operation = [self.retryArr objectAtIndex:i];
  509. // operation.queuePriority = NSOperationQueuePriorityVeryHigh;
  510. // [self.operation_queue addOperation:operation];
  511. // [nextStartOperations addObject:operation];
  512. // }
  513. //
  514. // } else {
  515. // 调度等待时间到达的Operation
  516. __weak typeof(self) weakSelf = self;
  517. [self.retryArr enumerateObjectsUsingBlock:^(RAUploadOperation * _Nonnull operation, NSUInteger idx, BOOL * _Nonnull stop) {
  518. if (operation.theRestOfWaitTimeInterval <= 0) {
  519. operation.queuePriority = NSOperationQueuePriorityVeryHigh;
  520. [weakSelf.operation_queue addOperation:operation];
  521. [nextStartOperations addObject:operation];
  522. }
  523. }];
  524. // }
  525. [self.retryArr removeObjectsInArray:nextStartOperations];
  526. // if (self.retryArr.count == 0) {
  527. // [self destructRetryTimer];
  528. // }
  529. }
  530. - (void)destructRetryTimer {
  531. if (self.retryTimer != nil) {
  532. [self.retryTimer setFireDate:[NSDate distantFuture]];
  533. [self.retryTimer invalidate];
  534. self.retryTimer = nil;
  535. }
  536. }
  537. @end