diff --git a/manifest.json b/manifest.json index eb45f610016b71244dd34a3978e3d66225847c01..00c791648f04722c7fa535d0b412975bc39c8f52 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "uni-api", - "appid": "__UNI__ED9218B", + "appid": "__UNI__8BF79AC", "description": "uts插件示例", "versionName": "1.0.0", "versionCode": "100", diff --git a/uni_modules/uni-exit/utssdk/app-android/index.uts b/uni_modules/uni-exit/utssdk/app-android/index.uts index a9998120bd764e86f54ae591a187c1ab101d0ae4..6019d642b2fb52c69992da92e1543813eb898702 100644 --- a/uni_modules/uni-exit/utssdk/app-android/index.uts +++ b/uni_modules/uni-exit/utssdk/app-android/index.uts @@ -1,4 +1,4 @@ -import { ExitOptions, ExitSuccess, ExitCompleteCallback, Exit } from "../interface.uts" +import { ExitOptions, ExitSuccess, Exit } from "../interface.uts" /** diff --git a/uni_modules/uni-exit/utssdk/app-ios/index.uts b/uni_modules/uni-exit/utssdk/app-ios/index.uts index 77a5905a3b956bcadf6f880c37af3fdb6dd9e711..5be055badece05c639c6499763ec0b26db86fd07 100644 --- a/uni_modules/uni-exit/utssdk/app-ios/index.uts +++ b/uni_modules/uni-exit/utssdk/app-ios/index.uts @@ -1,5 +1,5 @@ -import { ExitOptions, ExitFailCallback, ExitCompleteCallback, Exit} from "../interface.uts" -import { UniErrorSubject, UniErrors } from "../unierror.uts" +import { ExitOptions, Exit} from "../interface.uts" +import { ExitFailImpl } from "../unierror.uts" /** @@ -7,7 +7,7 @@ import { UniErrorSubject, UniErrors } from "../unierror.uts" * iOS平台不支持,触发错误回调 */ export const exit : Exit = function (options: ExitOptions | null) { - let err = new UniError(UniErrorSubject, 12001, UniErrors.get(12001)!); + let err = new ExitFailImpl(12001); options?.fail?.(err) options?.complete?.(err) } diff --git a/uni_modules/uni-exit/utssdk/interface.uts b/uni_modules/uni-exit/utssdk/interface.uts index 0df1394ec6c9c81a8458b91b45f795118b835a62..923b4ff3c45108b089c29ab768e1ac288f3e2226 100644 --- a/uni_modules/uni-exit/utssdk/interface.uts +++ b/uni_modules/uni-exit/utssdk/interface.uts @@ -5,6 +5,21 @@ export type ExitSuccess = { errMsg: string } +/** + * 错误码 + * - 12001: 系统不支持 + * - 12002: 未知错误 + */ +export type ExitErrorCode = 12001 | 12002 + +/** + * uni.exit失败回调参数 + */ +export interface IExitError extends IUniError { + errCode: ExitErrorCode +} +export type ExitFail = IExitError + /** * uni.exit成功回调函数定义 */ @@ -12,7 +27,7 @@ export type ExitSuccessCallback = (res: ExitSuccess) => void /** * uni.exit失败回调函数定义 */ -export type ExitFailCallback = (res: UniError) => void +export type ExitFailCallback = (res: ExitFail) => void /** * uni.exit完成回调函数定义 */ diff --git a/uni_modules/uni-exit/utssdk/unierror.uts b/uni_modules/uni-exit/utssdk/unierror.uts index 68bbd48d3e2e508e2bf15033bb70223f116696b7..9b74feb0dce8a92485b9279bfd5c1e542d18d218 100644 --- a/uni_modules/uni-exit/utssdk/unierror.uts +++ b/uni_modules/uni-exit/utssdk/unierror.uts @@ -1,3 +1,5 @@ +import { ExitErrorCode, IExitError } from "./interface.uts" + /** * 错误主题 */ @@ -18,3 +20,18 @@ export const UniErrors:Map = new Map([ */ [12002, 'unknown error'] ]); + +/** + * ExitFail的实现 + */ +export class ExitFailImpl extends UniError implements IExitError { + override errCode: ExitErrorCode + constructor ( + errCode: ExitErrorCode + ) { + super() + this.errSubject = UniErrorSubject + this.errCode = errCode + this.errMsg = UniErrors[errCode] ?? ""; + } +} diff --git a/uni_modules/uni-installApk/utssdk/index.d.ts b/uni_modules/uni-installApk/utssdk/index.d.ts new file mode 100644 index 0000000000000000000000000000000000000000..ad24effbc1e07f4f30aa894e39cb3d388350dabe --- /dev/null +++ b/uni_modules/uni-installApk/utssdk/index.d.ts @@ -0,0 +1,78 @@ +declare namespace UniNamespace { + +interface InstallApkSuccess { + /** + * 安装成功消息 + */ + errMsg : string +} + +type InstallApkErrorCode = 1300002 +interface InstallApkFail { + errCode : InstallApkErrorCode +} + +type InstallApkComplete = any + +type InstallApkSuccessCallback = (res : InstallApkSuccess) => void +type InstallApkFailCallback = (err : InstallApkFail) => void +type InstallApkCompleteCallback = (res : InstallApkComplete) => void + +interface InstallApkOptions { + /** + * apk文件地址 + */ + filePath : string, + /** + * 接口调用成功的回调函数 + * @defaultValue null + */ + success ?: InstallApkSuccessCallback | null, + /** + * 接口调用失败的回调函数 + * @defaultValue null + */ + fail ?: InstallApkFailCallback | null, + /** + * 接口调用结束的回调函数(调用成功、失败都会执行) + * @defaultValue null + */ + complete ?: InstallApkCompleteCallback | null +} + +} + + +declare interface Uni { + /** + * installApk() + * @description + * 安装apk + * @param {InstallApkOptions} + * @return {void} + * @uniPlatform { + * "app": { + * "android": { + * "osVer": "4.4", + * "uniVer": "3.94+", + * "unixVer": "3.94+" + * }, + * "ios": { + * "osVer": "x", + * "uniVer": "x", + * "unixVer": "x" + * } + * } + * } + * @example + ```typescript + uni.installApk({ + filePath: "/xx/xx/xx.apk", + complete: (res: any) => { + console.log("complete => " + JSON.stringify(res)); + } + }); + ``` + */ + installApk(options : UniNamespace.InstallApkOptions) : void +} diff --git a/uni_modules/uni-usercapturescreen/index.d.ts b/uni_modules/uni-usercapturescreen/index.d.ts index debf1a1d781a14f5ef58dec089a42786b7ad837a..e88abe7259f8b662bb551baa5773606480f691a0 100644 --- a/uni_modules/uni-usercapturescreen/index.d.ts +++ b/uni_modules/uni-usercapturescreen/index.d.ts @@ -1,18 +1,157 @@ declare namespace UniNamespace { - type OnUserCaptureScreenCallback = (res?: { errMsg: string }) => void + /** + * uni.onUserCaptureScreen/uni.offUserCaptureScreen回调参数 + */ + type OnUserCaptureScreenCallbackResult = { + /** + * 截屏文件路径(仅Android返回) + */ + path ?: string + } + + /** + * uni.onUserCaptureScreen/uni.offUserCaptureScreen回调函数定义 + */ + type UserCaptureScreenCallback = (res : OnUserCaptureScreenCallbackResult) => void + + type OnUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void + + type OffUserCaptureScreen = (callback : UserCaptureScreenCallback | null) => void + + /** + * uni.setUserCaptureScreen成功回调参数 + */ + type SetUserCaptureScreenSuccess = { + + } + + /** + * uni.setUserCaptureScreen成功回调函数定义 + */ + type SetUserCaptureScreenSuccessCallback = (res : SetUserCaptureScreenSuccess) => void + + /** + * 错误码 + * - 12001 "setUserCaptureScreen:system not support" + * - 12010 "setUserCaptureScreen:system internal error" + */ + type SetUserCaptureScreenErrorCode = 12001 | 12010; + + /** + * SetUserCaptureScreen 的错误回调参数 + */ + interface SetUserCaptureScreenFail { + errCode : SetUserCaptureScreenErrorCode + } + + /** + * uni.setUserCaptureScreen失败回调函数定义 + */ + type SetUserCaptureScreenFailCallback = (res : SetUserCaptureScreenFail) => void + + /** + * uni.setUserCaptureScreen完成回调函数定义 + */ + type SetUserCaptureScreenCompleteCallback = (res : any) => void + + /** + * uni.setUserCaptureScreen参数 + */ + type SetUserCaptureScreenOptions = { + /** + * true: 允许用户截屏 false: 不允许用户截屏,防止用户截屏到应用页面内容 + */ + enable : boolean; + /** + * 接口调用成功的回调函数 + */ + // success : SetUserCaptureScreenSuccessCallback | null, + success ?: SetUserCaptureScreenSuccessCallback, + /** + * 接口调用失败的回调函数 + */ + // fail : SetUserCaptureScreenFailCallback | null, + fail ?: SetUserCaptureScreenFailCallback, + /** + * 接口调用结束的回调函数(调用成功、失败都会执行) + */ + // complete : SetUserCaptureScreenSuccessCallback | SetUserCaptureScreenFailCallback | null + complete ?: SetUserCaptureScreenCompleteCallback + } + + type SetUserCaptureScreen = (options : SetUserCaptureScreenOptions) => void } declare interface Uni { /** - * 监听用户主动截屏事件,用户使用系统截屏按键截屏时触发此事件。 + * 开启截屏监听 * - * 文档: [https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen) + * @param {UserCaptureScreenCallback} callback + * @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#onusercapturescreen + * @uniPlatform { + * "app": { + * "android": { + * "osVer": "4.4.4", + * "uniVer": "3.7.7", + * "unixVer": "3.9.0" + * }, + * "ios": { + * "osVer": "9.0", + * "uniVer": "3.7.7", + * "unixVer": "3.9.0" + * } + * } + * } + * @uniVersion 3.7.7 + * @uniVueVersion 2,3 //支持的vue版本 + * @autotest { expectCallback: true } */ - onUserCaptureScreen(callback: UniNamespace.OnUserCaptureScreenCallback): void; + onUserCaptureScreen(callback : UniNamespace.UserCaptureScreenCallback | null) : void, /** - * 用户主动截屏事件。取消事件监听。 + * 关闭截屏监听 * - * 文档: [https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen](https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen) + * @param {UserCaptureScreenCallback} callback + * @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#offusercapturescreen + * @uniPlatform { + * "app": { + * "android": { + * "osVer": "4.4.4", + * "uniVer": "3.7.7", + * "unixVer": "3.9.0" + * }, + * "ios": { + * "osVer": "9.0", + * "uniVer": "3.7.7", + * "unixVer": "3.9.0" + * } + * } + * } + * @uniVersion 3.7.7 + * @uniVueVersion 2,3 //支持的vue版本 + * @autotest { expectCallback: true } */ - offUserCaptureScreen(callback: UniNamespace.OnUserCaptureScreenCallback): void; -} + offUserCaptureScreen(callback : UniNamespace.UserCaptureScreenCallback | null) : void, + /** + * 设置防截屏 + * + * @param {SetUserCaptureScreenOptions} options + * @tutorial https://uniapp.dcloud.net.cn/api/system/capture-screen.html#setusercapturescreen + * @uniPlatform { + * "app": { + * "android": { + * "osVer": "4.4.4", + * "uniVer": "3.7.7", + * "unixVer": "3.9.0" + * }, + * "ios": { + * "osVer": "13.0", + * "uniVer": "3.7.7", + * "unixVer": "3.9.0" + * } + * } + * } + * @uniVersion 3.7.7 + * @uniVueVersion 2,3 //支持的vue版本 + */ + setUserCaptureScreen(options : UniNamespace.SetUserCaptureScreenOptions) : void +} \ No newline at end of file