|
|
@@ -277,11 +277,22 @@
|
|
|
NSTimeInterval timers = _curPhotosBackupsTaskModel.curTimeInterval - _curPhotosBackupsTaskModel.preTimeInterval;
|
|
|
|
|
|
if(timers > 0){
|
|
|
- //long speed= 1*1024*1024 / timers;
|
|
|
- long speed= EachPieceSzie / timers;
|
|
|
+ //long speed= EachPieceSzie / timers;
|
|
|
+
|
|
|
+ long curUploadSize = _curPhotosBackupsTaskModel.didUploadBytes - _curPhotosBackupsTaskModel.preDidUploadBytes;
|
|
|
+ if(curUploadSize <0 || curUploadSize> EachPieceSzie){
|
|
|
+ curUploadSize = EachPieceSzie;
|
|
|
+ }
|
|
|
+
|
|
|
+ long speed = curUploadSize/timers;
|
|
|
+
|
|
|
NSString * speedStr = nil;
|
|
|
NSInteger speed_k = speed / (1024);
|
|
|
- if(speed_k < 1024){
|
|
|
+
|
|
|
+ if(speed == 0){
|
|
|
+ speedStr = @"--";
|
|
|
+ }
|
|
|
+ else if(speed_k < 1024){
|
|
|
speedStr = [[NSString alloc] initWithFormat:@"%ldKB/s",speed_k];
|
|
|
}
|
|
|
else {
|
|
|
@@ -416,13 +427,12 @@
|
|
|
}
|
|
|
|
|
|
_fileTimelabel.text = [[NSString alloc] initWithFormat:@"%@%@",NSLocalizedString(@"Estimated_time",nil),timeStr];
|
|
|
- HLog(@"111: %@ 222: %@ 333: %ld 444:%f 555:%ld 666:%ld",_fileTimelabel.text,timeStr,speed,estimateTime,_curPhotosBackupsTaskModel.totalBytes,_curPhotosBackupsTaskModel.didUploadBytes);
|
|
|
+ HLog(@"%@ 111: %@ 222: %@ 333: %ld 444:%f total:%ld didUpload:%ld error:%d",_curPhotosBackupsTaskModel.filename,_fileTimelabel.text,timeStr,speed,estimateTime,_curPhotosBackupsTaskModel.totalBytes,_curPhotosBackupsTaskModel.didUploadBytes,_curPhotosBackupsTaskModel.totalBytes>=_curPhotosBackupsTaskModel.didUploadBytes?0:1);
|
|
|
}
|
|
|
|
|
|
- (void)handlFileProgresslabelFun
|
|
|
{
|
|
|
- if(_curPhotosBackupsTaskModel.totalBytes == 0
|
|
|
- || _curPhotosBackupsTaskModel.didUploadBytes == 0){
|
|
|
+ if(_curPhotosBackupsTaskModel.totalBytes == 0){
|
|
|
_fileProgresslabel.text = @"";
|
|
|
return;
|
|
|
}
|