diff --git a/interfaces/kits/ani/printani/ets/@ohos.print.ets b/interfaces/kits/ani/printani/ets/@ohos.print.ets index a63f53553077fdaf1a7a67b3afc00318b4a32781..eb435040faf091e21903ccee5a935ddb408fb646 100644 --- a/interfaces/kits/ani/printani/ets/@ohos.print.ets +++ b/interfaces/kits/ani/printani/ets/@ohos.print.ets @@ -547,14 +547,17 @@ export default namespace print { } } - export function print(files: Array, callback: AsyncCallback): void { + export overload print { printWithCallback, printReturnsPromise, printWithContextCallbackOfPrintTask, + printWithContextReturnsPromise,printWithJobNameReturnsPromise } + + export function printWithCallback(files: Array, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { printNative(files, myCall); }) } - export function print(files: Array): Promise { + export function printReturnsPromise(files: Array): Promise { let p:Promise = new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: PrintTask | undefined)=>{ @@ -571,14 +574,14 @@ export default namespace print { return p; } - export function print(files: Array, context: Context, callback: AsyncCallback): void { + export function printWithContextCallbackOfPrintTask(files: Array, context: Context, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { printWithContextNative(files, context, myCall); }) } - export function print(files: Array, context: Context): Promise { + export function printWithContextReturnsPromise(files: Array, context: Context): Promise { let p:Promise = new Promise((resolve: (data: PrintTask | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err: BusinessError | null, data: PrintTask | undefined)=>{ @@ -595,7 +598,7 @@ export default namespace print { return p; } - export function print(jobName: string, printAdapter: PrintDocumentAdapter, printAttributes: PrintAttributes, + export function printWithJobNameReturnsPromise(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 => { @@ -619,14 +622,16 @@ export default namespace print { return p; } - export function queryAllPrinterExtensionInfos(callback: AsyncCallback>): void { + export overload queryallprinterextensioninfos { queryAllPrinterExtensionInfosWithCallback, queryAllPrinterExtensionInfosReturnsPromise } + + export function queryAllPrinterExtensionInfosWithCallback(callback: AsyncCallback>): void { let myCall = new AsyncCallbackArrayWrapper(callback); taskpool.execute((): void => { queryAllPrinterExtensionInfosNative(myCall); }) } - export function queryAllPrinterExtensionInfos(): Promise> { + export function queryAllPrinterExtensionInfosReturnsPromise(): Promise> { let p:Promise> = new Promise>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackArrayWrapper((err: BusinessError | null, data: Array | undefined)=>{ @@ -643,14 +648,16 @@ export default namespace print { return p; } - export function startDiscoverPrinter(extensionList: Array, callback: AsyncCallback): void { + export overload startdiscoverprinter { startDiscoverPrinterWithCallback, startDiscoverPrinterReturnsPromise } + + export function startDiscoverPrinterWithCallback(extensionList: Array, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { startDiscoverPrinterNative(extensionList, myCall); }); } - export function startDiscoverPrinter(extensionList: Array): Promise { + export function startDiscoverPrinterReturnsPromise(extensionList: Array): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -666,14 +673,16 @@ export default namespace print { }); } - export function stopDiscoverPrinter(callback: AsyncCallback): void { + export overload stopdiscoverprinter { stopDiscoverPrinterWithCallback, stopDiscoverPrinterReturnsPromise } + + export function stopDiscoverPrinterWithCallback(callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { stopDiscoverPrinterNative(myCall); }); } - export function stopDiscoverPrinter(): Promise { + export function stopDiscoverPrinterReturnsPromise(): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -688,14 +697,16 @@ export default namespace print { }); } - export function connectPrinter(printerId: string, callback: AsyncCallback): void { + export overload connectprinter { connectPrinterWithCallback, connectPrinterReturnsPromise } + + export function connectPrinterWithCallback(printerId: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { connectPrinterNative(printerId, myCall); }); } - export function connectPrinter(printerId: string): Promise { + export function connectPrinterReturnsPromise(printerId: string): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -710,14 +721,16 @@ export default namespace print { }); } - export function disconnectPrinter(printerId: string, callback: AsyncCallback): void { + export overload disconnectprinter { disconnectPrinterWithCallback, disconnectPrinterReturnsPromise } + + export function disconnectPrinterWithCallback(printerId: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { disconnectPrinterNative(printerId, myCall); }); } - export function disconnectPrinter(printerId: string): Promise { + export function disconnectPrinterReturnsPromise(printerId: string): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -732,14 +745,16 @@ export default namespace print { }); } - export function queryPrinterCapability(printerId: string, callback: AsyncCallback): void { + export overload queryprintercapability { queryPrinterCapabilityWithCallback, queryPrinterCapabilityReturnsPromise } + + export function queryPrinterCapabilityWithCallback(printerId: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { queryPrinterCapabilityNative(printerId, myCall); }); } - export function queryPrinterCapability(printerId: string): Promise { + export function queryPrinterCapabilityReturnsPromise(printerId: string): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -754,14 +769,16 @@ export default namespace print { }); } - export function startPrintJob(jobInfo: PrintJob, callback: AsyncCallback): void { + export overload startprintjob { startPrintJobWithCallback, startPrintJobReturnsPromise} + + export function startPrintJobWithCallback(jobInfo: PrintJob, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { startPrintJobNative(jobInfo, myCall); }); } - export function startPrintJob(jobInfo: PrintJob): Promise { + export function startPrintJobReturnsPromise(jobInfo: PrintJob): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -776,14 +793,16 @@ export default namespace print { }); } - export function cancelPrintJob(jobId: string, callback: AsyncCallback): void { + export overload cancelprintjob { cancelPrintJobWithCallback, cancelPrintJobReturnsPromise } + + export function cancelPrintJobWithCallback(jobId: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { cancelPrintJobNative(jobId, myCall); }); } - export function cancelPrintJob(jobId: string): Promise { + export function cancelPrintJobReturnsPromise(jobId: string): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -798,14 +817,16 @@ export default namespace print { }); } - export function requestPrintPreview(jobInfo: PrintJob, callback: Callback): void { + export overload requestprintpreview { requestPrintPreviewWithCallback, requestPrintPreviewReturnsPromise } + + export function requestPrintPreviewWithCallback(jobInfo: PrintJob, callback: Callback): void { let myCall = new CallbackWrapper(callback); taskpool.execute((): void => { requestPrintPreviewCallbackNative(jobInfo, myCall); }); } - export function requestPrintPreview(jobInfo: PrintJob): Promise { + export function requestPrintPreviewReturnsPromise(jobInfo: PrintJob): Promise { return new Promise((resolve: (data:int | undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err, data) => { if (err === null || err.code == 0) { @@ -902,14 +923,16 @@ export default namespace print { }); } - export function addPrinters(printers: Array, callback: AsyncCallback): void { + export overload addprinters { addPrintersWithCallback, addPrintersReturnsPromise } + + export function addPrintersWithCallback(printers: Array, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { addPrintersNative(printers, myCall); }); } - export function addPrinters(printers: Array): Promise { + export function addPrintersReturnsPromise(printers: Array): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -924,14 +947,16 @@ export default namespace print { }); } - export function removePrinters(printerIds: Array, callback: AsyncCallback): void { + export overload removeprinters { removePrintersWithCallback, removePrintersReturnsPromise } + + export function removePrintersWithCallback(printerIds: Array, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { removePrintersNative(printerIds, myCall); }); } - export function removePrinters(printerIds: Array): Promise { + export function removePrintersReturnsPromise(printerIds: Array): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -946,14 +971,16 @@ export default namespace print { }); } - export function updatePrinters(printers: Array, callback: AsyncCallback): void { + export overload updateprinters { updatePrintersWithCallback, updatePrintersReturnsPromise } + + export function updatePrintersWithCallback(printers: Array, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { updatePrintersNative(printers, myCall); }); } - export function updatePrinters(printers: Array): Promise { + export function updatePrintersReturnsPromise(printers: Array): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -968,14 +995,16 @@ export default namespace print { }); } - export function updatePrinterState(printerId: string, state: PrinterState, callback: AsyncCallback): void { + export overload updateprinterstate { updatePrinterStateWithCallback, updatePrinterStateReturnsPromise } + + export function updatePrinterStateWithCallback(printerId: string, state: PrinterState, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { updatePrinterStateNative(printerId, state, myCall); }); } - export function updatePrinterState(printerId: string, state: PrinterState): Promise { + export function updatePrinterStateReturnsPromise(printerId: string, state: PrinterState): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -990,14 +1019,16 @@ export default namespace print { }); } - export function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState, callback: AsyncCallback): void { + export overload updateprintjobstate { updatePrintJobStateWithCallback, updatePrintJobStateReturnsPromise } + + export function updatePrintJobStateWithCallback(jobId: string, state: PrintJobState, subState: PrintJobSubState, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { updatePrintJobStateNative(jobId, state, subState, myCall); }); } - export function updatePrintJobState(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise { + export function updatePrintJobStateReturnsPromise(jobId: string, state: PrintJobState, subState: PrintJobSubState): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -1012,14 +1043,16 @@ export default namespace print { }); } - export function updateExtensionInfo(info: string, callback: AsyncCallback): void { + export overload updateextensioninfo { updateExtensionInfoWithCallback, updateExtensionInfoReturnsPromise } + + export function updateExtensionInfoWithCallback(info: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { updateExtensionInfoNative(info, myCall); }); } - export function updateExtensionInfo(info: string): Promise { + export function updateExtensionInfoReturnsPromise(info: string): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -1034,14 +1067,16 @@ export default namespace print { }); } - export function queryAllPrintJobs(callback: AsyncCallback): void { + export overload queryAllPrintJobs { queryAllPrintJobsWithCallback, queryAllPrintJobsReturnsPromise } + + export function queryAllPrintJobsWithCallback(callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { queryAllPrintJobsNative(myCall); }); } - export function queryAllPrintJobs(): Promise { + export function queryAllPrintJobsReturnsPromise(): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) { @@ -1056,14 +1091,16 @@ export default namespace print { }); } - export function queryPrintJobList(callback: AsyncCallback>): void { + export overload queryprintjoblist { queryPrintJobListWithCallback, queryPrintJobListReturnsPromise } + + export function queryPrintJobListWithCallback(callback: AsyncCallback>): void { let myCall = new AsyncCallbackArrayWrapper(callback); taskpool.execute((): void => { queryPrintJobListNative(myCall); }); } - export function queryPrintJobList(): Promise> { + export function queryPrintJobListReturnsPromise(): Promise> { return new Promise>((resolve: (data: Array | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { let myCall = new AsyncCallbackArrayWrapper((err : BusinessError | null, data : Array|undefined) => { if (err === null || err.code == 0) { @@ -1078,14 +1115,16 @@ export default namespace print { }); } - export function queryPrintJobById(jobId: string, callback: AsyncCallback): void { + export overload queryprintjobbyid { queryPrintJobByIdWithCallback, queryPrintJobByIdReturnsPromise } + + export function queryPrintJobByIdWithCallback(jobId: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { queryPrintJobByIdNative(jobId, myCall); }); } - export function queryPrintJobById(jobId: string): Promise { + export function queryPrintJobByIdReturnsPromise(jobId: string): Promise { return new Promise((resolve: (data: PrintJob | undefined)=>void, reject:(err: BusinessError | null)=>void): void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null, data : PrintJob|undefined) => { if (err === null || err.code == 0) { @@ -1107,15 +1146,16 @@ export default namespace print { }); } + export overload notifyprintservice { notifyPrintServiceWithCallback, notifyPrintServiceReturnsPromise } - export function notifyPrintService(jobId: string, type: string, callback: AsyncCallback): void { + export function notifyPrintServiceWithCallback(jobId: string, type: string, callback: AsyncCallback): void { let myCall = new AsyncCallbackWrapper(callback); taskpool.execute((): void => { notifyPrintServiceNative(jobId, type, myCall); }); } - export function notifyPrintService(jobId: string, type: string): Promise { + export function notifyPrintServiceReturnsPromise(jobId: string, type: string): Promise { return new Promise((resolve: (data:undefined)=>void, reject:(err: BusinessError | null)=>void):void => { let myCall = new AsyncCallbackWrapper((err : BusinessError | null) => { if (err === null || err.code == 0) {