diff --git a/interfaces/kits/js/ani/file_cloud_sync/ets/@ohos.file.cloudSync.ets b/interfaces/kits/js/ani/file_cloud_sync/ets/@ohos.file.cloudSync.ets index 657a7d43fd11508e307499b0f7b9dbbb9c379485..ea983684a0e994c540b072d460318c7f964ceb3b 100644 --- a/interfaces/kits/js/ani/file_cloud_sync/ets/@ohos.file.cloudSync.ets +++ b/interfaces/kits/js/ani/file_cloud_sync/ets/@ohos.file.cloudSync.ets @@ -80,22 +80,22 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): int => this.StartInner()); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } start(callback: AsyncCallback): void { let promise = taskpool.execute((): int => this.StartInner()); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -103,10 +103,10 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): int => this.StopInner()); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -117,8 +117,8 @@ export default namespace cloudSync { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -233,22 +233,22 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((uri: string): int => this.StartInner(uri), uri); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } start(uri: string, callback: AsyncCallback): void { let promise = taskpool.execute((uri: string): int => this.StartInner(uri), uri); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -256,22 +256,22 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((uri: string): int => this.StopInner(uri), uri); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } stop(uri: string, callback: AsyncCallback): void { let promise = taskpool.execute((uri: string): int => this.StopInner(uri), uri); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -382,22 +382,22 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): int => this.StartInner()); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } start(callback: AsyncCallback): void { let promise = taskpool.execute((): int => this.StartInner()); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -405,10 +405,10 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): int => this.StopInner()); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -419,32 +419,32 @@ export default namespace cloudSync { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } getLastSyncTime(): Promise { return new Promise((resolve: (result: number) => void, - reject: (e: BusinessError) => void): number => { + reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((): number => this.GallerySyncGetLastSyncTime()); - promise.then((ret: number): void => { - resolve(ret); - }, (e: BusinessError): void => { - reject(e); + promise.then((ret: NullishType): void => { + resolve(ret as Number); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } getLastSyncTime(callback: AsyncCallback): void { let promise = taskpool.execute((): number => this.GallerySyncGetLastSyncTime()); - promise.then((ret: number): void => { + promise.then((ret: NullishType): void => { let e = new BusinessError(); e.code = 0; - callback(e, ret); - }, (e: BusinessError): void => { + callback(e, ret as Number); + }, (e: Error): void => { let num: number = 0; - callback(e, num); + callback(e as BusinessError, num); }); } @@ -485,22 +485,22 @@ export default namespace cloudSync { return new Promise((resolve: (result: undefined) => void, reject: (e: BusinessError) => void): void => { let promise = taskpool.execute((uri: string): int => this.StartInner(uri), uri); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } start(uri: string, callback: AsyncCallback): void { let promise = taskpool.execute((uri: string): int => this.StartInner(uri), uri); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -531,10 +531,10 @@ export default namespace cloudSync { let promise = taskpool.execute((uri: string, clean: boolean): int => { return this.StopInner(uri, clean); }, uri, clean); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -544,12 +544,12 @@ export default namespace cloudSync { let promise = taskpool.execute((uri: string, clean: boolean): int => { return this.StopInner(uri, clean); }, uri, clean); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -654,8 +654,8 @@ export default namespace cloudSync { taskPool.then((result: NullishType): void => { resolve(result as int); - }, (error: BusinessError): void => { - reject(error); + }, (error: Error): void => { + reject(error as BusinessError); }); }); return promise; @@ -663,31 +663,31 @@ export default namespace cloudSync { export function getFileSyncState(uri: Array): Promise> { let promise = new Promise>((resolve, reject) => { - let promises = uri.map((v: string): Promise => { return getPromiseFileSyncState(v) }); - Promise.all(promises).then((re: Array): void => { + let promises = uri.map((v: string): Promise => {return getPromiseFileSyncState(v)}); + Promise.all(promises).then((re: Array): void => { let res: Array = re.map((result: int) => { return result as FileSyncState; }); resolve(res); - }).catch((e: BusinessError): void => { - reject(e); + }).catch((e: Error): void => { + reject(e as BusinessError); }); }); return promise; } export function getFileSyncState(uri: Array, callback: AsyncCallback>): void { - let promises = uri.map((v: string): Promise => { return getPromiseFileSyncState(v) }); - Promise.all(promises).then((re: Array): void => { + let promises = uri.map((v: string): Promise => {return getPromiseFileSyncState(v)}); + Promise.all(promises).then((re: Array): void => { let res: Array = re.map((result: int) => { return result as FileSyncState; }); let e = new BusinessError(); e.code = 0; callback(e, res); - }).catch((e: BusinessError): void => { + }).catch((e: Error): void => { let res: Array = new Array(); - callback(e, res); + callback(e as BusinessError, res); }); } @@ -716,16 +716,16 @@ export default namespace cloudSync { StaticFunction.optimizeStorageInner(); return 0; }); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } export function startOptimizeSpace(para: OptimizeSpaceParam, cb?: Callback): Promise { - let callback: Callback = (data: OptimizeSpaceProgress) => { }; + let callback: Callback = (data: OptimizeSpaceProgress): void => {}; if (cb !== undefined) { callback = cb; } @@ -738,10 +738,10 @@ export default namespace cloudSync { StaticFunction.startOptimizeSpaceInner(param, cbk); return 0; }, para, callback); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -908,4 +908,4 @@ export default namespace cloudSync { native isFileConflictInner(uri: string): boolean; native clearFileConflictInner(uri: string): void; } -}; \ No newline at end of file +}; diff --git a/interfaces/kits/js/ani/file_cloud_sync_manager/ets/@ohos.file.cloudSyncManager.ets b/interfaces/kits/js/ani/file_cloud_sync_manager/ets/@ohos.file.cloudSyncManager.ets index 98a6fb5c096692f00065b35c1a92ce152a9b89c7..723d01ea71bd33bf2179513b353832233b2ce7ac 100644 --- a/interfaces/kits/js/ani/file_cloud_sync_manager/ets/@ohos.file.cloudSyncManager.ets +++ b/interfaces/kits/js/ani/file_cloud_sync_manager/ets/@ohos.file.cloudSyncManager.ets @@ -211,10 +211,10 @@ export default namespace cloudSyncManager { StaticFunction.changeAppCloudSwitchInner(accountId, bundleName, status); return 0; }, accountId, bundleName, status); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -233,12 +233,12 @@ export default namespace cloudSyncManager { StaticFunction.changeAppCloudSwitchInner(accountId, bundleName, status); return 0; }, accountId, bundleName, status); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -252,10 +252,10 @@ export default namespace cloudSyncManager { StaticFunction.notifyDataChangeInner(accountId, bundleName); return 0; }, accountId, bundleName); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -268,12 +268,12 @@ export default namespace cloudSyncManager { StaticFunction.notifyDataChangeInner(accountId, bundleName); return 0; }, accountId, bundleName); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -287,10 +287,10 @@ export default namespace cloudSyncManager { StaticFunction.enableCloudInner(accountId, switches); return 0; }, accountId, switches); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -303,12 +303,12 @@ export default namespace cloudSyncManager { StaticFunction.enableCloudInner(accountId, switches); return 0; }, accountId, switches); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -321,10 +321,10 @@ export default namespace cloudSyncManager { StaticFunction.disableCloudInner(accountId); return 0; }, accountId); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -336,12 +336,12 @@ export default namespace cloudSyncManager { StaticFunction.disableCloudInner(accountId); return 0; }, accountId); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -355,10 +355,10 @@ export default namespace cloudSyncManager { StaticFunction.cleanInner(accountId, appActions); return 0; }, accountId, appActions); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -371,12 +371,12 @@ export default namespace cloudSyncManager { StaticFunction.cleanInner(accountId, appActions); return 0; }, accountId, appActions); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } @@ -390,10 +390,10 @@ export default namespace cloudSyncManager { StaticFunction.notifyEventChangeInner(userId, extraData); return 0; }, userId, extraData); - promise.then((): void => { + promise.then((): void => { resolve(undefined); - }, (e: BusinessError): void => { - reject(e); + }, (e: Error): void => { + reject(e as BusinessError); }); }); } @@ -406,12 +406,12 @@ export default namespace cloudSyncManager { StaticFunction.notifyEventChangeInner(userId, extraData); return 0; }, userId, extraData); - promise.then((): void => { + promise.then((): void => { let e = new BusinessError(); e.code = 0; callback(e, undefined); - }, (e: BusinessError): void => { - callback(e, undefined); + }, (e: Error): void => { + callback(e as BusinessError, undefined); }); } -} \ No newline at end of file +}