Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(api): 支持 getBatteryInfo，close #7846 #7882

Merged
merged 2 commits into from
Oct 21, 2020
Merged

fix(api): 支持 getBatteryInfo，close #7846 #7882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9def3c1
fix(api): 支持 getBatteryInfo，close #7846
Chen-jj Oct 21, 2020
5e37821
Merge branch 'next' into fix/api-getBatteryInfo
Chen-jj Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/taro-api/src/native-apis.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ const otherApis = {
getConnectedWifi: true,
startDeviceMotionListening: true,
stopDeviceMotionListening: true,
getBatteryInfo: true,

// 界面
pageScrollTo: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/taro/types/api/device/battery.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ declare namespace Taro {
level: string
}
}

/** 获取设备电量。同步 API Taro.getBatteryInfoSync 在 iOS 上不可用。
* @supported weapp
* @see https://developers.weixin.qq.com/miniprogram/dev/api/device/battery/wx.getBatteryInfo.html
*/
function getBatteryInfo(option?: getBatteryInfo.Option): void
function getBatteryInfo(option?: getBatteryInfo.Option): Promise<getBatteryInfo.SuccessCallbackResult>

namespace getBatteryInfo {
interface Option {
Expand Down