Commit 840cfbed authored by wanglei's avatar wanglei

替换ui

parent 8fcabf74
This image diff could not be displayed because it is too large. You can view the blob instead.
......@@ -152,8 +152,8 @@ class AppManagerActivity : BaseActivity<ActivityAppManagerBinding>() {
private fun playLottie() {
LogEx.logDebug(TAG, "playLottie")
binding.llLottie.isVisible = true
binding.lottie.imageAssetsFolder = "guan_smax_li/images/"
binding.lottie.setAnimation("guan_smax_li/data.json")
binding.lottie.imageAssetsFolder = "guan_sjunk_li/images/"
binding.lottie.setAnimation("guan_sjunk_li/data.json")
binding.lottie.playAnimation()
binding.root.postDelayed({
AdmobUtils.showInterstitialAd(this) {
......
......@@ -54,8 +54,8 @@ class BatteryInfoActivity : BaseActivity<ActivityBatteryInfoBinding>() {
}
setFilter()
binding.idBatteryLottie.imageAssetsFolder = "dian_smax_chi/images/"
binding.idBatteryLottie.setAnimation("dian_smax_chi/data.json")
binding.idBatteryLottie.imageAssetsFolder = "dian_sjunk_chi/images/"
binding.idBatteryLottie.setAnimation("dian_sjunk_chi/data.json")
binding.idBatteryLottie.playAnimation()
binding.root.postDelayed({
playFinish()
......
......@@ -22,8 +22,8 @@ class GuestActivity : BaseActivity<ActivityLayoutGuestBinding>() {
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
ConfigHelper.ifGuest = true
binding.idLottie.imageAssetsFolder = "sao_smax_miao/images/"
binding.idLottie.setAnimation("sao_smax_miao/data.json")
binding.idLottie.imageAssetsFolder = "sao_sjunk_miao/images/"
binding.idLottie.setAnimation("sao_sjunk_miao/data.json")
binding.idLottie.playAnimation()
loadPro()
}
......
......@@ -64,8 +64,8 @@ class NetWorkActivity : BaseActivity<ActivityLayoutNetworkBinding>() {
private fun playlottie() {
binding.idLlNetDh.isVisible = true
binding.idLottieNetwork.imageAssetsFolder = "wan_smax_gluo/images/"
binding.idLottieNetwork.setAnimation("wan_smax_gluo/data.json")
binding.idLottieNetwork.imageAssetsFolder = "wan_sjunk_luo/images/"
binding.idLottieNetwork.setAnimation("wan_sjunk_luo/data.json")
binding.idLottieNetwork.playAnimation()
binding.root.postDelayed({
AdmobUtils.showInterstitialAd(this) {
......
......@@ -86,8 +86,8 @@ class PrepareScanActivity : BaseActivity<ActivityLayoutParepreScanBinding>() {
}
start()
}
binding.idJunkScan.imageAssetsFolder = "sao_smax_miao/images/"
binding.idJunkScan.setAnimation("sao_smax_miao/data.json")
binding.idJunkScan.imageAssetsFolder = "sao_sjunk_miao/images/"
binding.idJunkScan.setAnimation("sao_sjunk_miao/data.json")
binding.idJunkScan.playAnimation()
binding.root.postDelayed({
AdmobUtils.showInterstitialAd(this) {
......
......@@ -104,8 +104,8 @@ class RecentAppActivity : BaseActivity<ActivityRecentAppBinding>() {
private fun playLottie(showFinish: (() -> Unit)? = null) {
binding.llLottie.isVisible = true
binding.lottie.imageAssetsFolder = "zui_smax_jing/images/"
binding.lottie.setAnimation("zui_smax_jing/data.json")
binding.lottie.imageAssetsFolder = "zui_sjunk_jing/images/"
binding.lottie.setAnimation("zui_sjunk_jing/data.json")
binding.lottie.playAnimation()
binding.root.postDelayed({
AdmobUtils.showInterstitialAd(this) {
......
......@@ -74,8 +74,8 @@ class ScanJunkActivity : BaseActivity<ActivityLayoutScanJunkBinding>() {
}
start()
}
binding.idJunkScan.imageAssetsFolder = "sao_smax_miao/images/"
binding.idJunkScan.setAnimation("sao_smax_miao/data.json")
binding.idJunkScan.imageAssetsFolder = "sao_sjunk_miao/images/"
binding.idJunkScan.setAnimation("sao_sjunk_miao/data.json")
binding.idJunkScan.playAnimation()
binding.root.postDelayed({
AdmobUtils.showInterstitialAd(this) {
......
......@@ -30,8 +30,8 @@ class SpeakCleaningActivity : BaseActivity<ActivityLayoutSpeakerCleaningBinding>
audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, maxVolume, 0)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.idSpeakCleanLottie.imageAssetsFolder = "speak_smax_clean/images/"
binding.idSpeakCleanLottie.setAnimation("speak_smax_clean/data.json")
binding.idSpeakCleanLottie.imageAssetsFolder = "speak_sjunk_clean/images/"
binding.idSpeakCleanLottie.setAnimation("speak_sjunk_clean/data.json")
binding.idSpeakCleanLottie.playAnimation()
binding.root.postDelayed({
zAudio.stop()
......
......@@ -48,8 +48,8 @@ class StartCompressionPhotoActivity : BaseActivity<ActivityStartCompressionPhoto
}
}
private fun playlottie(){
binding.idLottie1.imageAssetsFolder = "ya_smax_suo/images/"
binding.idLottie1.setAnimation("ya_smax_suo/data.json")
binding.idLottie1.imageAssetsFolder = "ya_sjunk_suo/images/"
binding.idLottie1.setAnimation("ya_sjunk_suo/data.json")
binding.idLottie1.playAnimation()
Handler().postDelayed({
AdmobUtils.showInterstitialAd(this) {
......
......@@ -20,8 +20,8 @@ class BatteryOptimizerActivity : BaseActivity<ActivityLayoutSpeedBinding>() {
override fun initView() {
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.idOneLottie.imageAssetsFolder = "dian_smax_chi/images/"
binding.idOneLottie.setAnimation("dian_smax_chi/data.json")
binding.idOneLottie.imageAssetsFolder = "dian_sjunk_chi/images/"
binding.idOneLottie.setAnimation("dian_sjunk_chi/data.json")
binding.idOneLottie.playAnimation()
binding.root.postDelayed({
binding.idOneLottie.isVisible = false
......@@ -34,8 +34,8 @@ class BatteryOptimizerActivity : BaseActivity<ActivityLayoutSpeedBinding>() {
private fun playRocket() {
binding.idRocket.imageAssetsFolder = "battery_smax_save/images/"
binding.idRocket.setAnimation("battery_smax_save/data.json")
binding.idRocket.imageAssetsFolder = "battery_sjunk_save/images/"
binding.idRocket.setAnimation("battery_sjunk_save/data.json")
binding.idRocket.playAnimation()
binding.idRocket.addAnimatorListener(object : Animator.AnimatorListener {
override fun onAnimationStart(p0: Animator) {
......
......@@ -26,8 +26,8 @@ class SpeedActivity : BaseActivity<ActivityLayoutSpeedBinding>() {
override fun initView() {
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.idOneLottie.imageAssetsFolder = "guan_smax_li/images/"
binding.idOneLottie.setAnimation("guan_smax_li/data.json")
binding.idOneLottie.imageAssetsFolder = "guan_sjunk_li/images/"
binding.idOneLottie.setAnimation("guan_sjunk_li/data.json")
binding.idOneLottie.playAnimation()
binding.root.postDelayed({
binding.idOneLottie.isVisible = false
......@@ -39,8 +39,8 @@ class SpeedActivity : BaseActivity<ActivityLayoutSpeedBinding>() {
private fun playRocket() {
binding.idRocket.imageAssetsFolder = "fast_smax/images/"
binding.idRocket.setAnimation("fast_smax/data.json")
binding.idRocket.imageAssetsFolder = "fast_sjunk/images/"
binding.idRocket.setAnimation("fast_sjunk/data.json")
binding.idRocket.playAnimation()
MainScope().launch(Dispatchers.Main) {
launch {
......
......@@ -17,7 +17,6 @@ import com.google.gson.reflect.TypeToken
import com.test.basd.smartjunkcleaner.R
import com.test.basd.smartjunkcleaner.activity.splash.NewSplashActivity
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_APP_MANAGER
//import com.test.basd.cleanmaster.bean.ConfigBean.Companion.ID_BATTERY_OPTIMIZATION
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_BATTERY_PUSH
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_CHARGE
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_CLEAN_NOTIFICATION
......@@ -27,12 +26,10 @@ import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_JUNK_CLEAN_PU
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_LARGE_FILE_PUSH
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_LOW_BATTERY_PUSH
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_NETWORK_TRAFFIC
//import com.test.basd.cleanmaster.bean.ConfigBean.Companion.ID_PHONE_ACCELERATE
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_PHOTO_COMPRESS
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_RECENT_USE_APP
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_SIMILAR_IMAGE
import com.test.basd.smartjunkcleaner.bean.ConfigBean.Companion.ID_UNINSTALL_PACKAGE_PUSH
//import com.test.basd.cleanmaster.bean.ConfigBean.Companion.ID_VIRUS_PUSH
import com.test.basd.smartjunkcleaner.helps.BaseApplication
import com.test.basd.smartjunkcleaner.helps.ComUtils
import com.test.basd.smartjunkcleaner.helps.EventHelper
......
......@@ -32,6 +32,8 @@ class LaunchesFragment : BaseFragment<FragmentLaunchesBinding>() {
private val TAG = "LaunchesFragment"
private var dataList = arrayListOf<AppBean>()
private lateinit var adapter: RecentAppAdapter
@SuppressLint("SimpleDateFormat")
private var simpleDateFormat2 = SimpleDateFormat("(yyyy/MM/dd)")
private var UI_MODE = UI_MODE_ALL
......@@ -294,7 +296,6 @@ class LaunchesFragment : BaseFragment<FragmentLaunchesBinding>() {
LogEx.logDebug(TAG, "setAppUseData")
this.dataList.clear()
this.dataList.addAll(dataList)
//setLaunchNumber()
if (isVisible) {
setLaunchNumber2()
launchesMode()
......@@ -318,100 +319,6 @@ class LaunchesFragment : BaseFragment<FragmentLaunchesBinding>() {
binding.tvBackgroundNumber.text = backgroundNumber.toString()
}
/**
* 旧的计算前台后台数量逻辑
*/
@SuppressLint("InlinedApi")
private fun setLaunchNumber() {
val tempList = ArrayList<UsageEvents.Event>()
dataList.forEach { app ->
app.usageEvents?.let { events ->
tempList.clear()
tempList.addAll(events)
tempList.forEachIndexed { index, event ->
if (app.pkg == "tv.danmaku.bili") {
LogEx.logDebug(
TAG, "$index ${event.packageName} " +
TimeUtils.simpleDateFormat.format(event.timeStamp) +
" ${event.eventType}"
)
}
//后台启动次数
if (event.eventType == FOREGROUND_SERVICE_START) {
app.backgroundTimes++
}
//上一个事件
val lastIndex = index - 1
var lastEvent: UsageEvents.Event? = null
if (lastIndex >= 0) {
lastEvent = tempList[lastIndex]
}
//上面是欧拉的前台判断逻辑 event上次 event2本次
// (event == null || !Objects.equals(event.getPackageName(), event2.getPackageName()))
// &&
//((event == null || event.getEventType() == 2) && event2.getEventType() == 1)
if (event.eventType == ACTIVITY_RESUMED) {
val flag1 =
lastEvent == null || ((lastEvent.packageName != app.pkg) && (lastEvent.eventType == ACTIVITY_PAUSED))
val flag2 = (lastEvent != null) && (lastEvent.packageName != app.pkg)
if (flag1) {
app.foregroundTimes++
if (app.pkg == "tv.danmaku.bili") {
LogEx.logDebug(TAG, "前台加一 flag1 ${app.foregroundTimes}")
}
} else if (flag2) {
app.foregroundTimes++
if (app.pkg == "tv.danmaku.bili") {
LogEx.logDebug(TAG, "前台加一 flag2 ${app.foregroundTimes}")
}
}
}
}
}
//2的阈值
if (app.foregroundTimes < 2) {
app.foregroundTimes = 0
}
app.launchTimes = app.foregroundTimes + app.backgroundTimes
if (app.pkg == "tv.danmaku.bili") {
LogEx.logDebug(
TAG, "${app.pkg} launchTimes=${app.launchTimes} " +
"foregroundTimes=${app.foregroundTimes} " +
"backgroundTimes=${app.backgroundTimes}"
)
}
}
val totalNumber = dataList.sumOf { it.launchTimes }
val foregroundNumber = dataList.sumOf { it.foregroundTimes }
val backgroundNumber = dataList.sumOf { it.backgroundTimes }
binding.tvLaunchesNumber.text = totalNumber.toString()
binding.tvForegroundNumber.text = foregroundNumber.toString()
binding.tvBackgroundNumber.text = backgroundNumber.toString()
}
companion object {
const val UI_MODE_ALL = 5
const val UI_MODE_FOREGROUND = 25
......
......@@ -20,8 +20,8 @@ class NotificationGuestActivity : BaseActivity<ActivityLayoutTionGuestBinding>()
BarUtils.setStatusBarLightMode(this, true)
BarUtils.setStatusBarColor(this, Color.TRANSPARENT)
binding.root.updatePadding(top = BarUtils.getStatusBarHeight())
binding.idTzGuest.imageAssetsFolder = "ying_smax_dao/images/"
binding.idTzGuest.setAnimation("ying_smax_dao/data.json")
binding.idTzGuest.imageAssetsFolder = "ying_sjunk_dao/images/"
binding.idTzGuest.setAnimation("ying_sjunk_dao/data.json")
binding.idTzGuest.playAnimation()
SPUtils.getInstance().put("notification_guest", true)
binding.idTvTryNow.setOnClickListener {
......
......@@ -35,8 +35,8 @@ object DialogViews {
.setFontSize(13, true)
.setForegroundColor(0xFF999999.toInt())
.create()
binding.idFullLottie.imageAssetsFolder = "quanxian_smax_full_file/images/"
binding.idFullLottie.setAnimation("quanxian_smax_full_file/data.json")
binding.idFullLottie.imageAssetsFolder = "quanxian_sjunk_full_file/images/"
binding.idFullLottie.setAnimation("quanxian_sjunk_full_file/data.json")
binding.idFullLottie.playAnimation()
binding.idDeny.setOnClickListener {
dialog.dismiss()
......
......@@ -31,8 +31,8 @@ class PermisonPopWindow(private val activity: AppCompatActivity, val onClick: ()
BarUtils.setStatusBarLightMode(activity, false)
showAtLocation(activity.window.decorView, Gravity.BOTTOM, 0, 100)
}
binding.idLottieFullFile.imageAssetsFolder = "quanxian_smax_guide/images/"
binding.idLottieFullFile.setAnimation("quanxian_smax_guide/data.json")
binding.idLottieFullFile.imageAssetsFolder = "quanxian_sjunk_guide/images/"
binding.idLottieFullFile.setAnimation("quanxian_sjunk_guide/data.json")
binding.idLottieFullFile.playAnimation()
binding.idFrameLayout.setOnClickListener {
dismiss()
......
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#5b4fff" />
<gradient
android:endColor="#8720EB"
android:startColor="@color/theme_color" />
<corners android:radius="7.5dp" />
</shape>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@mipmap/image_selected_2" android:state_selected="true" />
<item android:drawable="@mipmap/image_unselected_2" />
<item android:drawable="@mipmap/image_unselected_all" />
</selector>
\ No newline at end of file
......@@ -12,7 +12,7 @@
android:height="9dp"
android:gravity="left|center_vertical">
<shape android:shape="rectangle">
<solid android:color="#5b4fff" />
<solid android:color="@color/theme_color" />
<corners
android:bottomLeftRadius="2dp"
android:bottomRightRadius="2dp"
......
......@@ -10,7 +10,7 @@
<size
android:width="16dp"
android:height="16dp" />
<solid android:color="#4078FF" />
<solid android:color="@color/theme_color" />
</shape>
</rotate>
</item>
......
......@@ -38,7 +38,7 @@
<ImageView
android:layout_width="290dp"
android:layout_height="130dp"
android:src="@mipmap/authorizationtu"
android:src="@mipmap/mangertu"
tools:ignore="ContentDescription" />
<TextView
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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