Commit 9eeee1fb authored by wanglei's avatar wanglei

...

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