Commit 5791b1ab authored by wanglei's avatar wanglei

...

parent 10eedcc4
...@@ -14,6 +14,7 @@ import com.base.filerecoveryrecyclebin.databinding.ActivityBatteryBinding ...@@ -14,6 +14,7 @@ import com.base.filerecoveryrecyclebin.databinding.ActivityBatteryBinding
import com.base.filerecoveryrecyclebin.help.BaseActivity import com.base.filerecoveryrecyclebin.help.BaseActivity
import com.base.filerecoveryrecyclebin.receiver.BatteryReceiver import com.base.filerecoveryrecyclebin.receiver.BatteryReceiver
import com.base.filerecoveryrecyclebin.utils.BarUtils import com.base.filerecoveryrecyclebin.utils.BarUtils
import com.base.filerecoveryrecyclebin.utils.LogEx
import kotlin.math.abs import kotlin.math.abs
...@@ -88,17 +89,24 @@ class BatteryActivity : BaseActivity<ActivityBatteryBinding>() { ...@@ -88,17 +89,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