|
|
@@ -130,6 +130,8 @@ static const NSTimeInterval waitTimeIntervalDelta = 60 * 3;
|
|
|
else
|
|
|
{
|
|
|
BOOL canUpload = [Appdelegate.uploadManager canUpload];
|
|
|
+ BOOL isReachable = [Appdelegate.uploadManager reachable];
|
|
|
+
|
|
|
DebugLog(@"can upload %@",@(canUpload));
|
|
|
if (!canUpload) {
|
|
|
block_task[@"status"]=[NSNumber numberWithInt:TaskStatusStop];
|
|
|
@@ -137,6 +139,11 @@ static const NSTimeInterval waitTimeIntervalDelta = 60 * 3;
|
|
|
block_task[@"msg"]= @"Can only use wifi to upload";
|
|
|
|
|
|
}
|
|
|
+ else if (weakself.isCancelled || !isReachable) {
|
|
|
+ block_task[@"status"] = [NSNumber numberWithInt:TaskStatusStop] ;
|
|
|
+ block_task[@"progress"] = [NSNumber numberWithDouble:0.0];
|
|
|
+ block_task[@"msg"]= @"";
|
|
|
+ }
|
|
|
else if([block_task[@"retry"] intValue]>=_maxRetry)
|
|
|
{
|
|
|
block_task[@"status"]=[NSNumber numberWithInt:TaskStatusError];
|