Commit c24b5cfb authored by wanglei's avatar wanglei

...

parent a90b28a0
...@@ -12,10 +12,9 @@ ...@@ -12,10 +12,9 @@
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" /> <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC" />
<queries> <queries>
......
...@@ -88,17 +88,24 @@ class BatteryActivity : BaseActivity<ActivityBatteryBinding>() { ...@@ -88,17 +88,24 @@ class BatteryActivity : BaseActivity<ActivityBatteryBinding>() {
binding.tvCapacity.text = "$capacity mAh" binding.tvCapacity.text = "$capacity mAh"
val currentNow = mBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW) val currentNow = mBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_NOW)
binding.tvElectric.text = "${currentNow * 100} mA" binding.tvElectric.text = "${getFirstThreeDigits(currentNow * 100)} mA"
val currentAverage: Int = mBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE) val currentAverage: Int = mBatteryManager.getIntProperty(BatteryManager.BATTERY_PROPERTY_CURRENT_AVERAGE)
binding.tvCurrentAverage.text = "${currentAverage * 100} mA" binding.tvCurrentAverage.text = "${getFirstThreeDigits(currentAverage * 100)} mA"
val hm = (capacity.toFloat() / (currentNow * 100f)) val hm = (capacity.toFloat() / getFirstThreeDigits(currentNow * 100).toFloat())
binding.tvH.text = abs(hm.toInt()).toString() binding.tvH.text = abs(hm.toInt()).toString()
binding.tvM.text = abs(((hm - hm.toInt()) * 60).toInt()).toString() binding.tvM.text = abs(((hm - hm.toInt()) * 60).toInt()).toString()
} }
private fun getFirstThreeDigits(number: Int): String {
if (number == 0) {
return "0"
}
return number.toString().take(3)
}
private fun format(float: Float): String { private fun format(float: Float): String {
return "%.1f".format(float) return "%.1f".format(float)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment