diff --git a/harmony/pushy/hvigor-plugin.ts b/harmony/pushy/hvigor-plugin.ts index b298823..1527514 100644 --- a/harmony/pushy/hvigor-plugin.ts +++ b/harmony/pushy/hvigor-plugin.ts @@ -30,11 +30,9 @@ export function reactNativeUpdatePlugin() { versionName, }; - fs.writeFileSync(metaFilePath, JSON.stringify(metaContent, null, 4)); + fs.writeFileSync(metaFilePath, JSON.stringify(metaContent, null, 2)); console.log(`Build time written to ${metaFilePath}`); }, - dependencies: [], - postDependencies: ['default@BuildJS'], }); }, }; diff --git a/ios/RCTPushy/RCTPushy.mm b/ios/RCTPushy/RCTPushy.mm index bb35ec0..d597cde 100644 --- a/ios/RCTPushy/RCTPushy.mm +++ b/ios/RCTPushy/RCTPushy.mm @@ -78,7 +78,7 @@ RCT_EXPORT_MODULE(RCTPushy); NSString *storedBuildTime = [defaults stringForKey:paramBuildTime]; // If stored versions don't exist, write current versions first - if (!storedPackageVersion || !storedBuildTime) { + if (!storedPackageVersion && !storedBuildTime) { [defaults setObject:curPackageVersion forKey:paramPackageVersion]; [defaults setObject:curBuildTime forKey:paramBuildTime]; storedPackageVersion = curPackageVersion; @@ -86,7 +86,7 @@ RCT_EXPORT_MODULE(RCTPushy); } BOOL packageVersionChanged = ![curPackageVersion isEqualToString:storedPackageVersion]; - BOOL buildTimeChanged = ![curBuildTime isEqualToString:storedBuildTime]; + BOOL buildTimeChanged = curBuildTime && ![curBuildTime isEqualToString:storedBuildTime]; if (packageVersionChanged || buildTimeChanged) { // Clear all update data and store new versions @@ -304,8 +304,8 @@ RCT_EXPORT_METHOD(setNeedUpdate:(NSDictionary *)options if (hash.length) { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; NSString *lastVersion = nil; - if ([defaults objectForKey:keyPushyInfo]) { - NSDictionary *pushyInfo = [defaults objectForKey:keyPushyInfo]; + NSDictionary *pushyInfo = [defaults objectForKey:keyPushyInfo] + if (pushyInfo) { lastVersion = pushyInfo[paramCurrentVersion]; } diff --git a/package.json b/package.json index 961b11e..5130806 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "react-native-update", - "version": "10.35.4", + "version": "10.35.5", "description": "react-native hot update", "main": "src/index", "scripts": {