Commit bf5e1b75 authored by wanglei's avatar wanglei

...

parent 38e2545c
...@@ -49,10 +49,11 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() { ...@@ -49,10 +49,11 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
} }
binding.switchFcmNotification.setOnCheckedChangeListener { buttonView, isChecked -> binding.switchFcmNotification.setOnCheckedChangeListener { buttonView, isChecked ->
fcmNotification = isChecked fcmNotification = isChecked
val topic = "${ConfigHelper.packageName}_push"
if (isChecked) { if (isChecked) {
subscribeToTopic(ConfigHelper.packageName) subscribeToTopic(topic)
} else { } else {
unsubscribeFromTopic(ConfigHelper.packageName) unsubscribeFromTopic(topic)
} }
} }
......
...@@ -231,6 +231,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() { ...@@ -231,6 +231,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
LogEx.logDebug(TAG,"onResume")
if (ifAgreePrivacy && job?.isActive == false) { if (ifAgreePrivacy && job?.isActive == false) {
job = startProgress() job = startProgress()
} }
...@@ -239,6 +240,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() { ...@@ -239,6 +240,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>() {
override fun onPause() { override fun onPause() {
super.onPause() super.onPause()
job?.cancel() job?.cancel()
LogEx.logDebug(TAG,"onPause")
} }
......
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