From ce930e4295a69b443163cc8c26e9a44a82b29ee9 Mon Sep 17 00:00:00 2001 From: lizhongyi Date: Thu, 7 Sep 2023 20:42:44 +0800 Subject: [PATCH] =?UTF-8?q?uni-getbatteryinfo=E3=80=81uni-usercapturescree?= =?UTF-8?q?n=20=E6=8F=92=E4=BB=B6=E4=B8=AD=E9=94=99=E8=AF=AF=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E6=94=B9=E4=B8=BAUniError?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utssdk/app-android/index.uts | 15 ++++---- .../uni-getbatteryinfo/utssdk/interface.uts | 38 +++++++++---------- .../utssdk/app-ios/index.uts | 14 ++----- .../utssdk/interface.uts | 21 +--------- 4 files changed, 31 insertions(+), 57 deletions(-) diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts index d7fe8ac..6006789 100644 --- a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts +++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts @@ -2,7 +2,7 @@ import Context from "android.content.Context"; import BatteryManager from "android.os.BatteryManager"; import { UTSAndroid } from "io.dcloud.uts"; -import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoFail, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts' +import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts' /** * 异步获取电量 * @param {Object} options @@ -24,12 +24,13 @@ export const getBatteryInfo : GetBatteryInfo = function (options) { options.success?.(res) options.complete?.(res) } else { - const res : GetBatteryInfoFail = { - errSubject: "uni-getBatteryInfo", - errCode: 1001, - errMsg: 'getBatteryInfo:fail getAppContext is null', - cause: null - } + // const res : GetBatteryInfoFail = { + // errSubject: "uni-getBatteryInfo", + // errCode: 1001, + // errMsg: 'getBatteryInfo:fail getAppContext is null', + // cause: null + // } + const res = new UniError("uni-getBatteryInfo", 1001, "getBatteryInfo:fail getAppContext is null") options.fail?.(res) options.complete?.(res) } diff --git a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts index b62d62c..edf8bc7 100644 --- a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts +++ b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts @@ -10,24 +10,24 @@ export type GetBatteryInfoSuccess = { isCharging : boolean } -export type GetBatteryInfoFail = { - /** - * 错误码 - */ - errCode : number, - /** - * 调用API的名称 - */ - errSubject : string, - /** - * 错误的详细信息 - */ - errMsg : string, - /** - * 错误来源 - */ - cause : any | null -} +// export type GetBatteryInfoFail = { +// /** +// * 错误码 +// */ +// errCode : number, +// /** +// * 调用API的名称 +// */ +// errSubject : string, +// /** +// * 错误的详细信息 +// */ +// errMsg : string, +// /** +// * 错误来源 +// */ +// cause : any | null +// } @@ -39,7 +39,7 @@ export type GetBatteryInfoOptions = { /** * 接口调用失败的回调函数 */ - fail ?: (res : GetBatteryInfoFail) => void + fail ?: (res : UniError) => void /** * 接口调用成功的回调 */ diff --git a/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts b/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts index 544fb21..003f572 100644 --- a/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts +++ b/uni_modules/uni-usercapturescreen/utssdk/app-ios/index.uts @@ -3,7 +3,7 @@ import { CGRect } from "CoreFoundation"; import { UIApplication, UIView, UITextField, UIScreen, UIDevice } from "UIKit" import { UTSiOS } from "DCloudUTSFoundation" import { DispatchQueue } from 'Dispatch'; -import { SetUserCaptureScreenOptions, OnUserCaptureScreenCallbackResult, OnUserCaptureScreen, OffUserCaptureScreen, SetUserCaptureScreen, UserCaptureScreenCallback, SetUserCaptureScreenSuccess, SetUserCaptureScreenFail } from "../interface.uts" +import { SetUserCaptureScreenOptions, OnUserCaptureScreenCallbackResult, OnUserCaptureScreen, OffUserCaptureScreen, SetUserCaptureScreen, UserCaptureScreenCallback, SetUserCaptureScreenSuccess } from "../interface.uts" /** * 定义监听截屏事件工具类 @@ -119,20 +119,12 @@ export const offUserCaptureScreen : OffUserCaptureScreen = function (callback : */ export const setUserCaptureScreen : SetUserCaptureScreen = function (options : SetUserCaptureScreenOptions) { if (UIDevice.current.systemVersion < "13.0") { - let res: SetUserCaptureScreenFail = { - errCode: 12001, - errSubject: "uni-usercapturescreen", - errMsg: "setUserCaptureScreen:system not support" - } + let res = new UniError("uni-usercapturescreen", 12001, "setUserCaptureScreen:system not support") options.fail?.(res); options.complete?.(res); } else if (UIDevice.current.systemVersion == "15.1") { - let res: SetUserCaptureScreenFail = { - errCode: 12010, - errSubject: "uni-usercapturescreen", - errMsg: "setUserCaptureScreen:system internal error" - } + let res = new UniError("uni-usercapturescreen", 12010, "setUserCaptureScreen:system internal error") options.fail?.(res); options.complete?.(res); } else { diff --git a/uni_modules/uni-usercapturescreen/utssdk/interface.uts b/uni_modules/uni-usercapturescreen/utssdk/interface.uts index c2a55b6..9b93483 100644 --- a/uni_modules/uni-usercapturescreen/utssdk/interface.uts +++ b/uni_modules/uni-usercapturescreen/utssdk/interface.uts @@ -23,25 +23,6 @@ export type OffUserCaptureScreen = (callback : UserCaptureScreenCallback | null) export type SetUserCaptureScreenSuccess = { } -/** - * uni.setUserCaptureScreen失败回调参数 - */ -export type SetUserCaptureScreenFail = { - /** - * 错误码 - * 12001:system not support - * 12010:system internal error - */ - errCode : number, - /** - * 调用API的名称 - */ - errSubject : string, - /** - * 错误的详细信息 - */ - errMsg : string, -} /** * uni.setUserCaptureScreen成功回调函数定义 @@ -51,7 +32,7 @@ export type SetUserCaptureScreenSuccessCallback = (res : SetUserCaptureScreenSuc /** * uni.setUserCaptureScreen失败回调函数定义 */ -export type SetUserCaptureScreenFailCallback = (res : SetUserCaptureScreenFail) => void +export type SetUserCaptureScreenFailCallback = (res : UniError) => void /** * uni.setUserCaptureScreen完成回调函数定义 -- GitLab