mirror of
https://gitcode.com/gh_mirrors/re/react-native-pushy.git
synced 2025-10-07 19:05:13 +08:00
update RNOH SDK dependence from local to remote (#473)
* fix harmony more than 2M issue * fix mtpush-react-native conflics * update harmony remote dependency flow * udpate * udpate * udpate * udpate * udpate * update * uddate * udpapte
This commit is contained in:
@@ -491,4 +491,4 @@ export class DownloadTask {
|
||||
params.listener?.onDownloadFailed(error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
@@ -1,4 +1,4 @@
|
||||
import { HotReloadConfig, JSBundleProvider, JSBundleProviderError, JSPackagerClientConfig } from 'rnoh';
|
||||
import { HotReloadConfig, JSBundleProvider, JSBundleProviderError, JSPackagerClientConfig } from '@rnoh/react-native-openharmony';
|
||||
import fileIo from '@ohos.file.fs';
|
||||
import common from '@ohos.app.ability.common';
|
||||
import { UpdateContext } from './UpdateContext';
|
||||
@@ -40,20 +40,15 @@ export class FileJSBundleProvider extends JSBundleProvider {
|
||||
}
|
||||
throw new Error('Update bundle not found');
|
||||
} catch (error) {
|
||||
throw new JSBundleProviderError(`Couldn't load JSBundle from ${this.filePath}`, error)
|
||||
throw new JSBundleProviderError({
|
||||
whatHappened: `Couldn't load JSBundle from ${this.filePath}`,
|
||||
extraData: error,
|
||||
howCanItBeFixed: [`Check if a bundle exists at "${this.filePath}" on your device.`]
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
getAppKeys(): string[] {
|
||||
return [];
|
||||
}
|
||||
|
||||
getHotReloadConfig(): HotReloadConfig | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
getJSPackagerClientConfig(): JSPackagerClientConfig | null {
|
||||
return null;
|
||||
}
|
||||
|
||||
}
|
@@ -1,5 +1,5 @@
|
||||
import { RNPackage, TurboModulesFactory } from 'rnoh/ts';
|
||||
import type { TurboModule, TurboModuleContext } from 'rnoh/ts';
|
||||
import { RNPackage, TurboModulesFactory } from '@rnoh/react-native-openharmony/ts';
|
||||
import type { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
|
||||
import { PushyTurboModule } from './PushyTurboModule';
|
||||
|
||||
class PushyTurboModulesFactory extends TurboModulesFactory {
|
||||
|
@@ -1,4 +1,4 @@
|
||||
import { TurboModule, TurboModuleContext } from 'rnoh/ts';
|
||||
import { TurboModule, TurboModuleContext } from '@rnoh/react-native-openharmony/ts';
|
||||
import common from '@ohos.app.ability.common';
|
||||
import dataPreferences from '@ohos.data.preferences';
|
||||
import { bundleManager } from '@kit.AbilityKit';
|
||||
|
@@ -26,49 +26,49 @@ export class UpdateContext {
|
||||
this.initPreferences();
|
||||
}
|
||||
|
||||
private async initPreferences() {
|
||||
private initPreferences() {
|
||||
try {
|
||||
this.preferences = await preferences.getPreferences(this.context, 'update');
|
||||
const packageVersion = await this.getPackageVersion();
|
||||
const storedVersion = await this.preferences.get('packageVersion', '');
|
||||
this.preferences = preferences.getPreferencesSync(this.context, {name:'update'});
|
||||
const packageVersion = this.getPackageVersion();
|
||||
const storedVersion = this.preferences.getSync('packageVersion', '');
|
||||
if (packageVersion !== storedVersion) {
|
||||
await this.preferences.clear();
|
||||
await this.preferences.put('packageVersion', packageVersion);
|
||||
await this.preferences.flush();
|
||||
this.cleanUp();
|
||||
this.preferences.clear();
|
||||
this.preferences.putSync('packageVersion', packageVersion);
|
||||
this.preferences.flush();
|
||||
this.cleanUp();
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to init preferences:', e);
|
||||
}
|
||||
}
|
||||
|
||||
public async setKv(key: string, value: string): Promise<void> {
|
||||
await this.preferences.put(key, value);
|
||||
await this.preferences.flush();
|
||||
public setKv(key: string, value: string): void {
|
||||
this.preferences.putSync(key, value);
|
||||
this.preferences.flush();
|
||||
}
|
||||
|
||||
public async getKv(key: string): Promise<string> {
|
||||
return await this.preferences.get(key, '') as string;
|
||||
public getKv(key: string): string {
|
||||
return this.preferences.getSync(key, '') as string;
|
||||
}
|
||||
|
||||
public async isFirstTime(): Promise<boolean> {
|
||||
return await this.preferences.get('firstTime', false) as boolean;
|
||||
public isFirstTime(): boolean {
|
||||
return this.preferences.getSync('firstTime', false) as boolean;
|
||||
}
|
||||
|
||||
public async rolledBackVersion(): Promise<string> {
|
||||
return await this.preferences.get('rolledBackVersion', '') as string;
|
||||
public rolledBackVersion(): string {
|
||||
return this.preferences.getSync('rolledBackVersion', '') as string;
|
||||
}
|
||||
|
||||
public async markSuccess(): Promise<void> {
|
||||
await this.preferences.put('firstTimeOk', true);
|
||||
const lastVersion = await this.preferences.get('lastVersion', '') as string;
|
||||
const curVersion = await this.preferences.get('currentVersion', '') as string;
|
||||
public markSuccess(): void {
|
||||
this.preferences.putSync('firstTimeOk', true);
|
||||
const lastVersion = this.preferences.getSync('lastVersion', '') as string;
|
||||
const curVersion = this.preferences.getSync('currentVersion', '') as string;
|
||||
|
||||
if (lastVersion && lastVersion !== curVersion) {
|
||||
await this.preferences.delete('lastVersion');
|
||||
await this.preferences.delete(`hash_${lastVersion}`);
|
||||
this.preferences.deleteSync('lastVersion');
|
||||
this.preferences.deleteSync(`hash_${lastVersion}`);
|
||||
}
|
||||
await this.preferences.flush();
|
||||
this.preferences.flush();
|
||||
this.cleanUp();
|
||||
}
|
||||
|
||||
@@ -143,23 +143,23 @@ export class UpdateContext {
|
||||
}
|
||||
}
|
||||
|
||||
public async switchVersion(hash: string): Promise<void> {
|
||||
public switchVersion(hash: string): void {
|
||||
try {
|
||||
const bundlePath = `${this.rootDir}/${hash}/bundle.harmony.js`;
|
||||
if (!fileIo.accessSync(bundlePath)) {
|
||||
throw new Error(`Bundle version ${hash} not found.`);
|
||||
}
|
||||
|
||||
const lastVersion = await this.getKv('currentVersion');
|
||||
await this.setKv('currentVersion', hash);
|
||||
const lastVersion = this.getKv('currentVersion');
|
||||
this.setKv('currentVersion', hash);
|
||||
|
||||
if (lastVersion && lastVersion !== hash) {
|
||||
await this.setKv('lastVersion', lastVersion);
|
||||
this.setKv('lastVersion', lastVersion);
|
||||
}
|
||||
|
||||
await this.setKv('firstTime', 'true');
|
||||
await this.setKv('firstTimeOk', 'false');
|
||||
await this.setKv('rolledBackVersion', null);
|
||||
this.setKv('firstTime', 'true');
|
||||
this.setKv('firstTimeOk', 'false');
|
||||
this.setKv('rolledBackVersion', null);
|
||||
} catch (e) {
|
||||
console.error('Failed to switch version:', e);
|
||||
}
|
||||
@@ -176,7 +176,7 @@ export class UpdateContext {
|
||||
return defaultAssetsUrl;
|
||||
}
|
||||
if (!this.isFirstTime()) {
|
||||
if (!this.preferences.get('firstTimeOk', true)) {
|
||||
if (!this.preferences.getSync('firstTimeOk', true)) {
|
||||
return this.rollBack();
|
||||
}
|
||||
}
|
||||
|
@@ -1,8 +1,5 @@
|
||||
import { TurboModuleContext } from 'rnoh/ts';
|
||||
import dataPreferences from '@ohos.data.preferences';
|
||||
import bundleManager from '@ohos.bundle.bundleManager';
|
||||
import common from '@ohos.app.ability.common';
|
||||
import { BusinessError } from '@ohos.base';
|
||||
import { UpdateContext } from './UpdateContext';
|
||||
import { DownloadTaskParams } from './DownloadTaskParams';
|
||||
import logger from './Logger';
|
||||
|
Reference in New Issue
Block a user