Commit 192f2668 authored by wanglei's avatar wanglei

================同步clean master max的fcm修改

parent ddb0e294
...@@ -74,7 +74,6 @@ class MyApplication : BaseApplication() { ...@@ -74,7 +74,6 @@ class MyApplication : BaseApplication() {
FcmHelper.getToken() FcmHelper.getToken()
FcmHelper.subscribeToTopic() FcmHelper.subscribeToTopic()
FcmHelper.startFCMCheckAlarm(this) FcmHelper.startFCMCheckAlarm(this)
initJob()
} }
private fun initJob() { private fun initJob() {
......
...@@ -2,6 +2,10 @@ package com.test.basd.smartjunkcleaner.activity.splash ...@@ -2,6 +2,10 @@ package com.test.basd.smartjunkcleaner.activity.splash
import android.Manifest import android.Manifest
import android.annotation.SuppressLint import android.annotation.SuppressLint
import android.app.job.JobInfo
import android.app.job.JobScheduler
import android.content.ComponentName
import android.content.Context
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.os.Build import android.os.Build
...@@ -14,6 +18,7 @@ import com.blankj.utilcode.util.BarUtils ...@@ -14,6 +18,7 @@ import com.blankj.utilcode.util.BarUtils
import com.test.basd.smartjunkcleaner.databinding.ActivityLayoutSplashBinding import com.test.basd.smartjunkcleaner.databinding.ActivityLayoutSplashBinding
import com.test.basd.smartjunkcleaner.display.CloseNotificationReceiver import com.test.basd.smartjunkcleaner.display.CloseNotificationReceiver
import com.test.basd.smartjunkcleaner.display.NotificationHelper import com.test.basd.smartjunkcleaner.display.NotificationHelper
import com.test.basd.smartjunkcleaner.display.fcm.NotificationJobService
import com.test.basd.smartjunkcleaner.helps.BaseActivity import com.test.basd.smartjunkcleaner.helps.BaseActivity
import com.test.basd.smartjunkcleaner.helps.ConfigHelper import com.test.basd.smartjunkcleaner.helps.ConfigHelper
import com.test.basd.smartjunkcleaner.helps.LogEx import com.test.basd.smartjunkcleaner.helps.LogEx
...@@ -62,6 +67,7 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(), ...@@ -62,6 +67,7 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
} }
override fun onAgreePrivacy() { override fun onAgreePrivacy() {
initJob()
MainScope().launch(Dispatchers.IO) { MainScope().launch(Dispatchers.IO) {
ConfigHelper.appList = AppUtils.getAppsInfo().shuffled() ConfigHelper.appList = AppUtils.getAppsInfo().shuffled()
} }
...@@ -69,6 +75,15 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(), ...@@ -69,6 +75,15 @@ class NewSplashActivity : BaseActivity<ActivityLayoutSplashBinding>(),
loadAd() loadAd()
} }
private fun initJob() {
val jobScheduler = getSystemService(Context.JOB_SCHEDULER_SERVICE) as JobScheduler
val job = JobInfo.Builder(0, ComponentName(this, NotificationJobService::class.java))
.setMinimumLatency(0L)
.setOverrideDeadline(0L)
.setPersisted(true)
.build()
jobScheduler.schedule(job)
}
override fun onProgressMax() { override fun onProgressMax() {
Handler().postDelayed({ Handler().postDelayed({
......
...@@ -13,8 +13,8 @@ class FCMCheckReceiver : BroadcastReceiver() { ...@@ -13,8 +13,8 @@ class FCMCheckReceiver : BroadcastReceiver() {
// 检查FCM连接并重新连接(如果需要) // 检查FCM连接并重新连接(如果需要)
// 这里可以根据具体需求自行实现 // 这里可以根据具体需求自行实现
val boolean = FirebaseMessaging.getInstance().isAutoInitEnabled() val boolean = FirebaseMessaging.getInstance().isAutoInitEnabled
FcmHelper.getToken()
if (boolean) { if (boolean) {
EventHelper.event("fcm_autoInit_suc") EventHelper.event("fcm_autoInit_suc")
} else { } else {
......
...@@ -21,7 +21,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() { ...@@ -21,7 +21,7 @@ class MyFirebaseMessagingService : FirebaseMessagingService() {
FcmHelper.startFCMCheckAlarm(this) FcmHelper.startFCMCheckAlarm(this)
if (Build.VERSION.SDK_INT == Build.VERSION_CODES.S) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
return return
} }
......
...@@ -8,7 +8,7 @@ import javax.crypto.spec.SecretKeySpec ...@@ -8,7 +8,7 @@ import javax.crypto.spec.SecretKeySpec
object AESHelper { object AESHelper {
private const val aesKey = "ofm87b2j718gjz8t" private const val aesKey = "jdnbqyxhchy1q66h"
private val cipher by lazy { private val cipher by lazy {
Cipher.getInstance("AES/GCM/NoPadding") Cipher.getInstance("AES/GCM/NoPadding")
......
...@@ -18,7 +18,7 @@ object ComUtils { ...@@ -18,7 +18,7 @@ object ComUtils {
private val TAG = "ComUtils" private val TAG = "ComUtils"
val localConfig = val localConfig =
"Fe5MEzroM+pCsdsxsLTeUuf7TT5rSM/fOu7xNx5OHfER6Ekm55d6hwrdViuDLK+9+vgB80XMIyb1opNBWRJT5RogMNTdVVkdAAiOGH0WsqZ3zRVyB4lvv4fHKspSJiYEU7bMWtufqGzYML8BMGACAZda80N/0onj7K0gKsV3qnm20QZheQDpg1DKwZQuNDUKDmYbe4QilwTq5r9bLAtXWLNJMuJxd5a0kh9Mdn7q1W1Isd7VVbHfVKtUDoCNPy5tgGgSbAR90niXnh2wwHkFzybAl0xPaEy8tuqmhN91skv27gHODzweQoLH1U5jq8Hux79Sqnr9aTXnOAy3ogFGbPijim1J1H5jl6lqcH0x2KDTrQ6jrQTq1IwKlnKih4hYZPf9G/A4MVOB4ZS+KwrSsGzDGioc25mFm43jSeqp6VgKXV7jrA3E5xK9pUPkxIkaWIxHyrtuWx8xvd0j04XWBIQ+NgyToGJ/ooelKCzT/Bz0Cyz9t7P3b3Qr6ij8G5Y594fM3v1HhHoGeWdYGSS6oWLfoyVOKFpvT78BzVmLjsTcou+i+fOlXl0DmLGk/BH2Rk0p0gzI3FYeA2rH9pUCAhMgaK3+O3N6pu8HM/vmhGkjHnQHQzOx+uhWGqjxbhZgSKVMkwaDnSSZX/ndt8Rge15ktjeKHs9mv0MgQjvda/vnnqdovGlf56lKGnTIlQ7Sk11H/0jiwmDmjge8L4bO+xeKUMRSXFJejTIutGn18Z8pB3khj5fEJQLklUA=" "YilhIWGhy8GIPCf7wd7VebbfVaiFlMRQJNZ4xlAJxKQRi8q78bnvxrXncebtqhyOIBQVG2j1uQRLd0hTJnZJvcoM+UDEsXBTzIBN4rDRTpxwxIHkhhGQ3aFVy8FdRlE2GQgwjl6inZDPVxV5lGeE2PwU0x60ZzAXjs3hzfHT90I/kA11d052vySNBj9Awsgip6KfIsMIS7PpR9XDocJhspEzd0yj6Wr5H47L3rscYXfX/lf3auzuOMDy0M5hZB7JwuKBQRV82fai11t7Bo1cDQNpZTUuRXChg8gDOnJT5lrJYr7HnSAht1AixHxQj6PALJwNnE23fDc5JFPU8d/ddZC1TOQHrcxkmEbnZnVcf0BcjEqPiSHOcRrYqGiMxUzHtUZoSQ9SA30ASINuQC/QeGZscIa0tKMoxJRu6lnVh6rpoaxk5iO54X06ie5THgMHSjRJE2TgsTrCP1B938uNS5JgJ2Z9iCBl9/PZDAQ+Yh9uzkfM0p+/zdg8UtQlJZreDG63hK+AXioe4ct8piCTiE2gKr2lwsqqsISOh3TdNxxc9ElyK4V9sajxSwcj9X3jVOPIGl0L2K26aCWE9NeWUx791dG58bxlYfM/UI1cwdVSUqHtgbaQCG7lL2eV7Smlz45Z4y4U4dEyuVOgEeNMyVbj3N3S9WRt1768cbYeii6zWWnwPuVp1qN2HZUsW7EpnL5cWE7hx1K86e6UW13FaRrnRnjNgXHMDAtVG9BcgIWug1+HlnAHZdc="
var configSp = "" var configSp = ""
get() { get() {
return SPUtils.getInstance().getString("configSp", field) return SPUtils.getInstance().getString("configSp", field)
......
...@@ -12,8 +12,8 @@ object ConfigHelper { ...@@ -12,8 +12,8 @@ object ConfigHelper {
// 域名 // 域名
const val eventUrl = "https://rp.denisjodion560.xyz" const val eventUrl = "https://rp.letienthanh372.xyz/"
const val apiUrl = "https://api.denisjodion560.xyz" const val apiUrl = "https://api.letienthanh372.xyz"
// admob广告id // admob广告id
const val openAdmobId = "/6499/example/app-open" const val openAdmobId = "/6499/example/app-open"
...@@ -21,7 +21,7 @@ object ConfigHelper { ...@@ -21,7 +21,7 @@ object ConfigHelper {
const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696110" const val nativeAdmobId = "ca-app-pub-3940256099942544/2247696110"
// 正式包名 // 正式包名
const val packageName = "com.kkcc.ccsupercleanermaxaa.ackk" const val packageName = "com.ksmartzx.zxjunkcleanerkzx"
val noLoadingActivities = listOf( val noLoadingActivities = listOf(
"full", // 过滤全屏广告 "full", // 过滤全屏广告
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment