From 052d034696d2c919831f49983bd978c285f4fd31 Mon Sep 17 00:00:00 2001
From: xuhuixiang <xuhuixiang@email-dskj.com>
Date: Tue, 18 Mar 2025 16:03:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=80=9A=E7=9F=A5=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FreeAUD/src/main/AndroidManifest.xml          |  2 +-
 .../{MainActivity2.java => MainActivity.java} | 19 +++++++------------
 .../FreeAUD/MyFirebaseMessageingService.java  |  4 ++--
 3 files changed, 10 insertions(+), 15 deletions(-)
 rename FreeAUD/src/main/java/com/web/FreeAUD/{MainActivity2.java => MainActivity.java} (69%)

diff --git a/FreeAUD/src/main/AndroidManifest.xml b/FreeAUD/src/main/AndroidManifest.xml
index 3ca1e55..cf6ca3a 100644
--- a/FreeAUD/src/main/AndroidManifest.xml
+++ b/FreeAUD/src/main/AndroidManifest.xml
@@ -60,7 +60,7 @@
 
 
         <activity
-            android:name=".MainActivity2"
+            android:name=".MainActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
             android:exported="true"
             android:hardwareAccelerated="true"
diff --git a/FreeAUD/src/main/java/com/web/FreeAUD/MainActivity2.java b/FreeAUD/src/main/java/com/web/FreeAUD/MainActivity.java
similarity index 69%
rename from FreeAUD/src/main/java/com/web/FreeAUD/MainActivity2.java
rename to FreeAUD/src/main/java/com/web/FreeAUD/MainActivity.java
index 1e7cb4c..2168fba 100644
--- a/FreeAUD/src/main/java/com/web/FreeAUD/MainActivity2.java
+++ b/FreeAUD/src/main/java/com/web/FreeAUD/MainActivity.java
@@ -5,27 +5,22 @@ import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 
-import androidx.annotation.NonNull;
-
-import com.google.android.gms.tasks.OnCompleteListener;
-import com.google.android.gms.tasks.Task;
 import com.google.firebase.messaging.FirebaseMessaging;
-import com.web.base.MainActivity;
 
-public class MainActivity2 extends com.web.base.MainActivity2 {
+public class MainActivity extends com.web.base.MainActivity2 {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         userId =  128;
-        saveInt(MainActivity2.this,"user_code",userId);
-        saveInt(MainActivity2.this,"version_code",getVersion());
-        MainActivity.saveString(this, "base_url","https://freeaud.asia/");
+        saveInt(MainActivity.this,"user_code",userId);
+        saveInt(MainActivity.this,"version_code",getVersion());
+        com.web.base.MainActivity.saveString(this, "base_url","https://freeaud.asia/");
         //网页的底部NavigationBar颜色
-        MainActivity.saveString(this, "style_color", "#131313");
+        com.web.base.MainActivity.saveString(this, "style_color", "#131313");
         //页面的大背景颜色
-        MainActivity.saveString(this, "windows_color", "#0d0008");
+        com.web.base.MainActivity.saveString(this, "windows_color", "#0d0008");
         //任务栏的文字颜色 0 黑 1白 默认黑
-        saveInt(MainActivity2.this,"is_white",1);
+        saveInt(MainActivity.this,"is_white",1);
         super.onCreate(savedInstanceState);
         //用于修改大背景渐变色 不设置 大背景就是 windows_color 的颜色
         setBackDrawables(R.drawable.big_bg);
diff --git a/FreeAUD/src/main/java/com/web/FreeAUD/MyFirebaseMessageingService.java b/FreeAUD/src/main/java/com/web/FreeAUD/MyFirebaseMessageingService.java
index 01a1304..51a70f4 100644
--- a/FreeAUD/src/main/java/com/web/FreeAUD/MyFirebaseMessageingService.java
+++ b/FreeAUD/src/main/java/com/web/FreeAUD/MyFirebaseMessageingService.java
@@ -48,7 +48,7 @@ public class MyFirebaseMessageingService extends FirebaseMessagingService {
     }
 
     private void showNotification(MessageInfo messageInfo) {
-        Intent notifyIntent = new Intent(this, com.web.base.MainActivity2.class);
+        Intent notifyIntent = new Intent(this, MainActivity.class);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
             ComponentName launchComponent = null;
             launchComponent = getApplication()
@@ -100,7 +100,7 @@ public class MyFirebaseMessageingService extends FirebaseMessagingService {
     }
 
     private void showNotification(String title, String body) {
-        Intent notifyIntent = new Intent(this, MainActivity2.class);
+        Intent notifyIntent = new Intent(this, MainActivity.class);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.CUPCAKE) {
             ComponentName launchComponent = null;
             launchComponent = getApplication()