Commit 6c18e828 authored by wanglei's avatar wanglei

...

parent 34a7f3e1
...@@ -13,12 +13,10 @@ import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity ...@@ -13,12 +13,10 @@ import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity
import com.test.easy.easycleanerjunk.fcm.ActionBroadcast import com.test.easy.easycleanerjunk.fcm.ActionBroadcast
import com.test.easy.easycleanerjunk.fcm.FCMUtil import com.test.easy.easycleanerjunk.fcm.FCMUtil
import com.test.easy.easycleanerjunk.fcm.MyTimerManager import com.test.easy.easycleanerjunk.fcm.MyTimerManager
import com.test.easy.easycleanerjunk.helps.AESHelper
import com.test.easy.easycleanerjunk.helps.BaseApplication import com.test.easy.easycleanerjunk.helps.BaseApplication
import com.test.easy.easycleanerjunk.helps.ComUtils import com.test.easy.easycleanerjunk.helps.ComUtils
import com.test.easy.easycleanerjunk.helps.ConfigHelper import com.test.easy.easycleanerjunk.helps.ConfigHelper
import com.test.easy.easycleanerjunk.helps.InstallHelps import com.test.easy.easycleanerjunk.helps.InstallHelps
import com.test.easy.easycleanerjunk.helps.UmpHelp.canRequestAds
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils
import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils import com.test.easy.easycleanerjunk.utils.ActivityManagerUtils
import com.test.easy.easycleanerjunk.utils.SPUtils import com.test.easy.easycleanerjunk.utils.SPUtils
......
...@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager ...@@ -6,6 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.LinearSmoothScroller import androidx.recyclerview.widget.LinearSmoothScroller
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.test.easy.easycleanerjunk.R import com.test.easy.easycleanerjunk.R
import com.test.easy.easycleanerjunk.activity.home.NewMainActivity
import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity
import com.test.easy.easycleanerjunk.adapter.DeviceScanAdapter import com.test.easy.easycleanerjunk.adapter.DeviceScanAdapter
import com.test.easy.easycleanerjunk.databinding.ActivityDeviceScanBinding import com.test.easy.easycleanerjunk.databinding.ActivityDeviceScanBinding
...@@ -27,7 +28,7 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() { ...@@ -27,7 +28,7 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() {
ConfigHelper.ifGuest = true ConfigHelper.ifGuest = true
binding.rv.isNestedScrollingEnabled = false binding.rv.isNestedScrollingEnabled = false
binding.ivItem.setImageResource(R.mipmap.d_shebei) binding.ivItem.setImageResource(R.mipmap.d_shebei)
binding.view.setOnTouchListener { v, event -> true} binding.view.setOnTouchListener { v, event -> true }
adapter = DeviceScanAdapter( adapter = DeviceScanAdapter(
itemFinish = { title, position -> itemFinish = { title, position ->
binding.rv.smoothScrollEquallyTo(position) binding.rv.smoothScrollEquallyTo(position)
...@@ -66,7 +67,7 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() { ...@@ -66,7 +67,7 @@ class DeviceScanActivity : BaseActivity<ActivityDeviceScanBinding>() {
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
binding.tvStart.setOnClickListener { binding.tvStart.setOnClickListener {
startActivity(Intent(this, NewSplashActivity::class.java)) startActivity(Intent(this, NewMainActivity::class.java))
finish() finish()
} }
} }
......
...@@ -72,14 +72,8 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(), ...@@ -72,14 +72,8 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
startNotification() startNotification()
} }
mProgressManager?.startProgress() mProgressManager?.startProgress()
if (!ConfigHelper.ifGuest) {
mProgressManager?.pauseProgress()
onProgressMax()
return
} else {
loadAd() loadAd()
} }
}
override fun onProgressMax() { override fun onProgressMax() {
......
package com.test.easy.easycleanerjunk.activity.splash package com.test.easy.easycleanerjunk.activity.splash
import android.os.Handler import android.os.Handler
import androidx.core.view.isVisible
import com.test.easy.easycleanerjunk.databinding.ActivityLayoutSplashBinding import com.test.easy.easycleanerjunk.databinding.ActivityLayoutSplashBinding
import com.test.easy.easycleanerjunk.utils.SPUtils import com.test.easy.easycleanerjunk.utils.SPUtils
...@@ -14,7 +15,7 @@ class ProgressManager { ...@@ -14,7 +15,7 @@ class ProgressManager {
private var mIsPaused = false private var mIsPaused = false
private var mProgress = 0 private var mProgress = 0
private val listener:ProgressListener private val listener: ProgressListener
constructor(binding: ActivityLayoutSplashBinding, listener: ProgressListener) { constructor(binding: ActivityLayoutSplashBinding, listener: ProgressListener) {
this.binding = binding this.binding = binding
...@@ -23,15 +24,19 @@ class ProgressManager { ...@@ -23,15 +24,19 @@ class ProgressManager {
initView() initView()
} }
private var loadTime: Int = 15
private fun initView() { private fun initView() {
val loadTime = SPUtils.getInstance().getInt("loading_page_time", 15) loadTime = SPUtils.getInstance().getInt("loading_page_time", 15)
binding.pb.max = loadTime binding.pb.max = loadTime
binding.pb.progress = 0 binding.pb.progress = 0
} }
fun startProgress() { fun startProgress() {
binding.idTvStart.isVisible = false
binding.idLlYinsi.isVisible = false
binding.idLlJindu.isVisible = true
val mRunnable: Runnable = object : Runnable { val mRunnable: Runnable = object : Runnable {
override fun run() { override fun run() {
if (!mIsPaused) { if (!mIsPaused) {
...@@ -55,6 +60,7 @@ class ProgressManager { ...@@ -55,6 +60,7 @@ class ProgressManager {
mHandler.removeCallbacksAndMessages(null) mHandler.removeCallbacksAndMessages(null)
} }
} }
fun maxProgress() { fun maxProgress() {
binding.pb.progress = binding.pb.max binding.pb.progress = binding.pb.max
listener.onProgressMax() listener.onProgressMax()
...@@ -67,7 +73,7 @@ class ProgressManager { ...@@ -67,7 +73,7 @@ class ProgressManager {
} }
} }
interface ProgressListener{ interface ProgressListener {
fun onProgressMax() fun onProgressMax()
} }
} }
\ No newline at end of file
...@@ -18,4 +18,5 @@ class ConfigBean() { ...@@ -18,4 +18,5 @@ class ConfigBean() {
var naAdS: Int = 0 var naAdS: Int = 0
var isShowBackIntAd: Int = 0 var isShowBackIntAd: Int = 0
var isShowResultNaAd: Int = 0 var isShowResultNaAd: Int = 0
var loadingPageTime: Int = 15
} }
...@@ -3,7 +3,6 @@ package com.test.easy.easycleanerjunk.helps ...@@ -3,7 +3,6 @@ package com.test.easy.easycleanerjunk.helps
import android.util.Log import android.util.Log
import com.google.gson.Gson import com.google.gson.Gson
import com.test.easy.easycleanerjunk.bean.ConfigBean import com.test.easy.easycleanerjunk.bean.ConfigBean
import com.test.easy.easycleanerjunk.bean.NotificationBean
import com.test.easy.easycleanerjunk.helps.ads.AdDisplayUtils import com.test.easy.easycleanerjunk.helps.ads.AdDisplayUtils
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils.adDisplayInterval import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils.adDisplayInterval
import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils.maxMultiClick import com.test.easy.easycleanerjunk.helps.ads.AdmobUtils.maxMultiClick
...@@ -54,7 +53,7 @@ object ComUtils { ...@@ -54,7 +53,7 @@ object ComUtils {
val gson = Gson() val gson = Gson()
val bean = gson.fromJson(str, ConfigBean::class.java) val bean = gson.fromJson(str, ConfigBean::class.java)
Log.d("jiekou",str) Log.d("jiekou", str)
SPUtils.getInstance().put("actionS", bean.actionS); SPUtils.getInstance().put("actionS", bean.actionS);
SPUtils.getInstance().put("open", bean.open); SPUtils.getInstance().put("open", bean.open);
SPUtils.getInstance().put("num", bean.num); SPUtils.getInstance().put("num", bean.num);
...@@ -66,6 +65,7 @@ object ComUtils { ...@@ -66,6 +65,7 @@ object ComUtils {
SPUtils.getInstance().put("timerInterval", bean.timerInterval) SPUtils.getInstance().put("timerInterval", bean.timerInterval)
SPUtils.getInstance().put("naAdS", bean.naAdS) SPUtils.getInstance().put("naAdS", bean.naAdS)
SPUtils.getInstance().put("isShowBackIntAd", bean.isShowBackIntAd) SPUtils.getInstance().put("isShowBackIntAd", bean.isShowBackIntAd)
SPUtils.getInstance().put("loading_page_time", bean.loadingPageTime)
adDisplayInterval = bean.adInterval adDisplayInterval = bean.adInterval
maxMultiClick = bean.maxMultiClick maxMultiClick = bean.maxMultiClick
AdDisplayUtils.getInstance().setMaxAdDisplayCount(bean.adShowCount) AdDisplayUtils.getInstance().setMaxAdDisplayCount(bean.adShowCount)
......
...@@ -2,7 +2,6 @@ package com.test.easy.easycleanerjunk.helps ...@@ -2,7 +2,6 @@ package com.test.easy.easycleanerjunk.helps
import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity import com.test.easy.easycleanerjunk.activity.splash.NewSplashActivity
import com.test.easy.easycleanerjunk.bean.AppInfo
import com.test.easy.easycleanerjunk.utils.SPUtils import com.test.easy.easycleanerjunk.utils.SPUtils
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.appmanager.AppManagerActivity"> tools:context=".activity.appmanager.AppManagerActivity">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.appmanager.AppManagerAnimationActivity"> tools:context=".activity.appmanager.AppManagerAnimationActivity">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/coordinator_layout" android:id="@+id/coordinator_layout"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
tools:context=".activity.DeviceScanActivity"> tools:context=".activity.DeviceScanActivity">
...@@ -76,10 +77,11 @@ ...@@ -76,10 +77,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/item_device_info_item" /> tools:listitem="@layout/item_device_info_item" />
<View <View
android:id="@+id/view" android:id="@+id/view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</FrameLayout> </FrameLayout>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.largefile.LargeFileAnimationActivity"> tools:context=".activity.largefile.LargeFileAnimationActivity">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
app:bl_solid_color="@color/theme_color"> app:bl_solid_color="@color/theme_color">
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@color/white">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.noober.background.view.BLConstraintLayout <com.noober.background.view.BLConstraintLayout
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:background="@color/white">
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/id_vp" android:id="@+id/id_vp"
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.similarphotos.RepeatPhotoAnimationActivity"> tools:context=".activity.similarphotos.RepeatPhotoAnimationActivity">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.screenshot.ScreenShotActivity"> tools:context=".activity.screenshot.ScreenShotActivity">
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:background="@color/white"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.screenshot.ScreenShotAnimationActivity"> tools:context=".activity.screenshot.ScreenShotAnimationActivity">
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white"
android:orientation="vertical" android:orientation="vertical"
tools:context=".activity.SettingActivity"> tools:context=".activity.SettingActivity">
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main" android:id="@+id/main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".activity.whatsapp.WhatsAppCleanerAnimationActivity"> tools:context=".activity.whatsapp.WhatsAppCleanerAnimationActivity">
......
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