diff --git a/interfaces/kits/ani/printani/ets/@ohos.print.ets b/interfaces/kits/ani/printani/ets/@ohos.print.ets index 84bf44fb085462a00e7a2f20a56444be176ccd70..f6164badfa39f72a53cc065720543158ee4c7852 100644 --- a/interfaces/kits/ani/printani/ets/@ohos.print.ets +++ b/interfaces/kits/ani/printani/ets/@ohos.print.ets @@ -454,15 +454,15 @@ export default namespace print { native function onJobStateChangeNative(type: 'jobStateChange', callback: JobStateChangeWrapper) : int; native function onExtInfoChangeNative(type: 'extInfoChange', callback: ExtInfoChangeWrapper) : int; - + native function onPrintTask(type: string, callback: CallbackWrapper, task : PrintTaskImpl) : void; native function offPrintTask(type: string, callback: CallbackWrapper, task : PrintTaskImpl) : void; native function offNative(type: string, callback: CallbackWrapper) : int; - + native function queryAllPrinterExtensionInfosNative(callback: AsyncCallbackArrayWrapper): void; - + native function startDiscoverPrinterNative(extensionList: Array, callback: AsyncCallbackWrapper): void; native function stopDiscoverPrinterNative(callback: AsyncCallbackWrapper): void; @@ -516,7 +516,7 @@ export default namespace print { native function addPrinterToDiscoveryNative(printerInformation: PrinterInformation, callback: AsyncCallbackWrapper): void; native function updatePrinterInDiscoveryNative(printerInformation: PrinterInformation, callback: AsyncCallbackWrapper): void; - + native function removePrinterFromDiscoveryNative(printerId: string, callback: AsyncCallbackWrapper): void; native function getPrinterInformationByIdNative(printerId: string, callback: AsyncCallbackWrapper): void; @@ -538,8 +538,8 @@ export default namespace print { onPrintTask(type, myCall, this); } off(type: 'block' | 'succeed' | 'fail' | 'cancel', callback?: Callback): void { - let myCall = new CallbackWrapper(() => {}); - + let myCall = new CallbackWrapper((): void => {}); + if (callback !== undefined) { myCall = new CallbackWrapper(callback); } @@ -554,9 +554,9 @@ export default namespace print { }) } - export function print(files: Array): Promise { - let p:Promise = - new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + export function print(files: Array): Promise { + let p:Promise = + new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: PrintTask | undefined)=>{ if (err === null || err.code == 0) { resolve(data); @@ -578,9 +578,9 @@ export default namespace print { }) } - export function print(files: Array, context: Context): Promise { - let p:Promise = - new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + export function print(files: Array, context: Context): Promise { + let p:Promise = + new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: PrintTask | undefined)=>{ if (err === null || err.code == 0) { resolve(data); @@ -596,9 +596,9 @@ export default namespace print { } export function print(jobName: string, printAdapter: PrintDocumentAdapter, printAttributes: PrintAttributes, - context: Context): Promise { - let p:Promise = - new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + context: Context): Promise { + let p:Promise = + new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: PrintTask | undefined)=>{ if (err === null || err.code == 0) { resolve(data); @@ -626,9 +626,9 @@ export default namespace print { }) } - export function queryAllPrinterExtensionInfos(): Promise> { - let p:Promise> = - new Promise>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + export function queryAllPrinterExtensionInfos(): Promise | undefined> { + let p:Promise | undefined> = + new Promise | undefined>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackArrayWrapper((err: BusinessError | null, data: Array | undefined)=>{ if (err === null || err.code == 0) { resolve(data); @@ -651,10 +651,10 @@ export default namespace print { } export function startDiscoverPrinter(extensionList: Array): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -674,10 +674,10 @@ export default namespace print { } export function stopDiscoverPrinter(): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -696,10 +696,10 @@ export default namespace print { } export function connectPrinter(printerId: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -718,10 +718,10 @@ export default namespace print { } export function disconnectPrinter(printerId: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -740,10 +740,10 @@ export default namespace print { } export function queryPrinterCapability(printerId: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -762,10 +762,10 @@ export default namespace print { } export function startPrintJob(jobInfo: PrintJob): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -784,10 +784,10 @@ export default namespace print { } export function cancelPrintJob(jobId: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -805,9 +805,9 @@ export default namespace print { }); } - export function requestPrintPreview(jobInfo: PrintJob): Promise { - return new Promise((resolve: (data:int | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { - let myCall = new AsyncCallbackWrapper((err, data) => { + export function requestPrintPreview(jobInfo: PrintJob): Promise { + return new Promise((resolve: (data:int|undefined)=>void, reject:(err: BusinessError)=>void):void => { + let myCall = new AsyncCallbackWrapper((err, data): void => { if (err === null || err.code == 0) { resolve(data); } else { @@ -820,7 +820,7 @@ export default namespace print { }); } - + export class PrinterStateChangeWrapper { private myFun_: (state: PrinterState, info: PrinterInfo) => void; @@ -891,12 +891,12 @@ export default namespace print { } export function off(type: 'printerStateChange' | 'jobStateChange' | 'extInfoChange', callback?: Callback): void { - let myCall = new CallbackWrapper(() => {}); - + let myCall = new CallbackWrapper((): void => {}); + if (callback !== undefined) { myCall = new CallbackWrapper(callback); } - + taskpool.execute((): void => { offNative(type, myCall); }); @@ -910,10 +910,10 @@ export default namespace print { } export function addPrinters(printers: Array): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -932,10 +932,10 @@ export default namespace print { } export function removePrinters(printerIds: Array): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -954,10 +954,10 @@ export default namespace print { } export function updatePrinters(printers: Array): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -976,10 +976,10 @@ export default namespace print { } export function updatePrinterState(printerId: string, state: PrinterState): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -998,10 +998,10 @@ export default namespace print { } export function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1020,10 +1020,10 @@ export default namespace print { } export function updateExtensionInfo(info: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1042,10 +1042,10 @@ export default namespace print { } export function queryAllPrintJobs(): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1063,8 +1063,8 @@ export default namespace print { }); } - export function queryPrintJobList(): Promise> { - return new Promise>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { + export function queryPrintJobList(): Promise | undefined> { + return new Promise | undefined>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError)=>void): void => { let myCall = new AsyncCallbackArrayWrapper((err : BusinessError | null, data : Array|undefined) => { if (err === null || err.code == 0) { resolve(data); @@ -1085,8 +1085,8 @@ export default namespace print { }); } - export function queryPrintJobById(jobId: string): Promise { - return new Promise((resolve: (data: PrintJob | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { + export function queryPrintJobById(jobId: string): Promise { + return new Promise((resolve: (data: PrintJob | undefined)=>void, reject:(err: BusinessError)=>void): void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null, data : PrintJob|undefined) => { if (err === null || err.code == 0) { resolve(data); @@ -1116,10 +1116,10 @@ export default namespace print { } export function notifyPrintService(jobId: string, type: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1130,8 +1130,8 @@ export default namespace print { }); } - export function getAddedPrinters(): Promise> { - return new Promise>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { + export function getAddedPrinters(): Promise | undefined> { + return new Promise | undefined>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError)=>void): void => { let myCall = new AsyncCallbackArrayWrapper((err : BusinessError | null, data : Array | undefined) => { if (err === null || err.code == 0) { resolve(data); @@ -1145,8 +1145,8 @@ export default namespace print { }); } - export function getPrinterInfoById(printerId: string): Promise { - return new Promise((resolve: (data: PrinterInfo | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { + export function getPrinterInfoById(printerId: string): Promise { + return new Promise((resolve: (data: PrinterInfo | undefined)=>void, reject:(err: BusinessError)=>void): void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null, data : PrinterInfo | undefined) => { if (err === null || err.code == 0) { resolve(data); @@ -1161,10 +1161,10 @@ export default namespace print { } export function notifyPrintServiceEvent(event: ApplicationEvent): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1176,10 +1176,10 @@ export default namespace print { } export function addPrinterToDiscovery(printerInformation: PrinterInformation): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1191,10 +1191,10 @@ export default namespace print { } export function updatePrinterInDiscovery(printerInformation: PrinterInformation): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1206,10 +1206,10 @@ export default namespace print { } export function removePrinterFromDiscovery(printerId: string): Promise { - return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { + return new Promise((resolve: (data: PromiseLike)=>void, reject:(err: BusinessError)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { - resolve(undefined); + resolve(Promise.resolve()); } else { reject(err); } @@ -1220,8 +1220,8 @@ export default namespace print { }); } - export function getPrinterInformationById(printerId: string): Promise { - return new Promise((resolve: (data: PrinterInformation | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { + export function getPrinterInformationById(printerId: string): Promise { + return new Promise((resolve: (data: PrinterInformation | undefined)=>void, reject:(err: BusinessError)=>void): void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null, data : PrinterInformation | undefined) => { if (err === null || err.code == 0) { resolve(data); @@ -1235,4 +1235,3 @@ export default namespace print { }); } } -