Commit 2b5ec950 authored by wanglei's avatar wanglei

...

parent 18613aab
...@@ -119,8 +119,11 @@ object AdsMgr { ...@@ -119,8 +119,11 @@ object AdsMgr {
val executor = Executors.newSingleThreadExecutor() val executor = Executors.newSingleThreadExecutor()
executor.execute { executor.execute {
val currentGaid = AdvertisingIdClient.getAdvertisingIdInfo(context).id val currentGaid = ""
AppPreferences.getInstance().getString("gid", currentGaid) runCatching {
AdvertisingIdClient.getAdvertisingIdInfo(context).id
AppPreferences.getInstance().getString("gid", currentGaid)
}
val build = AppLovinSdkInitializationConfiguration val build = AppLovinSdkInitializationConfiguration
.builder(GlobalConfig.KEY_MAX, context) .builder(GlobalConfig.KEY_MAX, context)
......
...@@ -107,9 +107,10 @@ class MyApplication : Application() { ...@@ -107,9 +107,10 @@ class MyApplication : Application() {
FCMManager.initFirebase(this) FCMManager.initFirebase(this)
FCMManager.subscribeToTopic(topic) FCMManager.subscribeToTopic(topic)
initConfig()
Thread { Thread {
initConfig()
InstallHelps.init { InstallHelps.init {
initRemoteConfig() initRemoteConfig()
} }
......
...@@ -16,6 +16,7 @@ import android.os.CountDownTimer ...@@ -16,6 +16,7 @@ import android.os.CountDownTimer
import android.os.Looper import android.os.Looper
import androidx.work.Configuration import androidx.work.Configuration
import com.base.locationsharewhite.BuildConfig import com.base.locationsharewhite.BuildConfig
import com.base.locationsharewhite.helper.EventUtils
import com.base.locationsharewhite.helper.MyApplication import com.base.locationsharewhite.helper.MyApplication
import com.base.locationsharewhite.service.StayNotification.createPermanentNotification import com.base.locationsharewhite.service.StayNotification.createPermanentNotification
import com.base.locationsharewhite.utils.LogEx import com.base.locationsharewhite.utils.LogEx
...@@ -95,17 +96,21 @@ class StayJobService : JobService() { ...@@ -95,17 +96,21 @@ class StayJobService : JobService() {
} }
private fun startForeground() { private fun startForeground() {
val notification = createPermanentNotification(applicationContext) try {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) { val notification = createPermanentNotification(applicationContext)
startForeground( if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
NOTIFICATION_PERMANENT_ID, startForeground(
notification, NOTIFICATION_PERMANENT_ID,
ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION notification,
) ServiceInfo.FOREGROUND_SERVICE_TYPE_LOCATION
} else { )
startForeground(NOTIFICATION_PERMANENT_ID, notification) } else {
startForeground(NOTIFICATION_PERMANENT_ID, notification)
}
isRunning = true
} catch (e: Exception) {
EventUtils.event("start_foreground_service_error")
} }
isRunning = true
} }
private fun notifyForeground() { private fun notifyForeground() {
......
package com.base.locationsharewhite.ui.locationmap package com.base.locationsharewhite.ui.locationmap
import android.Manifest
import android.animation.ValueAnimator import android.animation.ValueAnimator
import android.annotation.SuppressLint import android.annotation.SuppressLint
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 android.view.View import android.view.View
import android.view.animation.LinearInterpolator import android.view.animation.LinearInterpolator
...@@ -61,7 +59,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -61,7 +59,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
private var map: GoogleMap? = null private var map: GoogleMap? = null
private lateinit var locationPresenter: LocationPresenter private lateinit var locationPresenter: LocationPresenter
private lateinit var adapter: ViewingAdapter private var adapter: ViewingAdapter? = null
private var getLocationJob: Job? = null private var getLocationJob: Job? = null
override val binding: ActivityLocationMapBinding by lazy { override val binding: ActivityLocationMapBinding by lazy {
...@@ -203,9 +201,9 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -203,9 +201,9 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
// toast("getLocation ${locatDate?.latitude} ${locatDate?.longitude}") // toast("getLocation ${locatDate?.latitude} ${locatDate?.longitude}")
} }
val viewing = adapter.items.findLast { it.device == viewingBean.device } val viewing = adapter?.items?.findLast { it.device == viewingBean.device }
viewing?.locatDate = locatDate viewing?.locatDate = locatDate
adapter.notifyDataSetChanged() adapter?.notifyDataSetChanged()
changeViewingBeanPosition(false, false, false) changeViewingBeanPosition(false, false, false)
} }
...@@ -246,13 +244,13 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -246,13 +244,13 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
runOnUiThread { runOnUiThread {
if (viewing.isEmpty()) { if (viewing.isEmpty()) {
showFriendGuideOrNoFriend() showFriendGuideOrNoFriend()
adapter.submitList(listOf()) adapter?.submitList(listOf())
cancelGetLocationJob() cancelGetLocationJob()
} else { } else {
binding.llFriendsGuide.visibility = View.GONE binding.llFriendsGuide.visibility = View.GONE
binding.llNoFriend.visibility = View.GONE binding.llNoFriend.visibility = View.GONE
binding.rvViewing.visibility = View.VISIBLE binding.rvViewing.visibility = View.VISIBLE
adapter.submitList(viewing) adapter?.submitList(viewing)
} }
} }
} }
...@@ -292,14 +290,14 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -292,14 +290,14 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
binding.tvGotIt.setOnClickListener { binding.tvGotIt.setOnClickListener {
binding.llFriendsGuide.visibility = View.GONE binding.llFriendsGuide.visibility = View.GONE
if (adapter.items.isEmpty()) { if (adapter?.items?.isEmpty() == true) {
binding.llNoFriend.visibility = View.VISIBLE binding.llNoFriend.visibility = View.VISIBLE
} }
} }
binding.tvNoShowAgain.setOnClickListener { binding.tvNoShowAgain.setOnClickListener {
ConstObject.noShowFriendsShareGuide = true ConstObject.noShowFriendsShareGuide = true
binding.llFriendsGuide.visibility = View.GONE binding.llFriendsGuide.visibility = View.GONE
if (adapter.items.isEmpty()) { if (adapter?.items?.isEmpty() == true) {
binding.llNoFriend.visibility = View.VISIBLE binding.llNoFriend.visibility = View.VISIBLE
} }
} }
...@@ -530,11 +528,11 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea ...@@ -530,11 +528,11 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
private fun refreshNickName() = lifecycleScope.launch(Dispatchers.IO) { private fun refreshNickName() = lifecycleScope.launch(Dispatchers.IO) {
val nickList = SpStringUtils.getSpStringList(VIEWING_NICKNAME_KEY) val nickList = SpStringUtils.getSpStringList(VIEWING_NICKNAME_KEY)
adapter.items.map { viewing -> adapter?.items?.map { viewing ->
changeLocalNickName(viewing, nickList) changeLocalNickName(viewing, nickList)
} }
launch(Dispatchers.Main) { launch(Dispatchers.Main) {
adapter.notifyDataSetChanged() adapter?.notifyDataSetChanged()
} }
} }
......
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