Skip to content

Commit 350f2d0

Browse files
authored
upload support acc (#445)
1 parent ccdefb2 commit 350f2d0

24 files changed

+379
-74
lines changed

.github/workflows/version-check.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,3 @@ jobs:
1919
grep -qF "## ${RELEASE_VERSION}" CHANGELOG.md
2020
grep -qF "\"${RELEASE_VERSION}\"" README.md
2121
grep -qF "static NSString *const kQiniuVersion = @\"${RELEASE_VERSION}\";" QiniuSDK/Utils/QNVersion.h
22-
grep -qF "<string>${RELEASE_VERSION}</string>" QiniuSDK/info.plist

QiniuDemo/Podfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ target "QiniuDemo" do
66
# pod 'Qiniu', '~> 7.4.0'
77
# pod 'Qiniu', '7.1.7'
88
pod 'Qiniu',:path => '../'
9+
pod 'HappyDNS',:path => '../../happy-dns-objc'
910
end
1011

1112
target "QiniuDemoTests" do

QiniuDemo/QiniuDemo.xcodeproj/project.pbxproj

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
26F62ADDD5B6306E978C9A3F /* libPods-QiniuDemoTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 14CB2139715DD7B6FD5B146E /* libPods-QiniuDemoTests.a */; };
11-
4545D3142BAD7D0C00932C3F /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 4545D3132BAD7D0C00932C3F /* PrivacyInfo.xcprivacy */; };
1211
4561F02C28D9A6F80098A697 /* UploadResource_14M.zip in Resources */ = {isa = PBXBuildFile; fileRef = 4561F02B28D9A6F80098A697 /* UploadResource_14M.zip */; };
1312
45E6080929ADD57100634200 /* UploadResource_1G.zip in Resources */ = {isa = PBXBuildFile; fileRef = 45E6080829ADD57100634200 /* UploadResource_1G.zip */; };
1413
93D230241C86D7F700434F6D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 93D230231C86D7F700434F6D /* main.m */; };
@@ -43,7 +42,6 @@
4342
14CB2139715DD7B6FD5B146E /* libPods-QiniuDemoTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-QiniuDemoTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
4443
24EE530BBB100BED89B08A3D /* Pods-QiniuDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-QiniuDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-QiniuDemo/Pods-QiniuDemo.release.xcconfig"; sourceTree = "<group>"; };
4544
3189882026469145003CCA68 /* QiniuDemo.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = QiniuDemo.entitlements; sourceTree = "<group>"; };
46-
4545D3132BAD7D0C00932C3F /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
4745
4561F02B28D9A6F80098A697 /* UploadResource_14M.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_14M.zip; sourceTree = "<group>"; };
4846
4561F02F28D9AB090098A697 /* Configure.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Configure.h; sourceTree = "<group>"; };
4947
45E6080829ADD57100634200 /* UploadResource_1G.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = UploadResource_1G.zip; sourceTree = "<group>"; };
@@ -171,7 +169,6 @@
171169
93D230301C86D7F700434F6D /* LaunchScreen.storyboard */,
172170
93D230331C86D7F700434F6D /* Info.plist */,
173171
93D230221C86D7F700434F6D /* Supporting Files */,
174-
4545D3132BAD7D0C00932C3F /* PrivacyInfo.xcprivacy */,
175172
);
176173
path = QiniuDemo;
177174
sourceTree = "<group>";
@@ -272,7 +269,7 @@
272269
TargetAttributes = {
273270
93D2301E1C86D7F700434F6D = {
274271
CreatedOnToolsVersion = 7.2;
275-
DevelopmentTeam = X2US9XXC6H;
272+
DevelopmentTeam = W2TP34G2MM;
276273
};
277274
93D230371C86D7F700434F6D = {
278275
CreatedOnToolsVersion = 7.2;
@@ -309,7 +306,6 @@
309306
isa = PBXResourcesBuildPhase;
310307
buildActionMask = 2147483647;
311308
files = (
312-
4545D3142BAD7D0C00932C3F /* PrivacyInfo.xcprivacy in Resources */,
313309
93D230321C86D7F700434F6D /* LaunchScreen.storyboard in Resources */,
314310
45E6080929ADD57100634200 /* UploadResource_1G.zip in Resources */,
315311
4561F02C28D9A6F80098A697 /* UploadResource_14M.zip in Resources */,
@@ -342,10 +338,12 @@
342338
);
343339
inputPaths = (
344340
"${PODS_ROOT}/Target Support Files/Pods-QiniuDemo/Pods-QiniuDemo-resources.sh",
341+
"${PODS_CONFIGURATION_BUILD_DIR}/HappyDNS/HappyDNS.privacy.bundle",
345342
"${PODS_CONFIGURATION_BUILD_DIR}/Qiniu/Qiniu.privacy.bundle",
346343
);
347344
name = "[CP] Copy Pods Resources";
348345
outputPaths = (
346+
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/HappyDNS.privacy.bundle",
349347
"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Qiniu.privacy.bundle",
350348
);
351349
runOnlyForDeploymentPostprocessing = 0;
@@ -566,7 +564,7 @@
566564
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
567565
CODE_SIGN_ENTITLEMENTS = QiniuDemo/QiniuDemo.entitlements;
568566
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
569-
DEVELOPMENT_TEAM = X2US9XXC6H;
567+
DEVELOPMENT_TEAM = W2TP34G2MM;
570568
INFOPLIST_FILE = QiniuDemo/Info.plist;
571569
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
572570
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -587,7 +585,7 @@
587585
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
588586
CODE_SIGN_ENTITLEMENTS = QiniuDemo/QiniuDemo.entitlements;
589587
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
590-
DEVELOPMENT_TEAM = X2US9XXC6H;
588+
DEVELOPMENT_TEAM = W2TP34G2MM;
591589
INFOPLIST_FILE = QiniuDemo/Info.plist;
592590
IPHONEOS_DEPLOYMENT_TARGET = 12.0;
593591
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

QiniuDemo/QiniuDemo/ViewController.m

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ - (IBAction)uploadAction:(UIButton *)sender {
7373
path = [[NSBundle mainBundle] pathForResource:@"UploadResource_14M.zip" ofType:nil];
7474
// path = [[NSBundle mainBundle] pathForResource:@"UploadResource_9M.zip" ofType:nil];
7575
// path = [[NSBundle mainBundle] pathForResource:@"UploadResource_49M.zip" ofType:nil];
76-
path = [[NSBundle mainBundle] pathForResource:@"UploadResource_1G.zip" ofType:nil];
76+
// path = [[NSBundle mainBundle] pathForResource:@"UploadResource_1G.zip" ofType:nil];
7777

7878
// NSFileManager *manager = [NSFileManager defaultManager];
7979
// NSURL *desktopUrl = [manager URLsForDirectory:NSDesktopDirectory inDomains:NSUserDomainMask].firstObject;
@@ -139,6 +139,7 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath complete:(dispatch_block_t)
139139
NSString *key = [NSString stringWithFormat:@"iOS_Demo_%@", [NSDate date]];
140140
key = @"iOS-Test";
141141
self.token = YourToken;
142+
self.token = @"5cJEzNSnh3PjOHZR_E0u1HCkXw4Bw1ZSuWQI9ufz:-ul1AJ8Fvpc7WhtpVT91Pvdfreo=:eyJzY29wZSI6InpvbmUwLXNwYWNlIiwiZGVhZGxpbmUiOjM0MzM3NDYyNTl9";
142143

143144

144145
QNConfiguration *configuration = [QNConfiguration build:^(QNConfigurationBuilder *builder) {
@@ -147,11 +148,16 @@ - (void)uploadImageToQNFilePath:(NSString *)filePath complete:(dispatch_block_t)
147148
// builder.useHttps = NO;
148149

149150
builder.useConcurrentResumeUpload = false;
150-
builder.concurrentTaskCount = 10;
151+
builder.concurrentTaskCount = 2;
151152
builder.resumeUploadVersion = QNResumeUploadVersionV2;
152153
builder.putThreshold = 4*1024*1024;
153-
builder.chunkSize = 1*1024*1024;
154-
// builder.zone = [[QNFixedZone alloc] initWithUpDomainList:@[kUploadFixHost00, kUploadFixHost01]];
154+
builder.chunkSize = 5*1024*1024;
155+
builder.accelerateUploading = true;
156+
// builder.zone = [[QNFixedZone alloc] initWithAccUpDomainList:@[@"zone0-space.kodo-accelerate.cn-east-1.qiniucs.com"]
157+
// upList:@[kUploadFixHost00]
158+
// oldUpList:@[]
159+
// regionId:@"custom"];
160+
// [[QNFixedZone alloc] initWithUpDomainList:@[kUploadFixHost00, kUploadFixHost01]];
155161
NSString *recorderPath = [NSHomeDirectory() stringByAppendingPathComponent:@"Documents"];
156162
NSLog(@"== record path:%@", recorderPath);
157163
builder.recorder = [QNFileRecorder fileRecorderWithFolder:recorderPath error:nil];

0 commit comments

Comments
 (0)