电量：重构

uni_modules/uni-getbatteryinfo/package.json

@@ -32,7 +32,7 @@
   },
   "uni_modules": {
     "uni-ext-api": {
-      "uni": "getBatteryInfo"
+      "uni": ["getBatteryInfo"]
     },
     "dependencies": [],
     "encrypt": [],

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

@@ -2,14 +2,9 @@ import Context from "android.content.Context";
 import BatteryManager from "android.os.BatteryManager";
 import { UTSAndroid } from "io.dcloud.uts";
 
+import { GetBatteryInfo, GetBatteryInfoSuccess, GetBatteryInfoFail, GetBatteryInfoOptions } from '../interface.uts'
 
-type GetBatteryInfoOptions = {
-    success?: (res: UTSJSONObject) => void
-    fail?: (res: UTSJSONObject) => void
-    complete?: (res: UTSJSONObject) => void
-}
-
-export default function getBatteryInfo(options: GetBatteryInfoOptions) {
+export const getBatteryInfo : GetBatteryInfo = function (options) {
     const context = UTSAndroid.getAppContext();
     if (context != null) {
         const manager = context.getSystemService(
@@ -18,7 +13,7 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
         const level = manager.getIntProperty(
             BatteryManager.BATTERY_PROPERTY_CAPACITY
         );
-        const res = {
+        const res : GetBatteryInfoSuccess = {
             errCode: 0,
             errSubject: "uni-getBatteryInfo",
             errMsg: 'getBatteryInfo:ok',
@@ -28,10 +23,11 @@ export default function getBatteryInfo(options: GetBatteryInfoOptions) {
         options.success?.(res)
         options.complete?.(res)
     } else {
-        const res = {
+        const res : GetBatteryInfoFail = {
             errSubject: "uni-getBatteryInfo",
             errCode: 1001,
-            errMsg: 'getBatteryInfo:fail getAppContext is null'
+            errMsg: 'getBatteryInfo:fail getAppContext is null',
+            cause: null
         }
         options.fail?.(res)
         options.complete?.(res)

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

@@ -2,25 +2,18 @@
 import { UIDevice } from "UIKit";
 import { Int } from 'Swift';
 
-/**
- * 定义 接口参数
- */
-type GetBatteryInfoOptions = {
-    success?: (res: object) => void;
-    fail?: (res: object) => void;
-    complete?: (res: object) => void;
-};
+import { GetBatteryInfo, GetBatteryInfoSuccess } from '../interface.uts';
 
 /**
  * 导出 获取电量方法 
  */
-export default function getBatteryInfo(options: GetBatteryInfoOptions) {
+export const getBatteryInfo : GetBatteryInfo = function (options) {
 
     // 开启电量检测
     UIDevice.current.isBatteryMonitoringEnabled = true
 
     // 返回数据
-    const res = {
+    const res : GetBatteryInfoSuccess = {
         errCode: 0,
         errSubject: "uni-getBatteryInfo",
         errMsg: "getBatteryInfo:ok",

uni_modules/uni-getbatteryinfo/utssdk/interface.uts

-type GetBatteryInfoResult = {
+export type GetBatteryInfoSuccess = {
     /**
         * 错误码
         * 0:成功
@@ -24,7 +24,7 @@ type GetBatteryInfoResult = {
     isCharging : boolean
 }
 
-interface UniError<T> {
+export type GetBatteryInfoFail = {
     /**
     * 错误码
     */
@@ -40,7 +40,7 @@ interface UniError<T> {
     /**
     * 错误来源
     */
-	cause : any
+    cause : any | null
 }
 
 
@@ -49,28 +49,27 @@ export type GetBatteryInfoOptions = {
     /**
         * 接口调用结束的回调函数（调用成功、失败都会执行）
         */
-	success ?: (res : GetBatteryInfoResult) => void
+    success ?: (res : GetBatteryInfoSuccess) => void
     /**
         * 接口调用失败的回调函数
         */
-	fail ?: (res : UniError) => void
+    fail ?: (res : GetBatteryInfoFail) => void
     /**
         * 接口调用成功的回调
         */
-	complete ?: (res : object) => void
+    complete ?: (res : any) => 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
-
+* 获取电量信息
+* @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 type GetBatteryInfo = (options : GetBatteryInfoOptions) => void
\ No newline at end of file

uni_modules/uni-getbatteryinfo/utssdk/mp-alipay/index.js

-export default function getBatteryInfo(options) {
+export function getBatteryInfo(options) {
     return my.getBatteryInfo(options)
 }

uni_modules/uni-getbatteryinfo/utssdk/mp-baidu/index.js

-export default function getBatteryInfo(options) {
+export function getBatteryInfo(options) {
     return swan.getBatteryInfo(options)
 }

uni_modules/uni-getbatteryinfo/utssdk/mp-qq/index.js

-export default function getBatteryInfo(options) {
+export function getBatteryInfo(options) {
     return qq.getBatteryInfo(options)
 }

uni_modules/uni-getbatteryinfo/utssdk/mp-weixin/index.js

-export default function getBatteryInfo(options) {
+export function getBatteryInfo(options) {
     return wx.getBatteryInfo(options)
 }

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

-export default function getBatteryInfo(options) {
+export function getBatteryInfo(options) {
     if (navigator.getBattery) {
         navigator.getBattery().then(battery => {
             const res = {