Commit c070146e authored by fengruiyu's avatar fengruiyu

Merge branch 'dev_1.0.0' of http://39.97.65.143:81/android/android_street into fry_dev

parents 894325ec 0e7795fc
...@@ -75,10 +75,9 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() { ...@@ -75,10 +75,9 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
PermissionX.init(this).permissions( PermissionX.init(this).permissions(
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else "", if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) Manifest.permission.ACCESS_BACKGROUND_LOCATION else "",
Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION
Manifest.permission.WRITE_EXTERNAL_STORAGE, ).request(RequestCallback { allGranted, grantedList, deniedList ->
Manifest.permission.READ_PHONE_STATE })
)
viewModel.checkUpgrade() viewModel.checkUpgrade()
} }
var oldTime: Long = 0 var oldTime: Long = 0
......
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