diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index ad7c2a6be83a79900b8cac13428e51381e113455..cc4f2a1a439679c447b2f3bbe509db8e8c8870c5 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -14,8 +14,9 @@ }, { "bundleId" : "io.dcloud.test123456", - "certificateFile" : "/Users/lizhongyi/Desktop/文件/证书/dev_123.p12", - "certificateProfileFile" : "/Users/lizhongyi/Desktop/文件/证书/io_dcloud_test123456.mobileprovision", + "certificateFile" : "/Users/lizhongyi/Desktop/newProfiles/dev_123.p12", + "certificateProfileFile" : "/Users/lizhongyi/Desktop/newProfiles/wildcard.mobileprovision", + "runSignStatus" : 1, "type" : "uni-app:app-ios" } ] diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts index 060043b8662663d4b6ce54b71974de7089599503..5ae056d96e3d41349089f07a07c6bfbb6fd30864 100644 --- a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts +++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts @@ -5,6 +5,7 @@ import { GetBatteryInfo, GetBatteryInfoOptions, GetBatteryInfoSuccess, GetBatter import IntentFilter from 'android.content.IntentFilter'; import Intent from 'android.content.Intent'; +import { GetBatteryInfoFailImpl } from '../unierror'; /** * 异步获取电量 @@ -33,8 +34,8 @@ export const getBatteryInfo : GetBatteryInfo = function (options : GetBatteryInf } options.success?.(res) options.complete?.(res) - } else { - const res = new UniError("uni-getBatteryInfo", 1001, "getBatteryInfo:fail getAppContext is null") + } else { + let res = new GetBatteryInfoFailImpl(1001); options.fail?.(res) options.complete?.(res) } diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts index e33ab29913aa1586d6a6cbfd1bda3fa4438a8932..de45bdc454fef51d0f63de5581140db8c2809c7c 100644 --- a/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts +++ b/uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts @@ -1,9 +1,7 @@ // 引用 iOS 原生平台 api import { UIDevice } from "UIKit"; -import { Int } from 'Swift'; import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoResult, GetBatteryInfoSync } from '../interface.uts'; - /** * 导出 获取电量方法 */ @@ -15,7 +13,7 @@ export const getBatteryInfo : GetBatteryInfo = function (options) { // 返回数据 const res : GetBatteryInfoSuccess = { errMsg: "getBatteryInfo:ok", - level: new Int(UIDevice.current.batteryLevel * 100), + level: Number(UIDevice.current.batteryLevel * 100), isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging, }; options.success?.(res); diff --git a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts index d674221a16620c90639a24de95efbe59177ffa9d..9c7f25fbf6873eb1983882b722ee8bfbfda8b2a0 100644 --- a/uni_modules/uni-getbatteryinfo/utssdk/interface.uts +++ b/uni_modules/uni-getbatteryinfo/utssdk/interface.uts @@ -55,7 +55,19 @@ export type GetBatteryInfoResult = { * 是否正在充电中 */ isCharging : boolean -} +} + +/** + * 错误码 + * - 1001 getAppContext is null + */ +export type GetBatteryInfoErrorCode = 1001 ; +/** + * myApi 的错误回调参数 + */ +export interface GetBatteryInfoFail extends IUniError { + errCode : GetBatteryInfoErrorCode +}; /** * 获取电量信息 diff --git a/uni_modules/uni-getbatteryinfo/utssdk/unierror.uts b/uni_modules/uni-getbatteryinfo/utssdk/unierror.uts new file mode 100644 index 0000000000000000000000000000000000000000..511c66cc0f6627e4e5e72b478fec1163c56ce92c --- /dev/null +++ b/uni_modules/uni-getbatteryinfo/utssdk/unierror.uts @@ -0,0 +1,34 @@ +import { GetBatteryInfoErrorCode, GetBatteryInfoFail } from "./interface.uts" +/** + * 错误主题 + */ +export const UniErrorSubject = 'uni-getBatteryInfo'; + + +/** + * 错误信息 + * @UniError + */ +export const UniErrors : Map = new Map([ + /** + * 错误码及对应的错误信息 + */ + [1001, 'getBatteryInfo:fail getAppContext is null'], +]); + + +/** + * 错误对象实现 + */ +export class GetBatteryInfoFailImpl extends UniError implements GetBatteryInfoFail { + + /** + * 错误对象构造函数 + */ + constructor(errCode : GetBatteryInfoErrorCode) { + super(); + this.errSubject = UniErrorSubject; + this.errCode = errCode; + this.errMsg = UniErrors[errCode] ?? ""; + } +} \ No newline at end of file