From e219b1e5b569baf1526b674ff99e494e5cf7cdfe Mon Sep 17 00:00:00 2001
From: yanyilin <yanyilin@dcloud.io>
Date: Fri, 15 Sep 2023 22:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0uni-getbatteryinfo=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E7=89=88=E6=9C=AC=E4=B8=BA1.3.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uni_modules/uni-getbatteryinfo/changelog.md   |  7 ++++
 uni_modules/uni-getbatteryinfo/package.json   |  2 +-
 .../utssdk/app-android/index.uts              |  5 ++-
 .../uni-getbatteryinfo/utssdk/index.d.ts      | 42 +++++++++++++++++++
 4 files changed, 53 insertions(+), 3 deletions(-)
 create mode 100644 uni_modules/uni-getbatteryinfo/utssdk/index.d.ts

diff --git a/uni_modules/uni-getbatteryinfo/changelog.md b/uni_modules/uni-getbatteryinfo/changelog.md
index 1a6be2c..03f2110 100644
--- a/uni_modules/uni-getbatteryinfo/changelog.md
+++ b/uni_modules/uni-getbatteryinfo/changelog.md
@@ -1,5 +1,12 @@
+## 1.3.1（2023-09-15）
+app端适配使用UniError
+
+## 1.3.0（2023-05-30）
+新增 同步获取电量api
+
 ## 1.2.0（2022-10-17）
 实现百度小程序/支付宝小程序/QQ小程序获取电量
+
 ## 1.1.0（2022-10-17）
 实现ios平台获取电量
 
diff --git a/uni_modules/uni-getbatteryinfo/package.json b/uni_modules/uni-getbatteryinfo/package.json
index ea26d52..0fc760c 100644
--- a/uni_modules/uni-getbatteryinfo/package.json
+++ b/uni_modules/uni-getbatteryinfo/package.json
@@ -1,7 +1,7 @@
 {
   "id": "uni-getbatteryinfo",
   "displayName": "uni-getbatteryinfo",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "description": "使用uts开发，实现在多个平台获取电池电量功能",
   "keywords": [
     "battery"
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
index 776339c..de7e2c1 100644
--- a/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
+++ b/uni_modules/uni-getbatteryinfo/utssdk/app-android/index.uts
@@ -1,8 +1,9 @@
 import Context from "android.content.Context";
 import BatteryManager from "android.os.BatteryManager";
-import { UTSAndroid } from "io.dcloud.uts";
 
-import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts'
+import { GetBatteryInfo, GetBatteryInfoOptions, GetBatteryInfoSuccess, GetBatteryInfoResult,GetBatteryInfoSync } from '../interface.uts'
+
+
 /**
  * 异步获取电量
  */
diff --git a/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts b/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
new file mode 100644
index 0000000..bfd890c
--- /dev/null
+++ b/uni_modules/uni-getbatteryinfo/utssdk/index.d.ts
@@ -0,0 +1,42 @@
+declare namespace UniNamespace {
+  interface GetBatteryInfoSuccessCallbackResult {
+    /**
+     * 是否正在充电中
+     */
+    isCharging: boolean;
+    /**
+     * 设备电量，范围 1 - 100
+     */
+    level: number;
+    errMsg: string;
+  }
+
+  interface GetBatteryInfoOption {
+    /**
+     * 接口调用结束的回调函数（调用成功、失败都会执行）
+     */
+    complete?: Function
+    /**
+     * 接口调用失败的回调函数
+     */
+    fail?: Function
+    /**
+     * 接口调用成功的回调函数
+     */
+    success?: (result: GetBatteryInfoSuccessCallbackResult) => void
+  }
+}
+
+declare interface Uni {
+  /**
+   * 获取设备电量
+   *
+   * 文档: [https://uniapp.dcloud.net.cn/api/system/batteryInfo.html](https://uniapp.dcloud.net.cn/api/system/batteryInfo.html)
+   */
+  getBatteryInfo(option?: UniNamespace.GetBatteryInfoOption): void;
+
+	/**
+	 * 同步获取电池电量信息
+	 */
+	GetBatteryInfoSync(): UniNamespace.GetBatteryInfoSuccessCallbackResult;
+}
-- 
GitLab