Commit 77ab198d authored by wanglei's avatar wanglei

...

parent 68fa5605
......@@ -101,7 +101,7 @@ object AdsMgr {
}
isAdmobInit = readyAdapter != null
EventUtils.event("AdmobInit", "AdmobInit")
context.toast("admob init")
// context.toast("admob init")
if (adsConfigBean.adSwitch) {
admobInitCallBack?.invoke()
......
......@@ -401,7 +401,9 @@ object NotificationUiUtil {
val bigRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_style_2)
val smallRemoteViews = RemoteViews(MyApplication.appContext.packageName, R.layout.notification_style_2)
val intent = Intent(context, MainActivity::class.java)
val intent = Intent(context, MainActivity::class.java).apply {
putExtra("where", "sendAllAllowedNotification")
}
sendCustomNotification(context, intent, bigRemoteViews, smallRemoteViews, 1999)
}
......
......@@ -55,7 +55,9 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
fun finishToMain(delay: Long = 0) {
val flag = this !is MainActivity && !ActivityManagerUtils.getInstance().isActivityInStack(MainActivity::class.java)
if (flag) {
startActivity(Intent(this, MainActivity::class.java))
startActivity(Intent(this, MainActivity::class.java).apply {
putExtra("where", "finishToMain")
})
}
lifecycleScope.launch(Dispatchers.Main) {
delay(delay)
......@@ -65,6 +67,7 @@ abstract class BaseActivity<T : ViewBinding> : AppCompatActivity() {
fun finishToMainTop() {
val intent = Intent(this, MainActivity::class.java)
intent.putExtra("where", "finishToMainTop")
intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT)
startActivity(intent)
}
......
......@@ -137,6 +137,7 @@ class SplashActivity : BaseActivity<ActivitySplashBinding>(), SplashView {
PopupConstObject.ACTION_STAY_HOME -> {
startActivity(Intent(this, MainActivity::class.java).apply {
putExtra("actionId", actionId)
putExtra("where", "ACTION_STAY_HOME")
})
}
......
......@@ -11,6 +11,7 @@ import android.view.View
import android.widget.FrameLayout
import android.widget.LinearLayout
import androidx.core.content.ContextCompat
import com.base.locationsharewhite.BuildConfig
import com.base.locationsharewhite.R
import com.base.locationsharewhite.ads.AdsMgr
import com.base.locationsharewhite.ads.AdsShowCallBack
......@@ -20,6 +21,7 @@ import com.base.locationsharewhite.databinding.DialogViewerMoreBinding
import com.base.locationsharewhite.ui.locationmap.LocationMapActivity
import com.base.locationsharewhite.utils.LogEx
import com.google.android.gms.maps.GoogleMap
import kotlin.system.exitProcess
object DialogView {
......@@ -93,6 +95,7 @@ object DialogView {
}
binding.tvQuit.setOnClickListener {
dialog.dismiss()
// if (BuildConfig.DEBUG) exitProcess(0) else finish()
finish()
}
binding.ivClose.setOnClickListener {
......
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