mirror/react-native-update
1
0
Fork 0
mirror of https://gitcode.com/gh_mirrors/re/react-native-pushy.git synced 2025-10-07 15:55:13 +08:00
Code Issues Packages Projects Releases Wiki Activity GitHub Gitee

Merge branch 'fix-app-json'

Browse Source
This commit is contained in:
sunnylqm
2020-05-25 15:00:21 +08:00
parent 5999670917 0f6875d8d5
commit 8e1a639dda
3 changed files with 22 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ios/RCTPushy/RCTPushy.m
View File

@@ -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
View File

@@ -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;
}
}
}

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "react-native-update",
"version": "5.5.10",
"version": "5.6.0-beta.1",
"description": "react-native hot update",
"main": "lib/index.js",
"scripts": {