|
|
@@ -9,12 +9,25 @@
|
|
|
#import "RAUploadManager.h"
|
|
|
#import "NetworkUtils.h"
|
|
|
#import "RAUtils.h"
|
|
|
+#import "UploadSettingController.h"
|
|
|
|
|
|
@implementation RAUploadManager
|
|
|
|
|
|
- (instancetype)init {
|
|
|
if (self = [super init]) {
|
|
|
|
|
|
+ NSDictionary *param = [[NSUserDefaults standardUserDefaults] objectForKey:kUploadSetting];
|
|
|
+ if (param) {
|
|
|
+ BOOL autoUpload = [[param objectForKey:@"auto_upload"] boolValue];
|
|
|
+ int retryCount = [[param objectForKey:@"retry_count"] intValue];
|
|
|
+ self.autoStart = autoUpload;
|
|
|
+ self.maxRetry = retryCount;
|
|
|
+ } else {
|
|
|
+ self.autoStart = YES;
|
|
|
+ self.maxRetry = 2;
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
[self loadTasks];
|
|
|
|
|
|
self.newtaskStatus = TaskStatusWait;
|
|
|
@@ -143,9 +156,9 @@
|
|
|
{
|
|
|
// if([task[@"status"] intValue]==TaskStatusStart)
|
|
|
// task[@"status"]=[NSNumber numberWithInteger:TaskStatusWait];
|
|
|
-
|
|
|
+ NSMutableDictionary *new_task = [task mutableCopy];
|
|
|
if(self.autoStart&&[task[@"status"] intValue]!=TaskStatusError&&[task[@"status"] intValue]!=TaskStatusFinish)
|
|
|
- [self startTask:task];
|
|
|
+ [self startTask:new_task];
|
|
|
}
|
|
|
|
|
|
|