Merge remote-tracking branch 'origin/master'

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
     <uses-permission android:name="com.sec.android.provider.badge.permission.READ" />
     <uses-permission android:name="com.sec.android.provider.badge.permission.WRITE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <queries>
         <intent>
             <action android:name="android.intent.action.MAIN" />
@@ -205,9 +206,11 @@
             android:name="com.facebook.sdk.ApplicationId"
             android:value="@string/facebook_app_id" />
 
+        <!--测试的病毒扫描 包名=com.a.s  key=cedfde13feb689ade7154c6322525c2d9fc10397fac1d4da5580542e-->
+        <!--正式的 包名=com.swiftcleaner.chovey  key=fd80a9a3e13cafca2a24d0223aaf6baa541201328eb760cf6deb522d-->
         <meta-data
-            android:value="cedfde13feb689ade7154c6322525c2d9fc10397fac1d4da5580542e"
-            android:name="com.trustlook.ApiKey" />
+            android:name="com.trustlook.ApiKey"
+            android:value="cedfde13feb689ade7154c6322525c2d9fc10397fac1d4da5580542e" />
     </application>
 
 </manifest>
\ No newline at end of file

app/src/main/java/com/swiftcleaner/chovey/GlobalConfig.kt

@@ -110,6 +110,7 @@ object GlobalConfig {
     const val ID_APP_PROCESS = 12100
     const val ID_WHEATHER = 12087
     const val ID_XINGZUO = 12088
+    const val ID_MALWARE_CLEAN= 12089
 
     val noLoadingActivities = listOf(
         "full", // 过滤全屏广告

app/src/main/java/com/swiftcleaner/chovey/business/push/NotificationUtils.kt

@@ -18,6 +18,7 @@ import com.swiftcleaner.chovey.GlobalConfig.ID_APP_PROCESS
 import com.swiftcleaner.chovey.GlobalConfig.ID_BATTERY_INFO
 import com.swiftcleaner.chovey.GlobalConfig.ID_CLEAN_JUNK
 import com.swiftcleaner.chovey.GlobalConfig.ID_LARGE_FILE_CLEANER
+import com.swiftcleaner.chovey.GlobalConfig.ID_MALWARE_CLEAN
 
 import com.swiftcleaner.chovey.GlobalConfig.ID_SCREENSHOT_CLEAN
 import com.swiftcleaner.chovey.GlobalConfig.ID_SIMILAR_PHOTOS
@@ -53,7 +54,8 @@ object NotificationUtils {
         ID_APP_PROCESS,
         ID_SCREENSHOT_CLEAN,
         ID_XINGZUO,
-        ID_WHEATHER
+        ID_WHEATHER,
+        ID_MALWARE_CLEAN
     )
 
     private var currentNotificationId = -1
@@ -254,7 +256,16 @@ object NotificationUtils {
             ID_APP_PROCESS -> Pair(R.mipmap.jg__appprocss, R.string.notification_app_process)
             ID_SIMILAR_PHOTOS -> Pair(R.mipmap.h_simiar, R.string.notification_similar_photos)
             ID_SCREENSHOT_CLEAN -> Pair(R.mipmap.h_screenshot, R.string.notification_screenshot)
-
+            ID_MALWARE_CLEAN -> {
+                val arrayList = arrayOf(
+                    R.string.notification_malware_1,
+                    R.string.notification_malware_2,
+                    R.string.notification_malware_3,
+                    R.string.notification_malware_4
+                )
+                val randomIndex = Random.nextInt(0, 4)
+                Pair(R.mipmap.icon_virus_home, arrayList[randomIndex])
+            }
             else -> Pair(0, 0)
         }
     }
@@ -267,6 +278,8 @@ object NotificationUtils {
         return RemoteViews(context.packageName, R.layout.notification_common_small).apply {
             setImageViewResource(R.id.iv_icon, iconRes)
             setTextViewText(R.id.tv_desc, context.getString(contentRes))
+            if(iconRes==R.mipmap.icon_virus_home){
+            setTextViewText(R.id.tv_btn, "Scan Now")}
         }
     }
 
@@ -278,6 +291,8 @@ object NotificationUtils {
         return RemoteViews(context.packageName, R.layout.notification_common).apply {
             setImageViewResource(R.id.iv_icon, iconRes)
             setTextViewText(R.id.tv_desc, context.getString(contentRes))
+            if(iconRes==R.mipmap.icon_virus_home){
+                setTextViewText(R.id.tv_btn, "Scan Now")}
         }
     }
 

app/src/main/java/com/swiftcleaner/chovey/view/activity/MalwareCleanActivity.kt

@@ -80,6 +80,8 @@ class MalwareCleanActivity : AppCompatActivity() {
                         }, failed = {
                             uninstall(0, listOf(item))
                         }, isRetry = false)
+                    } else {
+                        uninstall(0, listOf(item))
                     }
                 }
             }
@@ -127,6 +129,8 @@ class MalwareCleanActivity : AppCompatActivity() {
             }, failed = {
                 initData(false)
             }, isRetry = false)
+        } else {
+            initData(false)
         }
         binding.rvMalware.adapter = adapter
         binding.rvMalware.layoutManager = LinearLayoutManager(this)

app/src/main/java/com/swiftcleaner/chovey/view/activity/StartActivity.java

@@ -5,6 +5,7 @@ import static com.swiftcleaner.chovey.GlobalConfig.ID_APP_PROCESS;
 import static com.swiftcleaner.chovey.GlobalConfig.ID_BATTERY_INFO;
 import static com.swiftcleaner.chovey.GlobalConfig.ID_CLEAN_JUNK;
 import static com.swiftcleaner.chovey.GlobalConfig.ID_LARGE_FILE_CLEANER;
+import static com.swiftcleaner.chovey.GlobalConfig.ID_MALWARE_CLEAN;
 import static com.swiftcleaner.chovey.GlobalConfig.ID_SCREENSHOT_CLEAN;
 import static com.swiftcleaner.chovey.GlobalConfig.ID_SIMILAR_PHOTOS;
 import static com.swiftcleaner.chovey.GlobalConfig.ID_WHATSAPP;
@@ -433,6 +434,12 @@ public class StartActivity extends AppCompatActivity {
             finish();
             return;
         }
+        if (Objects.equals(actionId, ID_MALWARE_CLEAN)) {
+            AdmobManager.INSTANCE.isShowAdInter();
+            startActivity(new Intent(this, MalwareCleanActivity.class));
+            finish();
+            return;
+        }
         SharedPreferences preferences = CleanApplication.context.getGuideSharedPreferences();
         boolean isGuideSP = preferences.getBoolean("isGuideSP", false);
         if (isGuideSP){