mirror/react-native-pushy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity GitHub Gitee

Try to fix app.json issue

Browse Source
This commit is contained in:
sunnylqm 2020-05-23 00:17:30 +08:00
parent a2f01b6213
commit 3752ad4e5d
2 changed files with 21 additions and 24 deletions

6
ios/RCTPushy/RCTPushy.m

@ -345,10 +345,10 @@ RCT_EXPORT_METHOD(markSuccess)
break;
case PushyTypePatchFromPpk:
{
NSString *lastVertionDir = [dir stringByAppendingPathComponent:originHashName];
NSString *lastVersionDir = [dir stringByAppendingPathComponent:originHashName];
NSString *sourceOrigin = lastVertionDir;
NSString *bundleOrigin = [lastVertionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
NSString *sourceOrigin = lastVersionDir;
NSString *bundleOrigin = [lastVersionDir stringByAppendingPathComponent:BUNDLE_FILE_NAME];
[self patch:hashName fromBundle:bundleOrigin source:sourceOrigin callback:callback];
}
break;

39
ios/RCTPushy/RCTPushyManager.m

@ -99,16 +99,9 @@ completionHandler:(void (^)(NSError *error))completionHandler
// merge old files
if (deletes!= nil) {
NSError *error = nil;
NSString *srcDir = [fromDir stringByAppendingPathComponent:@"assets"];
NSString *desDir = [toDir stringByAppendingPathComponent:@"assets"];
[self _mergeContentsOfPath:srcDir intoPath:desDir deletes:deletes error:&error];
if (error) {
if (completionHandler) {
completionHandler(error);
}
return;
}
[self _mergeContentsOfPath:srcDir intoPath:desDir deletes:deletes];
}
// copy files
@ -126,10 +119,11 @@ completionHandler:(void (^)(NSError *error))completionHandler
NSError *error = nil;
[fm copyItemAtPath:fromPath toPath:toPath error:&error];
if (error) {
if (completionHandler) {
completionHandler(error);
}
return;
NSLog(@"Pushy copy error: %@", error.localizedDescription);
// if (completionHandler) {
// completionHandler(error);
// }
// return;
}
}
if (completionHandler) {
@ -150,7 +144,7 @@ completionHandler:(void (^)(NSError *error))completionHandler
});
}
- (void)_mergeContentsOfPath:(NSString *)srcDir intoPath:(NSString *)dstDir deletes:(NSDictionary *)deletes error:(NSError**)err
- (void)_mergeContentsOfPath:(NSString *)srcDir intoPath:(NSString *)dstDir deletes:(NSDictionary *)deletes
{
NSFileManager *fm = [NSFileManager defaultManager];
NSDirectoryEnumerator *srcDirEnum = [fm enumeratorAtPath:srcDir];
@ -159,7 +153,9 @@ completionHandler:(void (^)(NSError *error))completionHandler
NSString *srcFullPath = [srcDir stringByAppendingPathComponent:subPath];
NSString *potentialDstPath = [dstDir stringByAppendingPathComponent:subPath];
NSError *error = nil;
BOOL inDeletes = NO;
if (deletes) {
NSString *path = [@"assets" stringByAppendingPathComponent:subPath];
@ -171,18 +167,19 @@ completionHandler:(void (^)(NSError *error))completionHandler
BOOL isDirectory = ([fm fileExistsAtPath:srcFullPath isDirectory:&isDirectory] && isDirectory);
if (isDirectory) {
if (![fm fileExistsAtPath:potentialDstPath isDirectory:nil]) {
[fm createDirectoryAtPath:potentialDstPath withIntermediateDirectories:YES attributes:nil error:err];
if (err && *err) {
return;
[fm createDirectoryAtPath:potentialDstPath withIntermediateDirectories:YES attributes:nil error:&error];
if (error) {
NSLog(@"Pushy merge error: %@", error.localizedDescription);
// return;
}
}
}
else {
if (![fm fileExistsAtPath:potentialDstPath]) {
[fm copyItemAtPath:srcFullPath toPath:potentialDstPath error:err];
if (err && *err) {
return;
[fm copyItemAtPath:srcFullPath toPath:potentialDstPath error:&error];
if (error) {
NSLog(@"Pushy merge error: %@", error.localizedDescription);
// return;
}
}
}