Skip to content

A
appzxhy
Commit 8618a47a authored by wanglei's avatar wanglei
Browse files
Options

[拆包]拆包

parent 26faf931
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 173 additions and 429 deletions
app/src/main/java/com/base/appzxhy/ui/batteryinfo/BatteryInfoActivity.kt
View file @ 8618a47a
......@@ -10,27 +10,11 @@ import com.base.appzxhy.base.BaseActivity
import com.base.appzxhy.base.LottieEnum
import com.base.appzxhy.bean.FeatureBean.Companion.BATTERY_INFO
import com.base.appzxhy.bean.FeatureBean.Companion.setFunctionTodayUsed
import com.base.appzxhy.business.ads.AdsMgr
import com.base.appzxhy.databinding.ActivityBatteryInfoBinding
import com.base.appzxhy.utils.Utils
class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBatteryInfoBinding::inflate) {
// private val concatAdapter = ConcatAdapter()
// private val batteryHeadAdapter = BatteryOtherAdapter(R.layout.item_battery_head)
// private val batteryElectricAdapter = BatteryOtherAdapter(R.layout.item_battery_electric)
// private val batteryInfoAdapter = BatteryInfoAdapter()
// private val adAdapter = AdAdapter(R.layout.item_ad)
private val batteryInfoList = listOf(
BatteryInfoBean(R.drawable.icon_good, "GOOD", "Battery Health"),
BatteryInfoBean(R.drawable.icon_mah, "0 mAh / 0 mAh", "Battery Capacity"),
BatteryInfoBean(R.drawable.icon_li, "Li-ion", "Battery Type"),
BatteryInfoBean(R.drawable.icon_mv, "3818 mV", "Voltage"),
// BatteryInfoBean(R.drawable.icon_electric_current, "NA", "Electric Current"),
// BatteryInfoBean(R.drawable.icon_current_average, "NA", "Current Average"),
)
private var batteryReceiver: BatteryReceiver? = null
override fun onDestroy() {
......@@ -51,29 +35,10 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBat
override fun initView() {
super.initView()
showAdAnimation(LottieEnum.BATTERY_INFO_LOTTIE) {
// adAdapter.submitList(listOf(""))
}
AdsMgr.showNative(binding.flAd, R.layout.layout_admob_native_custom)
batteryReceiver = BatteryReceiver { updateBatteryInfo() }
registerReceiver(batteryReceiver, IntentFilter(Intent.ACTION_BATTERY_CHANGED))
// binding.rv.adapter = concatAdapter
// concatAdapter.addAdapter(batteryHeadAdapter)
// batteryHeadAdapter.submitList(
// listOf(BatteryOtherBean(hashMapOf()))
// )
//
// if (AdConfigBean.adsConfigBean.isAdShow) {
// concatAdapter.addAdapter(adAdapter)
// }
// concatAdapter.addAdapter(batteryInfoAdapter)
// batteryInfoAdapter.submitList(listOf(batteryInfoList))
//
// concatAdapter.addAdapter(batteryElectricAdapter)
// batteryElectricAdapter.submitList(
// listOf(BatteryOtherBean(hashMapOf()))
// )
setFunctionTodayUsed(BATTERY_INFO)
}
......@@ -94,77 +59,32 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>(ActivityBat
val temperature = Utils.divide(BatteryReceiver.temperature, 10)
val voltage = Utils.divide(BatteryReceiver.voltage, 1000)
binding.tvBattery.text = "${battery}%"
binding.tvStandbyHour.text = "%02d".format(wTime / 60)
binding.tvStandbyMinute.text = "%02d".format(wTime % 60)
binding.tvVideoHour.text = "%02d".format(vTime / 60)
binding.tvVideoMinute.text = "%02d".format(vTime % 60)
binding.tvMusicHour.text = "%02d".format(mTime / 60)
binding.tvMusicMinute.text = "%02d".format(mTime % 60)
// binding.tvStandbyHour.text = "%02d".format(wTime / 60)
// binding.tvStandbyMinute.text = "%02d".format(wTime % 60)
// binding.tvVideoHour.text = "%02d".format(vTime / 60)
// binding.tvVideoMinute.text = "%02d".format(vTime % 60)
// binding.tvMusicHour.text = "%02d".format(mTime / 60)
// binding.tvMusicMinute.text = "%02d".format(mTime % 60)
binding.tvTemperature.text = "$temperature℃"
binding.tvVoltage.text = "${voltage}V"
binding.tvPower.text = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
binding.tvBatteryType.text = BatteryReceiver.technology
binding.tvBatteryCapacity.text = "${BatteryReceiver.mAh.toInt()}mAh"
binding.tvBatteryStatus.text = getString(if (BatteryReceiver.isCharging) R.string.charging else R.string.normal)
val resource = if (battery > 80) {
R.drawable.dianchi100
} else if (battery > 60) {
R.drawable.dianchi80
} else if (battery > 40) {
R.drawable.dianchi60
} else if (battery > 20) {
R.drawable.dianchi40
} else {
R.drawable.dianchi20
}
binding.ivBattery.setImageResource(resource)
binding.tvCapacity1.text = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
binding.tvCapacity2.text = "${(BatteryReceiver.mAh * percent).toInt()}mAh"
// binding.tvBatteryType.text = BatteryReceiver.technology
// binding.tvBatteryCapacity.text = "${BatteryReceiver.mAh.toInt()}mAh"
// binding.tvBatteryStatus.text = getString(if (BatteryReceiver.isCharging) R.string.charging else R.string.normal)
// val resource = if (battery > 80) {
// R.drawable.dianchi100
// } else if (battery > 60) {
// R.drawable.dianchi80
// } else if (battery > 40) {
// R.drawable.dianchi60
// } else if (battery > 20) {
// R.drawable.dianchi40
// } else {
// R.drawable.dianchi20
// }
// binding.ivBattery.setImageResource(resource)
}
// private fun updateBatteryInfo() {
// val percent = BatteryReceiver.level / BatteryReceiver.scale.toFloat()
// val remainingCapacity = BatteryReceiver.mAh * percent
// val wTime = (remainingCapacity / 3.0f).toInt()
//
// batteryHeadAdapter.submitList(
// listOf(
// BatteryOtherBean(
// HashMap<String, Any>().apply {
// put("hour", wTime / 60)
// put("min", wTime % 60)
// }
// )
// )
// )
//
//
// batteryInfoList[1].tvValue = "${remainingCapacity.toInt()} / ${BatteryReceiver.mAh.toInt()} mAh"
//
// val voltage = Utils.divide(BatteryReceiver.voltage, 1)
// batteryInfoList[3].tvValue = "$voltage mV"
//
//
// batteryInfoAdapter.submitList(listOf(batteryInfoList))
//
// var current1 = BatteryReceiver.mA
// if (current1 == 0f) {
// current1 = Random.nextInt(50, 350).toFloat()
// }
// var current2 = BatteryReceiver.avmA
// if (current2 == 0f) {
// current2 = Random.nextInt(50, 300).toFloat()
// }
//
// LogEx.logDebug(TAG, "current1=$current1 current2=$current2")
// batteryElectricAdapter.submitList(
// listOf(
// BatteryOtherBean(
// HashMap<String, Any>().apply {
// put("current1", current1)
// put("current2", current2)
// }
// )
// )
// )
//
// }
}
\ No newline at end of file
app/src/main/res/drawable/bg_f8f5ff_12.xml 0 → 100644
View file @ 8618a47a
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F8F5FF"/>
<corners android:radius="@dimen/dp_12"/>
</shape>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @ 8618a47a
......@@ -4,7 +4,7 @@
<color name="white">#FFFFFFFF</color>
<color name="transparent">#00000000</color>
<color name="colorPrimary">#5C1FED</color>
<color name="colorDisEnable">#F0F3FA</color>
<color name="colorDisEnable">#EFEBFA</color>
<color name="color_66000000">#66000000</color>
<color name="color_1a1a1a">#1A1A1A</color>
......
app/src/main/res/values/dimens.xml
View file @ 8618a47a
......@@ -73,4 +73,5 @@
<dimen name="dp_52">52dp</dimen>
<dimen name="dp_120">120dp</dimen>
<dimen name="sp_32">32sp</dimen>
<dimen name="sp_30">30sp</dimen>
</resources>
\ No newline at end of file
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