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 871c4561dc391a09fe1de5f1801ce6d4cfc3cdec..dbce58876ede0de0a682aeeef5b0b9325ccb908d 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 @@ -79,22 +79,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); }); } @@ -102,10 +102,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); }); }); } @@ -116,8 +116,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); }); } @@ -208,22 +208,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); }); } @@ -231,22 +231,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); }); } @@ -325,22 +325,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); }); } @@ -348,10 +348,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); }); }); } @@ -362,32 +362,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); }); } @@ -428,22 +428,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); }); } @@ -457,10 +457,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); }); }); } @@ -470,12 +470,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); }); } @@ -554,8 +554,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; @@ -564,13 +564,13 @@ 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 => { + 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; @@ -578,16 +578,16 @@ export default namespace cloudSync { 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 => { + 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); }); } @@ -611,16 +611,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; } @@ -633,10 +633,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); }); }); } 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 d663e8ff1f1762a341e6e7f9d50cd59570b8e257..2c0e38481d09e08fc1a29096baaf711f29fbd9c5 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 @@ -62,10 +62,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); }); }); } @@ -84,12 +84,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); }); } @@ -103,10 +103,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); }); }); } @@ -119,12 +119,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); }); } @@ -138,10 +138,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); }); }); } @@ -154,12 +154,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); }); } @@ -172,10 +172,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); }); }); } @@ -187,12 +187,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); }); } @@ -206,10 +206,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); }); }); } @@ -222,12 +222,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); }); } @@ -241,10 +241,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); }); }); } @@ -257,12 +257,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 +}