Merge remote-tracking branch 'origin/dev'

uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts

@@ -19,8 +19,8 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
             BatteryManager.BATTERY_PROPERTY_CAPACITY
         );
         const res = {
-			errSubject: "uni-getBatteryInfo",
 			errCode: 0, 
+			errSubject: "uni-getBatteryInfo",
             errMsg: 'getBatteryInfo:ok',
             level,
             isCharging: manager.isCharging()

uni_modules/uni-getbatteryinfo/utssdk/app-ios/index.uts

@@ -21,6 +21,8 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
 	
 	// 返回数据
     const res = {
+		errCode: 0,
+		errSubject: "uni-getBatteryInfo",
         errMsg: "getBatteryInfo:ok",
         level: new Int(UIDevice.current.batteryLevel * 100),
         isCharging: UIDevice.current.batteryState == UIDevice.BatteryState.charging,

uni_modules/uni-getbatteryinfo/utssdk/interface.uts

+type GetBatteryInfoResult = {
+	/**
+	 * 错误码
+	 */
+	errCode: number,
+	/**
+	 * 调用API的名称
+	 */
+	errSubject: string,
+	/**
+	 * 错误的详细信息
+	 */
+	errMsg: string,
+	/**
+	 * 设备电量，范围1 - 100
+	 */
+	level: number,
+	/**
+	 * 是否正在充电中
+	 */
+	isCharging: boolean
+}
+
+interface UniError<T> {
+	/**
+	 * 错误码
+	 */
+	errCode:T,
+	/**
+	 * 调用API的名称
+	 */
+	errSubject:string,
+	/**
+	 * 错误的详细信息
+	 */
+	errMsg:string,
+	/**
+	 * 错误来源
+	 */
+	cause:any
+}
+
+/**
+ * 错误码
+ */
+type GetBatteryInfoErrorCode = 
+	/** 成功 */ 
+	0
+	/** getAppContext is null */
+	| 1001
+	/** navigator.getBattery is unsupported */
+	| 1002
+;
+
+
+export type GetBatteryInfoOptions = {
+	/**
+	 * 接口调用结束的回调函数（调用成功、失败都会执行）
+	 */
+    success?: (res: GetBatteryInfoResult) => void
+	/**
+	 * 接口调用失败的回调函数
+	 */
+    fail?: (res: UniError<GetBatteryInfoErrorCode>) => void
+	/**
+	 * 接口调用成功的回调
+	 */
+    complete?: (res: object) => void
+}
+
+/**
+ * 获取电量信息
+ * @param {GetBatteryInfoOptions} options
+ * 
+ *
+ * @tutorial https://uniapp.dcloud.net.cn/api/system/batteryInfo.html
+ * @platforms APP-IOS = ^9.0,APP-ANDROID = ^22
+ * @since 3.6.11
+ * 
+ * @assert () => success({errCode: 0, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:ok", level: 60, isCharging: false })
+ * @assert () => fail({errCode: 1001, errSubject: "uni-getBatteryInfo", errMsg: "getBatteryInfo:fail getAppContext is null" })
+ */
+export default function getBatteryInfo(options: GetBatteryInfoOptions): void
+

uni_modules/uni-getbatteryinfo/utssdk/web/index.js

@@ -2,6 +2,8 @@ export default function getBatteryInfo(options) {
     if (navigator.getBattery) {
         navigator.getBattery().then(battery => {
             const res = {
+				errCode: 0,
+				errSubject: "uni-getBatteryInfo",
                 errMsg: 'getBatteryInfo:ok',
                 level: battery.level * 100,
                 isCharging: battery.charging
@@ -11,6 +13,8 @@ export default function getBatteryInfo(options) {
         })
     } else {
         const res = {
+			errCode: 1002,
+			errSubject: "uni-getBatteryInfo",
             errMsg: 'getBatteryInfo:fail navigator.getBattery is unsupported'
         }
         options.fail && options.fail(res)