Commit 9eeee1fb authored by wanglei's avatar wanglei

...

parent b648a580
...@@ -243,13 +243,13 @@ object AdsMgr { ...@@ -243,13 +243,13 @@ object AdsMgr {
* *
* @param parent 展示广告的父布局容器 * @param parent 展示广告的父布局容器
*/ */
fun showBanner(parent: ViewGroup, collapsible: Boolean = true) { fun showBanner(parent: ViewGroup, collapsible: Boolean = true, adClose: (() -> Unit)? = null) {
if (configBean.isInBlackList) { if (configBean.isInBlackList) {
EventUtils.event("isInBlackList", configBean.isInBlackList.toString()) EventUtils.event("isInBlackList", configBean.isInBlackList.toString())
return return
} }
if (adsConfigBean.adSwitch) { if (adsConfigBean.adSwitch) {
adBannerMgr.show(parent,collapsible) adBannerMgr.show(parent, collapsible, adClose)
} }
} }
} }
\ No newline at end of file
package com.base.locationsharewhite.ui.main package com.base.locationsharewhite.ui.main
import android.Manifest
import android.app.Dialog import android.app.Dialog
import android.content.Intent import android.content.Intent
import android.graphics.Color import android.graphics.Color
import android.os.Build
import android.view.LayoutInflater import android.view.LayoutInflater
import androidx.activity.addCallback import androidx.activity.addCallback
import androidx.core.view.updatePadding import androidx.core.view.updatePadding
...@@ -29,10 +27,6 @@ import com.base.locationsharewhite.utils.BarUtils ...@@ -29,10 +27,6 @@ import com.base.locationsharewhite.utils.BarUtils
import com.base.locationsharewhite.utils.LogEx import com.base.locationsharewhite.utils.LogEx
import com.base.locationsharewhite.utils.PermissionUtils.areNotificationsEnabled import com.base.locationsharewhite.utils.PermissionUtils.areNotificationsEnabled
import com.base.locationsharewhite.utils.PermissionUtils.checkAllLocationPermission import com.base.locationsharewhite.utils.PermissionUtils.checkAllLocationPermission
import com.base.locationsharewhite.utils.PermissionUtils.checkBackgroundLocationPermission
import com.base.locationsharewhite.utils.PermissionUtils.checkBackgroundLocationPermissionDeniedByUser
import com.base.locationsharewhite.utils.PermissionUtils.checkLocationPermission
import com.base.locationsharewhite.utils.PermissionUtils.checkLocationPermissionDeniedByUser
import com.base.locationsharewhite.utils.PermissionUtils.requestLocationAllowAllTime import com.base.locationsharewhite.utils.PermissionUtils.requestLocationAllowAllTime
import com.google.android.gms.maps.CameraUpdateFactory import com.google.android.gms.maps.CameraUpdateFactory
import com.google.android.gms.maps.GoogleMap import com.google.android.gms.maps.GoogleMap
...@@ -84,12 +78,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback { ...@@ -84,12 +78,16 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback {
// //
// } // }
// } // }
if (!bannerShowed.get()) {
bannerShowed.set(true)
LocationLoginUtils.login() AdsMgr.showBanner(binding.flAd) {
if (!checkAllLocationPermission()) {
val flag = areNotificationsEnabled() showAllowAllTimeDialog()
EventUtils.event("areNotificationsEnabled", "areNotificationsEnabled=$flag") } else {
requestServiceLocationUpdates()
}
}
}
} }
private var bannerShowed = AtomicBoolean(false) private var bannerShowed = AtomicBoolean(false)
...@@ -98,17 +96,17 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback { ...@@ -98,17 +96,17 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback {
val recreated = changeLanguage(this) val recreated = changeLanguage(this)
if (recreated) return if (recreated) return
if (!checkAllLocationPermission()) {
showAllowAllTimeDialog() LocationLoginUtils.login()
} else {
requestServiceLocationUpdates()
}
val mapFragment = val mapFragment =
supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment? supportFragmentManager.findFragmentById(R.id.map) as SupportMapFragment?
mapFragment?.getMapAsync(this) mapFragment?.getMapAsync(this)
mainPresenter.startLocationJob(lifecycleScope) mainPresenter.startLocationJob(lifecycleScope)
val flag = areNotificationsEnabled()
EventUtils.event("areNotificationsEnabled", "areNotificationsEnabled=$flag")
} }
override fun onResume() { override fun onResume() {
...@@ -136,7 +134,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback { ...@@ -136,7 +134,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnMapReadyCallback {
sendAllAllowedNotification(this) sendAllAllowedNotification(this)
requestLocationAllowAllTime(launcher, jumpOutAction = { requestLocationAllowAllTime(launcher, jumpOutAction = {
LogEx.logDebug(TAG, "jumpOutAction") LogEx.logDebug(TAG, "jumpOutAction")
}, permissionAllowCallBack = {}) }, permissionAllowCallBack = {
})
}, },
dismissAction = { dismissAction = {
allowAllTimeDialog = null allowAllTimeDialog = null
......
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