Commit 306a172a authored by wanglei's avatar wanglei

...

parent d542ba93
...@@ -13,7 +13,6 @@ import android.text.Spanned ...@@ -13,7 +13,6 @@ import android.text.Spanned
import android.text.style.ForegroundColorSpan import android.text.style.ForegroundColorSpan
import android.view.View import android.view.View
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.lifecycle.lifecycleScope
import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils import com.base.pdfviewerscannerwhite.ads.admob.AdmobInterstitialUtils
import com.base.pdfviewerscannerwhite.bean.AppBean import com.base.pdfviewerscannerwhite.bean.AppBean
import com.base.pdfviewerscannerwhite.databinding.ActivityAppProcessBinding import com.base.pdfviewerscannerwhite.databinding.ActivityAppProcessBinding
...@@ -23,8 +22,6 @@ import com.base.pdfviewerscannerwhite.utils.AppPreferences ...@@ -23,8 +22,6 @@ import com.base.pdfviewerscannerwhite.utils.AppPreferences
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
import com.base.pdfviewerscannerwhite.utils.KotlinExt.toFormatSize import com.base.pdfviewerscannerwhite.utils.KotlinExt.toFormatSize
import com.base.pdfviewerscannerwhite.utils.RamUtils.ramPair import com.base.pdfviewerscannerwhite.utils.RamUtils.ramPair
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlin.random.Random import kotlin.random.Random
...@@ -117,7 +114,6 @@ class AppProcessActivity : BaseActivity<ActivityAppProcessBinding>() { ...@@ -117,7 +114,6 @@ class AppProcessActivity : BaseActivity<ActivityAppProcessBinding>() {
@SuppressLint("QueryPermissionsNeeded") @SuppressLint("QueryPermissionsNeeded")
fun initData( fun initData(
context: Context, context: Context,
finishAction: (() -> Unit)? = null
) { ) {
val pm = context.packageManager val pm = context.packageManager
val packages = pm.getInstalledPackages(0) val packages = pm.getInstalledPackages(0)
...@@ -143,5 +139,10 @@ class AppProcessActivity : BaseActivity<ActivityAppProcessBinding>() { ...@@ -143,5 +139,10 @@ class AppProcessActivity : BaseActivity<ActivityAppProcessBinding>() {
} }
} }
override fun onDestroy() {
super.onDestroy()
appList.clear()
}
} }
\ No newline at end of file
...@@ -12,6 +12,8 @@ import com.base.pdfviewerscannerwhite.databinding.ActivityAppProcessLoadingBindi ...@@ -12,6 +12,8 @@ import com.base.pdfviewerscannerwhite.databinding.ActivityAppProcessLoadingBindi
import com.base.pdfviewerscannerwhite.helper.BaseActivity import com.base.pdfviewerscannerwhite.helper.BaseActivity
import com.base.pdfviewerscannerwhite.utils.BarUtils import com.base.pdfviewerscannerwhite.utils.BarUtils
import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.isActive
import kotlinx.coroutines.launch import kotlinx.coroutines.launch
class AppProcessLoadingActivity : BaseActivity<ActivityAppProcessLoadingBinding>() { class AppProcessLoadingActivity : BaseActivity<ActivityAppProcessLoadingBinding>() {
...@@ -40,6 +42,14 @@ class AppProcessLoadingActivity : BaseActivity<ActivityAppProcessLoadingBinding> ...@@ -40,6 +42,14 @@ class AppProcessLoadingActivity : BaseActivity<ActivityAppProcessLoadingBinding>
lifecycleScope.launch(Dispatchers.IO) { lifecycleScope.launch(Dispatchers.IO) {
AppProcessActivity.initData(this@AppProcessLoadingActivity) AppProcessActivity.initData(this@AppProcessLoadingActivity)
} }
lifecycleScope.launch(Dispatchers.Main) {
var i = 1
while (isActive) {
i++
binding.tvPercent.text = i.toString()
delay(50)
}
}
jumpAction = { jumpAction = {
startActivity(Intent(this, AppProcessActivity::class.java)) startActivity(Intent(this, AppProcessActivity::class.java))
finish() finish()
...@@ -49,8 +59,8 @@ class AppProcessLoadingActivity : BaseActivity<ActivityAppProcessLoadingBinding> ...@@ -49,8 +59,8 @@ class AppProcessLoadingActivity : BaseActivity<ActivityAppProcessLoadingBinding>
override fun initListener() { override fun initListener() {
super.initListener() super.initListener()
binding.flFanhui.setOnClickListener { binding.flFanhui.setOnClickListener {
jumpAction = null
AdmobInterstitialUtils.showInterstitialAd(this) { AdmobInterstitialUtils.showInterstitialAd(this) {
jumpAction = null
finishToMain() finishToMain()
} }
} }
......
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
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"
android:background="#FABEB4" /> tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="0dp" />
<com.base.pdfviewerscannerwhite.ui.view.XmlLottieAnimationView <com.base.pdfviewerscannerwhite.ui.view.XmlLottieAnimationView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -21,10 +22,10 @@ ...@@ -21,10 +22,10 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:lottie_loop="true"
app:lottie_repeatCount="1"
app:lottie_autoPlay="true" app:lottie_autoPlay="true"
app:lottie_rawRes="@raw/appprocess_scan" /> app:lottie_loop="true"
app:lottie_rawRes="@raw/appprocess_scan"
app:lottie_repeatCount="1" />
<LinearLayout <LinearLayout
android:id="@+id/ll" android:id="@+id/ll"
...@@ -62,5 +63,41 @@ ...@@ -62,5 +63,41 @@
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/tv_percent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="150dp"
android:textColor="@color/white"
android:textSize="64sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
tools:ignore="HardcodedText"
tools:text="100" />
<TextView
android:id="@+id/tv_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:text="%"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@id/tv_percent"
app:layout_constraintStart_toStartOf="@id/tv_percent"
app:layout_constraintTop_toBottomOf="@id/tv_percent"
tools:ignore="HardcodedText" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:text="@string/scanning_for_running_processes"
android:textColor="@color/white"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="@id/tv_percent"
app:layout_constraintStart_toStartOf="@id/tv_percent"
app:layout_constraintTop_toBottomOf="@id/tv_unit" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
...@@ -409,6 +409,7 @@ ...@@ -409,6 +409,7 @@
android:id="@+id/ll_process" android:id="@+id/ll_process"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="86dp" android:layout_height="86dp"
android:layout_marginEnd="16dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/ll_manager" app:layout_constraintEnd_toStartOf="@+id/ll_manager"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -440,6 +441,7 @@ ...@@ -440,6 +441,7 @@
android:id="@+id/ll_split" android:id="@+id/ll_split"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="86dp" android:layout_height="86dp"
android:layout_marginEnd="16dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@id/ll_scan" app:layout_constraintEnd_toStartOf="@id/ll_scan"
app:layout_constraintTop_toTopOf="@id/ll_scan" app:layout_constraintTop_toTopOf="@id/ll_scan"
...@@ -471,6 +473,7 @@ ...@@ -471,6 +473,7 @@
android:id="@+id/ll_lock" android:id="@+id/ll_lock"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="86dp" android:layout_height="86dp"
android:layout_marginStart="16dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/ll_scan" app:layout_constraintStart_toEndOf="@id/ll_scan"
app:layout_constraintTop_toTopOf="@id/ll_scan" app:layout_constraintTop_toTopOf="@id/ll_scan"
...@@ -500,9 +503,9 @@ ...@@ -500,9 +503,9 @@
<!-- 合并--> <!-- 合并-->
<LinearLayout <LinearLayout
android:id="@+id/ll_merge" android:id="@+id/ll_merge"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="86dp" android:layout_height="86dp"
android:layout_marginStart="16dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintStart_toEndOf="@id/ll_manager" app:layout_constraintStart_toEndOf="@id/ll_manager"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
...@@ -534,6 +537,7 @@ ...@@ -534,6 +537,7 @@
android:id="@+id/ll_unlock" android:id="@+id/ll_unlock"
android:layout_width="110dp" android:layout_width="110dp"
android:layout_height="86dp" android:layout_height="86dp"
android:layout_marginEnd="16dp"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@id/ll_image_pdf" app:layout_constraintEnd_toStartOf="@id/ll_image_pdf"
app:layout_constraintTop_toTopOf="@id/ll_image_pdf" app:layout_constraintTop_toTopOf="@id/ll_image_pdf"
......
...@@ -117,5 +117,6 @@ ...@@ -117,5 +117,6 @@
<string name="backend_apps">Backend Apps</string> <string name="backend_apps">Backend Apps</string>
<string name="stop">Stop</string> <string name="stop">Stop</string>
<string name="clean_junk">Clean Junk</string> <string name="clean_junk">Clean Junk</string>
<string name="scanning_for_running_processes">Scanning for running processes</string>
</resources> </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