...处理重命名

app/src/main/java/com/base/locationsharewhite/location/LocationLoginUtils.kt

@@ -41,6 +41,8 @@ object LocationLoginUtils {
         url.toString()
     }
 
+    var loginCallBack: (() -> Unit)? = null
+
     fun login(name: String? = null) {
         Thread {
 
@@ -89,5 +91,8 @@ object LocationLoginUtils {
         myNickNameSp = nickName
 
         LogEx.logDebug(TAG, "invitationCode=$invitationCode nickName=$nickName")
+        loginCallBack?.invoke()
+        loginCallBack = null
     }
+
 }
\ No newline at end of file

app/src/main/java/com/base/locationsharewhite/ui/locationmap/LocationMapActivity.kt

@@ -27,12 +27,15 @@ import com.base.locationsharewhite.ui.set.RenameActivity
 import com.base.locationsharewhite.ui.set.RenameActivity.Companion.RENAME_VIEWING_NICK_NAME
 import com.base.locationsharewhite.ui.views.DialogView.showMapTypeDialog
 import com.base.locationsharewhite.ui.views.DialogView.showViewerMoreDialog
+import com.base.locationsharewhite.ui.views.LocationPermissionDialog.showLocationAllowAllTimeDialog
 import com.base.locationsharewhite.utils.BarUtils
 import com.base.locationsharewhite.utils.IntentUtils.intentAppDetailsSettings
 import com.base.locationsharewhite.utils.IntentUtils.intentLocationSetting
 import com.base.locationsharewhite.utils.LogEx
+import com.base.locationsharewhite.utils.PermissionUtils.checkBackgroundLocationPermission
 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.SpStringUtils
 import com.base.locationsharewhite.utils.SpStringUtils.VIEWING_NICKNAME_KEY
 import com.base.locationsharewhite.utils.SpStringUtils._DEVICE_NICKNAME_
@@ -237,24 +240,7 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
         }
         binding.bottomSheet.setOnClickListener { }
         binding.ivPermission.setOnClickListener {
-
-            launcher.launch(arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)) { map ->
-
-                val result = map.values.all { it }
-                if (result) {
-                    binding.ivPermission.visibility = View.INVISIBLE
-                } else {
-                    val flag = checkLocationPermissionDeniedByUser()
-                    if (flag) {
-                        toast("Permission Denied By User")
-                        launcher.launch(intentLocationSetting())
-
-                    } else {
-
-                    }
-                }
-            }
-
+            requestLocationAllowAllTime(launcher, jumpOutAction = {}, permissionAllowAction = {})
         }
 
     }
@@ -435,12 +421,12 @@ class LocationMapActivity : BaseActivity<ActivityLocationMapBinding>(), OnMapRea
             return
         }
 
-        if (checkLocationPermission()) {
+        if (!checkLocationPermission() || !checkBackgroundLocationPermission()) {
+            binding.ivPermission.visibility = View.VISIBLE
+        } else {
             binding.ivPermission.visibility = View.GONE
             locationPresenter.requestLocationUpdates()
             locationPresenter.startUploadMyLocation()
-        } else {
-            binding.ivPermission.visibility = View.VISIBLE
         }
         refreshNickName()
     }

app/src/main/java/com/base/locationsharewhite/ui/set/SettingActivity.kt

@@ -59,6 +59,12 @@ class SettingActivity : BaseActivity<ActivitySettingBinding>() {
         if (isRecreate) {
             return
         }
+        LocationLoginUtils.login()
+        LocationLoginUtils.loginCallBack = {
+            runOnUiThread {
+                binding.tvHelloName.text = getString(R.string.hello) + ",\n" + LocationLoginUtils.myNickNameSp
+            }
+        }
     }
 
 }
\ No newline at end of file