Skip to content

Commit 384c933

Browse files
committed
file size long to long long
1 parent e9ddf3a commit 384c933

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

QiniuSDK/Storage/QNUploadInfo.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ NS_ASSUME_NONNULL_BEGIN
6464
/// @param dataSize 读取数据大小
6565
/// @param dataOffset 数据偏移量
6666
/// @param error 读取时的错误信息
67-
- (NSData *)readData:(NSInteger)dataSize dataOffset:(long)dataOffset error:(NSError **)error;
67+
- (NSData *)readData:(NSInteger)dataSize dataOffset:(long long)dataOffset error:(NSError **)error;
6868

6969
/// 关闭流
7070
- (void)close;

QiniuSDK/Storage/QNUploadInfo.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
@interface QNUploadInfo()
1313

1414
@property(nonatomic, copy)NSString *sourceId;
15-
@property(nonatomic, assign)long sourceSize;
15+
@property(nonatomic, assign)long long sourceSize;
1616
@property(nonatomic, copy)NSString *fileName;
1717

1818
@property(nonatomic, strong)id <QNUploadSource> source;
@@ -58,7 +58,7 @@ - (NSString *)getSourceId {
5858
return [self.source getId];
5959
}
6060

61-
- (long)getSourceSize {
61+
- (long long)getSourceSize {
6262
return [self.source getSize];
6363
}
6464

@@ -91,7 +91,7 @@ - (void)clearUploadState {
9191
- (void)checkInfoStateAndUpdate {
9292
}
9393

94-
- (NSData *)readData:(NSInteger)dataSize dataOffset:(long)dataOffset error:(NSError **)error {
94+
- (NSData *)readData:(NSInteger)dataSize dataOffset:(long long)dataOffset error:(NSError **)error {
9595
if (!self.source) {
9696
*error = [NSError errorWithDomain:NSStreamSOCKSErrorDomain code:kQNLocalIOError userInfo:@{NSLocalizedDescriptionKey : @"file is not exist"}];
9797
return nil;

QiniuSDK/Storage/QNUploadInfoV1.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,10 +174,10 @@ - (QNUploadBlock *)nextUploadBlock:(NSError **)error {
174174
}
175175

176176
// 从资源中读取新的 block 进行上传
177-
long blockOffset = 0;
177+
long long blockOffset = 0;
178178
if (self.blockList.count > 0) {
179179
QNUploadBlock *lastBlock = self.blockList[self.blockList.count - 1];
180-
blockOffset = lastBlock.offset + lastBlock.size;
180+
blockOffset = lastBlock.offset + (long long)(lastBlock.size);
181181
}
182182

183183
block = [[QNUploadBlock alloc] initWithOffset:blockOffset blockSize:kBlockSize dataSize:self.dataSize index:self.blockList.count];

QiniuSDK/Storage/QNUploadSource.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ NS_ASSUME_NONNULL_BEGIN
5151
*
5252
* @return 资源大小
5353
*/
54-
- (long)getSize;
54+
- (long long)getSize;
5555

5656
/**
5757
* 读取数据

QiniuSDK/Storage/QNUploadSourceFile.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ - (nonnull NSString *)getFileName {
3838
return [[self.file path] lastPathComponent];
3939
}
4040

41-
- (long)getSize {
41+
- (long long)getSize {
4242
return [self.file size];
4343
}
4444

QiniuSDK/Storage/QNUploadSourceStream.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ - (NSString *)getFileName {
4949
return self.fileName;
5050
}
5151

52-
- (long)getSize {
52+
- (long long)getSize {
5353
if (self.size > kQNUnknownSourceSize) {
5454
return self.size;
5555
} else {

QiniuSDK/Utils/QNVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
/**
1212
* sdk 版本
1313
*/
14-
static NSString *const kQiniuVersion = @"8.3.1";
14+
static NSString *const kQiniuVersion = @"8.3.2";

0 commit comments

Comments
 (0)