迭代+上线

app/build.gradle.kts

@@ -11,11 +11,11 @@ android {
 
 
     defaultConfig {
-        applicationId = "com.a.s"
+        applicationId = "com.asdqwe.ada.aaa"
         minSdk = 28
         targetSdk = 34
-        versionCode = 13
-        versionName = "1.3"
+        versionCode = 15
+        versionName = "1.5"
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     // 添加签名配置

app/google-services.json

 {
   "project_info": {
-    "project_number": "847944465890",
-    "project_id": "swift-cleaner-phone-helper",
-    "storage_bucket": "swift-cleaner-phone-helper.firebasestorage.app"
+    "project_number": "136978743377",
+    "project_id": "test-6d2d1",
+    "storage_bucket": "test-6d2d1.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:847944465890:android:e1c07e767666a42c4ccdbb",
+        "mobilesdk_app_id": "1:136978743377:android:7127da27894a4e56137870",
         "android_client_info": {
-          "package_name": "com.a.s"
+          "package_name": "com.asdqwe.ada.aaa"
         }
       },
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyAwWyLHdMr4RaScAPts91N_VM_1lKjBMr8"
+          "current_key": "AIzaSyDE29qrwvxLPkQJ9LB5BCeO6b_CPPvaE9o"
         }
       ],
       "services": {

app/src/main/AndroidManifest.xml

@@ -156,7 +156,7 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
                 <action android:name="com.google.android.c2dm.intent.RECEIVE" />
 
-                <category android:name="com.tool.elite.cleaner" />
+                <category android:name="com.asdqwe.ada.aaa" />
             </intent-filter>
         </receiver>
 

app/src/main/java/com/swiftcleaner/chovey/business/EventUtils.kt

 package com.swiftcleaner.chovey.business
 
+import android.util.Log
 import com.swiftcleaner.chovey.BuildConfig
 import com.swiftcleaner.chovey.GlobalConfig.PACKAGE_NAME
 import com.swiftcleaner.chovey.GlobalConfig.URL_EVENT
@@ -51,9 +52,11 @@ object EventUtils {
             .build()
         client.newCall(request).enqueue(object : Callback {
             override fun onFailure(call: Call, e: IOException) {
+
             }
 
             override fun onResponse(call: Call, response: Response) {
+                Log.d("FCMcode",response.code.toString())
             }
         })
     }

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

@@ -264,7 +264,7 @@ object NotificationUtils {
                     R.string.notification_malware_4
                 )
                 val randomIndex = Random.nextInt(0, 4)
-                Pair(R.mipmap.icon_virus_home, arrayList[randomIndex])
+                Pair(R.mipmap.h_virus, arrayList[randomIndex])
             }
             else -> Pair(0, 0)
         }
@@ -278,7 +278,7 @@ 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){
+            if(iconRes==R.mipmap.h_virus){
             setTextViewText(R.id.tv_btn, "Scan Now")}
         }
     }
@@ -291,7 +291,7 @@ 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){
+            if(iconRes==R.mipmap.h_virus){
                 setTextViewText(R.id.tv_btn, "Scan Now")}
         }
     }

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

@@ -253,6 +253,9 @@ public class CleanJunkActivity extends BaseActivity<ActivityCleanJunkBinding> {
                     startActivity(intent);
                     finish();
                 } else {
+                    Intent intent = new Intent(this, MainActivity.class);
+                    startActivity(intent);
+                    finish();
                     // 权限未授予，提示用户
                     Toast.makeText(this, "Permission not granted, please grant manually", Toast.LENGTH_SHORT).show();
                 }
@@ -626,6 +629,7 @@ public class CleanJunkActivity extends BaseActivity<ActivityCleanJunkBinding> {
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
         intent.putExtra("cleanstr", "Cleaned " + str + " junk files");
         intent.putExtra("title", "Clean Junk");
+        intent.putExtra("type", false);
         startActivity(intent);
         finish();
     }

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

@@ -47,7 +47,17 @@ public class EndCleanJunkActivity extends BaseActivity<ActivityEndCleanJunkBindi
     }
 
     private void initPage() {
-        binding.clRadarview.setVisibility(View.VISIBLE);
+        Intent intent = getIntent();
+        String stringExtra = intent.getStringExtra("cleanstr");
+        String title = intent.getStringExtra("title");
+        boolean type = intent.getBooleanExtra("type", false);
+        if (type){
+            binding.clRadarview.setVisibility(View.GONE);
+        }else {
+            binding.clRadarview.setVisibility(View.VISIBLE);
+        }
+        binding.endCleanJunkFileNum.setText(stringExtra);
+        binding.title.setText(title);
 
         binding.radarview.setSearching(true);
         initAnimotorPer();
@@ -106,11 +116,7 @@ public class EndCleanJunkActivity extends BaseActivity<ActivityEndCleanJunkBindi
     }
 
     private void initShow() {
-        Intent intent = getIntent();
-        String stringExtra = intent.getStringExtra("cleanstr");
-        String title = intent.getStringExtra("title");
-        binding.endCleanJunkFileNum.setText(stringExtra);
-        binding.title.setText(title);
+
         binding.ivReturn.setOnClickListener(v -> initCustDialog());
         binding.buttonBatteryInfoCheckNo.setOnClickListener(v -> {
             startActivity(new Intent(EndCleanJunkActivity.this, InfoActivity.class));

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

@@ -174,10 +174,13 @@ public class GuideActivity extends AppCompatActivity {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
                 if (Environment.isExternalStorageManager()) {
                     // 权限已授予，刷新页面或执行相关操作
-                    Intent intent = new Intent(this, MainActivity.class);
+                    Intent intent = new Intent(this, GuideActivity.class);
                     startActivity(intent);
                     finish();
                 } else {
+                    Intent intent = new Intent(this, MainActivity.class);
+                    startActivity(intent);
+                    finish();
                     // 权限未授予，提示用户
                     Toast.makeText(this, "Permission not granted, please grant manually", Toast.LENGTH_SHORT).show();
                 }

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

@@ -315,6 +315,7 @@ public class LargeFileActivity extends BaseActivity<ActivityLargeFileBinding> {
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
         intent.putExtra("cleanstr", "Cleaned " + str + " junk files");
         intent.putExtra("title", "Clean Junk");
+        intent.putExtra("type", false);
         startActivity(intent);
         finish();
     }

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

@@ -283,6 +283,7 @@ class MalwareCleanActivity : AppCompatActivity() {
             val intent = Intent(this, EndCleanJunkActivity::class.java).apply {
                 putExtra("cleanstr", "Your phone is completely secure\\nno threats found!")
                 putExtra("title", "Antivirus Scan")
+                putExtra("type", true)
             }
             startActivity(intent)
             finish()

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

@@ -307,6 +307,7 @@ public class ScreenShotActivity extends BaseActivity<ActivityScreenShotBinding>
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
         intent.putExtra("cleanstr", "Cleaned " + cleanSize + " junk files");
         intent.putExtra("title", "Clean Junk");
+        intent.putExtra("type", false);
         startActivity(intent);
         finish();
     }

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

 package com.swiftcleaner.chovey.view.activity;
 
+import static com.swiftcleaner.chovey.GlobalConfig.ID_APPMANAGER;
+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;
+import static com.swiftcleaner.chovey.GlobalConfig.ID_WHEATHER;
+import static com.swiftcleaner.chovey.GlobalConfig.ID_XINGZUO;
 import static com.swiftcleaner.chovey.GlobalConfig.URL_PRIVACY;
 
 import androidx.appcompat.app.AppCompatActivity;
@@ -21,10 +32,12 @@ import android.widget.ImageView;
 import android.widget.Toast;
 
 import com.gyf.immersionbar.ImmersionBar;
+import com.swiftcleaner.chovey.CleanApplication;
 import com.swiftcleaner.chovey.GlobalConfig;
 import com.swiftcleaner.chovey.R;
 import com.swiftcleaner.chovey.business.EventUtils;
 import com.swiftcleaner.chovey.business.admob.AdmobManager;
+import com.swiftcleaner.chovey.business.push.NotificationUtils;
 import com.swiftcleaner.chovey.databinding.ActivityMainBinding;
 import com.swiftcleaner.chovey.databinding.ActivitySettingBinding;
 import com.swiftcleaner.chovey.util.SPUtils;
@@ -64,17 +77,17 @@ public class SettingActivity extends AppCompatActivity {
             }
         });
 
-//        String token = SPUtils.Companion.getInstance().getString("token", "");
-//        Log.d("setting_token",token);
-//        binding.settingTitle.setOnClickListener(v->{
-//            if (!token.isEmpty()){
-//                binding.settingToken.setText(token);
-//                binding.settingToken.setVisibility(View.VISIBLE);
-//                copyTextToClipboard(token);
-//            }else {
-//                Toast.makeText(this, "token为空", Toast.LENGTH_SHORT).show();
-//            }
-//        });
+        String token = SPUtils.Companion.getInstance().getString("token", "");
+        Log.d("setting_token", token);
+        binding.settingToken.setOnClickListener(v -> {
+            if (!token.isEmpty()) {
+                binding.settingToken.setText(token);
+                binding.settingToken.setVisibility(View.VISIBLE);
+                copyTextToClipboard(token);
+            } else {
+                Toast.makeText(this, "token为空", Toast.LENGTH_SHORT).show();
+            }
+        });
     }
 
     private void showCustomDialog() {

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

@@ -238,6 +238,7 @@ class SimilarPhotosActivity : AppCompatActivity() {
                 val intent = Intent(this@SimilarPhotosActivity, EndCleanJunkActivity::class.java)
                 intent.putExtra("cleanstr", "Cleaned"+formatFileSize(selectedFiles.sumOf { it.size })+"junk files")
                 intent.putExtra("title", "Clean Junk")
+                intent.putExtra("type",false)
                 startActivity(intent)
                 finish()
             }

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

@@ -309,6 +309,7 @@ public class WhatsAppActivity extends BaseActivity<ActivityWhatsAppBinding> {
         Intent intent = new Intent(this, EndCleanJunkActivity.class);
         intent.putExtra("cleanstr", "Cleaned " + str + " junk files");
         intent.putExtra("title", "Clean Junk");
+        intent.putExtra("type", false);
         startActivity(intent);
         finish();
     }

app/src/main/java/com/swiftcleaner/chovey/view/fragment/GuideEndFragment.java

@@ -30,7 +30,7 @@ public class GuideEndFragment extends Fragment {
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_guide_end, container, false);
         buttonNext = view.findViewById(R.id.end_button);
-        skipId = view.findViewById(R.id.skip_id);
+//        skipId = view.findViewById(R.id.skip_id);
 
         buttonNext.setOnClickListener(v -> {
             // 通知Activity切换到下一个页面
@@ -39,28 +39,28 @@ public class GuideEndFragment extends Fragment {
             }
         });
 
-        skipId.setOnClickListener(v -> {
-            if (AdmobManager.INSTANCE.isShowAdInterGuide()){
-                AdmobManager.INSTANCE.showInterstitialAd(requireActivity(),
-                        () -> {
-                            startIntent();
-                            Log.d("isShowAdInterGuide","Ad loading failed");
-                            return null;
-                        },
-                        () -> {
-                            Log.d("isShowAdInterGuide","Advertisement loaded successfully");
-                            return null;
-                        },
-                        () -> {
-                            Log.d("isShowAdInterGuide","Ad loading ends");
-                            startIntent();
-                            return null;
-                        }, false);
-            }else {
-                startIntent();
-                Log.d("isShowAdInterGuide",AdmobManager.INSTANCE.isShowAdInterGuide()+"Close Advertisement");
-            }
-        });
+//        skipId.setOnClickListener(v -> {
+//            if (AdmobManager.INSTANCE.isShowAdInterGuide()){
+//                AdmobManager.INSTANCE.showInterstitialAd(requireActivity(),
+//                        () -> {
+//                            startIntent();
+//                            Log.d("isShowAdInterGuide","Ad loading failed");
+//                            return null;
+//                        },
+//                        () -> {
+//                            Log.d("isShowAdInterGuide","Advertisement loaded successfully");
+//                            return null;
+//                        },
+//                        () -> {
+//                            Log.d("isShowAdInterGuide","Ad loading ends");
+//                            startIntent();
+//                            return null;
+//                        }, false);
+//            }else {
+//                startIntent();
+//                Log.d("isShowAdInterGuide",AdmobManager.INSTANCE.isShowAdInterGuide()+"Close Advertisement");
+//            }
+//        });
 
         return view;
     }

app/src/main/res/drawable/shape_90_radio.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#C9C9C9"/>
+    <corners android:radius="90dp"/>
+</shape>
\ No newline at end of file

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

@@ -72,9 +72,13 @@
 
         <androidx.appcompat.widget.AppCompatButton
             android:id="@+id/scan_skip"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+            android:layout_width="76dp"
+            android:layout_height="40dp"
             android:text="Skip"
+            android:textSize="18sp"
+            android:textAllCaps="false"
+            android:textColor="@color/white"
+            android:background="@drawable/shape_90_radio"
             android:layout_marginTop="30dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"

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

@@ -32,7 +32,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="16dp"
-                        android:text="Fast Cleaner junk"
+                        android:text="AntiVirus Cleaner Junk"
                         android:textColor="#000000"
                         android:textSize="18sp"
                         android:textStyle="bold"

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

@@ -78,7 +78,7 @@
             android:ellipsize="end"
             android:gravity="center"
             android:maxLines="1"
-            android:text="Fast Cleaner junk"
+            android:text="AntiVirus Cleaner Junk"
             android:textColor="#000000"
             android:textSize="18sp"
             android:textStyle="bold"
@@ -202,14 +202,13 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-<!--    <TextView-->
-<!--        android:visibility="gone"-->
-<!--        android:id="@+id/setting_token"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_height="wrap_content"-->
-<!--        android:layout_marginTop="50dp"-->
-<!--        android:gravity="center"-->
-<!--        android:text=""-->
-<!--        android:textSize="20sp"-->
-<!--        app:layout_constraintTop_toBottomOf="@id/setting_cl3" />-->
+    <TextView
+        android:id="@+id/setting_token"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
+        android:gravity="center"
+        android:text="token"
+        android:textSize="20sp"
+        app:layout_constraintTop_toBottomOf="@id/setting_cl3" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

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

@@ -20,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="316dp"
-        android:text="Fast Cleaner junk"
+        android:text="AntiVirus Cleaner Junk"
         android:textColor="#000000"
         android:textSize="20sp"
         android:textStyle="bold"

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

@@ -40,7 +40,7 @@
                 android:ellipsize="end"
                 android:gravity="center"
                 android:maxLines="2"
-                android:text="@string/multi_line_text"
+                android:text=                                                        "@string/multi_line_text"
                 android:textColor="#000000"
                 android:textSize="18sp"
                 android:textStyle="bold" />

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

@@ -8,6 +8,7 @@
     tools:context=".view.fragment.GuideEndFragment">
 
     <TextView
+        android:visibility="gone"
         android:id="@+id/skip_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_margin="5dp"
-        android:background="@mipmap/xiaoyinyu"
+        android:scaleType="fitXY"
         tools:ignore="ContentDescription" />
 
     <RelativeLayout

app/src/main/res/values/strings.xml

 <resources>
-    <string name="app_name">Fast Cleaner junk</string>
+    <string name="app_name">AntiVirus Cleaner Junk</string>
     <string name="facebook_app_id">448811341605605</string>
     <string name="ad_app_id">ca-app-pub-3245539546494448~368529487</string>
 
-    <string name="multi_line_text">Thank you for using \n Fast Cleaner junk!</string>
+    <string name="multi_line_text">Thank you for using \n AntiVirus Cleaner Junk!</string>
     <string name="app_manager">Check apps size and uninstall some apps \n to release storage space</string>
     <string name="what_sapp">Free up space by cleaning up WhatsApp \n junkfiles</string>
     <string name="app_process">Check apps size and uninstall some apps \n to release storage space</string>
     <string name="screenshot">Check screenshot cleaner to release more \n space</string>
     <string name="spinner_a">文件名称</string>
-    <string name="quanxian_title">To ensure proper functionality, please allow \n Fast Cleaner junk to access all \n files on your device.</string>
+    <string name="quanxian_title">To ensure proper functionality, please allow \n AntiVirus Cleaner Junk to access all \n files on your device.</string>
     <string name="check_apps_size_and_uninstall_some_apps_to_release_storage_space">Check apps size and uninstall some apps \n to release storage space</string>
     <string name="free_up_space_by_cleaning_up_whatsapp_junkfiles">Free up space by cleaning up WhatsApp \n junkfiles</string>
     <string-array name="spinner_list">
@@ -20,7 +20,7 @@
     <string name="preparing_advertisement">Preparing advertisement</string>
     <string name="notification_clean">Phone slow? Junk clean for space!</string>
     <string name="notification_battery">Watch battery, extend life</string>
-    <string name="notification_manager">Manage apps easily with Fast Cleaner junk</string>
+    <string name="notification_manager">Manage apps easily with AntiVirus Cleaner Junk</string>
     <string name="notification_large_file">Low space? Clean large files</string>
     <string name="notification_whatsapp">WhatsApp bulky? Clean for smooth chat</string>
     <string name="notification_app_process">Many proc? Close for speed &amp; power</string>

settings.gradle.kts

@@ -24,5 +24,5 @@ dependencyResolutionManagement {
 
 }
 
-rootProject.name = "Fast Cleaner junk"
+rootProject.name = "AntiVirus Cleaner Junk"
 include(":app")