病毒扫描

app/src/main/java/com/xm/test/myfile/antivirus/AntivirusActivity.kt

@@ -26,10 +26,7 @@ import com.xm.test.myfile.databinding.ActivityAntivirusBinding
 class AntivirusActivity : AppCompatActivity() {
 
     private lateinit var mProgress: ProgressBar
-    private lateinit var mScaningView: View
-    private lateinit var mScanSuccessView: View
     private lateinit var mScanAppNameText: TextView
-    private var mIntent: Intent? = null
     private var mTotal = "22"
     private lateinit var binding: ActivityAntivirusBinding
     private val AGREE_VIRUS_PRIVACY_KEY = booleanPreferencesKey("agree_virus_privacy")
@@ -38,13 +35,12 @@ class AntivirusActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         binding = ActivityAntivirusBinding.inflate(layoutInflater)
         setContentView(binding.root)
-        mIntent = Intent(this, ScanResultActivity::class.java)
         initView()
         setOnclickListener()
 
         val isAgree = queryDataStoreBlock(AGREE_VIRUS_PRIVACY_KEY, false)
         if (isAgree) {
-            binding.llVirusScan.visibility = View.VISIBLE
+            binding.flVirusPrivacy.visibility = View.GONE
             startAntivirus()
         } else {
             binding.flVirusPrivacy.visibility = View.VISIBLE
@@ -73,12 +69,13 @@ class AntivirusActivity : AppCompatActivity() {
 
     private fun initView() {
         mProgress = findViewById(R.id.antivirus_progress)
-        mScaningView = findViewById(R.id.scan_ing_layout)
-        mScanSuccessView = findViewById(R.id.antivirus_success_layout)
         mScanAppNameText = findViewById(R.id.scan_name_text)
     }
 
     private fun startAntivirus() {
+        val mIntent = Intent(this, ScanResultActivity::class.java)
+        MaxAdUtils.showMaxNativeAd(null, binding.flAd)
+        binding.llScaning.visibility = View.VISIBLE
         MyApplication.mCloudScan?.startQuickScan(object : CloudScanListener() {
             override fun onScanStarted() {
                 Log.e("yanglin", "onScanStarted: start")
@@ -91,8 +88,8 @@ class AntivirusActivity : AppCompatActivity() {
                             result?.appName,
                 )
                 mScanAppNameText.text = result?.appName
-                mIntent?.putExtra("curr", curr)
-                mProgress.setProgress(curr)
+                mIntent.putExtra("curr", curr)
+                mProgress.progress = curr
                 mTotal = total.toString()
 
             }
@@ -112,25 +109,25 @@ class AntivirusActivity : AppCompatActivity() {
             override fun onScanFinished(result: MutableList<AppInfo>?) {
                 Log.e("yanglin", "onScanFinished: start" + result!![0].toString())
                 mProgress.setProgress(100)
-                mScaningView.visibility = View.GONE
-                mScanSuccessView.visibility = View.VISIBLE
+                binding.llScaning.visibility = View.GONE
+                binding.llScanResult.visibility = View.VISIBLE
                 val appInfos = ArrayList<AppInfo>()
                 val bundle = Bundle()
                 bundle.putSerializable("result", appInfos)
-                mIntent?.putExtra("total", mTotal)
+                mIntent.putExtra("total", mTotal)
                 for (appInfo in result) {
                     appInfos.add(appInfo)
                 }
                 Thread {
                     Handler(Looper.getMainLooper()).postDelayed({
-                        mIntent?.putExtras(bundle)
-                        startActivity(mIntent)
-                        finish()
+                        mIntent.putExtras(bundle)
+//                        startActivity(mIntent)
+//                        finish()
                     }, 2000)
                 }.start()
             }
 
         })
-        MaxAdUtils.showMaxNativeAd(null, binding.flAd)
+
     }
 }
\ No newline at end of file

app/src/main/res/layout/activity_antivirus.xml

@@ -117,6 +117,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp"
                     android:text="Trustlook's Privacy Policy"
                     android:textColor="@color/style_background"
                     android:textSize="19sp"
@@ -142,7 +143,7 @@
                 android:layout_alignParentBottom="true"
                 android:layout_marginStart="50dp"
                 android:layout_marginEnd="50dp"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="24dp"
                 android:background="@drawable/bg_btn_sure_shape"
                 android:gravity="center"
                 android:text="Start scanning"
@@ -160,8 +161,7 @@
         android:id="@+id/ll_virus_scan"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        android:visibility="gone">
+        android:orientation="vertical">
 
         <ImageView
             android:id="@+id/iv_back_2"
@@ -174,18 +174,20 @@
 
         <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="match_parent">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
+                <!--扫描过程UI -->
                 <LinearLayout
-                    android:id="@+id/scan_ing_layout"
+                    android:id="@+id/ll_scaning"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="vertical">
+                    android:orientation="vertical"
+                    android:visibility="gone">
 
                     <TextView
                         android:layout_width="wrap_content"
@@ -200,9 +202,10 @@
 
 
                     <RelativeLayout
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="389dp"
                         android:layout_gravity="center_horizontal"
+                        android:layout_marginHorizontal="16dp"
                         android:background="@mipmap/antivirus_image">
 
                         <TextView
@@ -231,9 +234,8 @@
                         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
                         android:layout_width="match_parent"
                         android:layout_height="15dp"
-                        android:layout_marginStart="16dp"
+                        android:layout_marginHorizontal="16dp"
                         android:layout_marginTop="24dp"
-                        android:layout_marginEnd="16dp"
                         android:progress="20"
                         android:progressDrawable="@drawable/progress_bg" />
 
@@ -249,60 +251,57 @@
                         android:textStyle="bold"
                         tools:ignore="HardcodedText" />
 
+                    <TextView
+                        android:id="@+id/power_by_trust_look"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center_horizontal"
+                        android:layout_marginTop="16dp"
+                        android:layout_marginBottom="16dp"
+                        android:text="Powered By Trustlook"
+                        android:textColor="@color/style_background"
+                        android:textSize="16sp"
+                        tools:ignore="HardcodedText" />
+
 
                 </LinearLayout>
 
-                <RelativeLayout
-                    android:id="@+id/antivirus_success_layout"
+                <!--扫描结果UI-->
+                <LinearLayout
+                    android:id="@+id/ll_scan_result"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
                     android:visibility="gone">
 
                     <ImageView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerInParent="true"
+                        android:layout_gravity="center"
+                        android:layout_marginVertical="150dp"
                         android:src="@mipmap/wancheng"
                         tools:ignore="ContentDescription" />
 
                     <ProgressBar
                         android:layout_width="54dp"
                         android:layout_height="54dp"
-                        android:layout_alignParentBottom="true"
-                        android:layout_centerHorizontal="true"
+                        android:layout_gravity="center_horizontal|bottom"
+                        android:layout_marginBottom="25dp"
                         android:progressTint="@color/style_background" />
 
-                </RelativeLayout>
-
-                <LinearLayout
-                    android:id="@+id/ad_group_layout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:orientation="vertical"
-                    tools:ignore="UseCompoundDrawables,UselessParent">
+                </LinearLayout>
 
-                    <TextView
-                        android:id="@+id/power_by_trust_look"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal"
-                        android:layout_marginBottom="16dp"
-                        android:text="Powered By Trustlook"
-                        android:textColor="@color/style_background"
-                        android:textSize="16sp"
-                        tools:ignore="HardcodedText" />
 
                 <FrameLayout
                     android:id="@+id/fl_ad"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                        android:layout_marginBottom="8dp"
+                    android:layout_marginVertical="8dp"
+                    android:minHeight="120dp"
                     tools:ignore="ContentDescription" />
 
             </LinearLayout>
 
-            </LinearLayout>
 
         </ScrollView>