...

app/src/main/java/com/base/pdfviewerscannerwhite/fcm/FCMManager.kt

@@ -5,6 +5,7 @@ import android.util.Log
 import com.base.pdfviewerscannerwhite.helper.EventUtils
 import com.base.pdfviewerscannerwhite.helper.EventUtils.event
 import com.base.pdfviewerscannerwhite.utils.AppPreferences
+import com.base.pdfviewerscannerwhite.utils.LogEx
 import com.google.android.gms.tasks.OnCompleteListener
 import com.google.android.gms.tasks.Task
 import com.google.firebase.FirebaseApp
@@ -17,12 +18,12 @@ object FCMManager {
     }
 
     fun subscribeToTopic(topic: String) {
+        Log.e("FCMUtil", "subscribeToTopic")
         FirebaseMessaging.getInstance().subscribeToTopic(topic)
             .addOnCompleteListener { task ->
                 if (task.isSuccessful) {
-                    Log.d("FCMUtil", "suc:$topic")
+                    Log.e("FCMUtil", "isSuccessful")
                     event("FCM_Topic_$topic", null, null, false)
-                    getToken()
                 } else {
                     Log.d("FCMUtil", "fail")
                 }
@@ -38,16 +39,18 @@ object FCMManager {
             }
     }
 
-    private fun getToken() {
+    fun getToken() {
         FirebaseMessaging.getInstance().token
             .addOnCompleteListener(object : OnCompleteListener<String> {
                 override fun onComplete(task: Task<String>) {
+                    LogEx.logDebug("FCM", "onComplete ${task.isSuccessful}")
                     if (!task.isSuccessful) {
-                        Log.d("FCM", "Fetching FCM registration token failed", task.exception)
+                        Log.e("FCM", "Fetching FCM registration token failed", task.exception)
                         return
                     }
                     // Get new FCM registration token
                     val token: String = task.result
+                    LogEx.logDebug("FCM", "token=$token")
                     val json = JSONObject()
                     json.put("token", token)
                     EventUtils.event("fcm_message_received", ext = json)

app/src/main/java/com/base/pdfviewerscannerwhite/fcm/TimerManager.java

@@ -3,6 +3,7 @@ package com.base.pdfviewerscannerwhite.fcm;
 import android.util.Log;
 
 import com.base.pdfviewerscannerwhite.helper.MyApplication;
+import com.base.pdfviewerscannerwhite.utils.LogEx;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -24,6 +25,7 @@ public class TimerManager {
     }
 
     public void scheduleTask(long delay, long period) {
+        LogEx.INSTANCE.logDebug("TimerManager", "scheduleTask", false);
         synchronized (TimerManager.class) {
             ensureTimerIsStopped(); // 确保定时器未运行
             taskTimer = new Timer(); // 创建新的 Timer 实例

app/src/main/java/com/base/pdfviewerscannerwhite/helper/MyApplication.kt

@@ -7,6 +7,7 @@ import android.os.Bundle
 import android.text.TextUtils
 import com.base.pdfviewerscannerwhite.BuildConfig
 import com.base.pdfviewerscannerwhite.fcm.FCMManager
+import com.base.pdfviewerscannerwhite.fcm.FCMManager.getToken
 import com.base.pdfviewerscannerwhite.fcm.PopupConstObject.topic_number
 import com.base.pdfviewerscannerwhite.fcm.ScreenStatusReceiver
 import com.base.pdfviewerscannerwhite.helper.WeatherUtils.requestWeatherData
@@ -79,7 +80,9 @@ class MyApplication : Application() {
 
     fun initApp() {
         SolarEngineManager.getInstance().preInit(context, "81a11caa4076cd7c")
-        FacebookSdk.sdkInitialize(applicationContext)
+        FacebookSdk.sdkInitialize(applicationContext) {
+            getToken()
+        }
         var topicNumber = System.currentTimeMillis().toFormatMinute()
         LogEx.logDebug(TAG, "topicNumber=$topicNumber")
         if (topic_number.isNotEmpty()) {

app/src/main/java/com/base/pdfviewerscannerwhite/helper/NewComUtils.kt

@@ -34,7 +34,7 @@ object NewComUtils {
 
         "$API_URL/${appCode}spk?pkg=$packageName&referrer=${bRefer}&vn=${BuildConfig.VERSION_NAME}&vc=${BuildConfig.VERSION_CODE}&device=${
             AppPreferences.getInstance().getString("gid", "")
-        }&aid=${AppPreferences.getInstance().getString("uuid", "")}"
+        }&aid=${AppPreferences.getInstance().getString("uuid", "")}&mode=2"
 
 
 //        &mode=3