From 7bdad3b535d3996231c30c4abf195e907d15d521 Mon Sep 17 00:00:00 2001
From: m0_75226990 <lizhongyi@dcloud.io>
Date: Thu, 8 Dec 2022 19:41:30 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20uts-getbatteryinfo=E6=8F=92=E4=BB=B6?=
 =?UTF-8?q?=E6=8C=89=E7=85=A7jsdoc=E8=A7=84=E8=8C=83=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../utssdk/app-android/index.uts              |  6 +-
 .../uts-getbatteryinfo/utssdk/interface.uts   | 84 +++++++++++++++++++
 .../uts-getbatteryinfo/utssdk/web/index.js    |  2 +
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 uni_modules/uts-getbatteryinfo/utssdk/interface.uts

diff --git a/uni_modules/uts-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uts-getbatteryinfo/utssdk/app-android/index.uts
index b3a65d1..534d02e 100644
--- a/uni_modules/uts-getbatteryinfo/utssdk/app-android/index.uts
+++ b/uni_modules/uts-getbatteryinfo/utssdk/app-android/index.uts
@@ -19,7 +19,9 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
             BatteryManager.BATTERY_PROPERTY_CAPACITY
         );
         const res = {
-            errMsg: 'getBatteryInfo:ok',
+            errCode: 0,
+            errSubject: "uni-getBatteryInfo",
+            errMsg: "getBatteryInfo:ok",
             level,
             isCharging: manager.isCharging()
         }
@@ -27,6 +29,8 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
         options.complete?.(res)
     } else {
         const res = {
+			errCode: 1001,
+			errSubject: "uni-getBatteryInfo",
             errMsg: 'getBatteryInfo:fail getAppContext is null'
         }
         options.fail?.(res)
diff --git a/uni_modules/uts-getbatteryinfo/utssdk/interface.uts b/uni_modules/uts-getbatteryinfo/utssdk/interface.uts
new file mode 100644
index 0000000..b029929
--- /dev/null
+++ b/uni_modules/uts-getbatteryinfo/utssdk/interface.uts
@@ -0,0 +1,84 @@
+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
+
diff --git a/uni_modules/uts-getbatteryinfo/utssdk/web/index.js b/uni_modules/uts-getbatteryinfo/utssdk/web/index.js
index decf23c..1e9cb48 100644
--- a/uni_modules/uts-getbatteryinfo/utssdk/web/index.js
+++ b/uni_modules/uts-getbatteryinfo/utssdk/web/index.js
@@ -11,6 +11,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)
-- 
GitLab