Commit 6b9a3463 authored by p x's avatar p x
Browse files

编译错误

parent e02e65d3
...@@ -24,7 +24,7 @@ class MainActivity : AppCompatActivity() { ...@@ -24,7 +24,7 @@ class MainActivity : AppCompatActivity() {
private lateinit var binding: ActivityMainBinding private lateinit var binding: ActivityMainBinding
private var mainVM: MainVM by viewModels() private val mainVM: MainVM by viewModels()
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
...@@ -34,7 +34,6 @@ class MainActivity : AppCompatActivity() { ...@@ -34,7 +34,6 @@ class MainActivity : AppCompatActivity() {
initWeb() initWeb()
} }
fun initWeb() { fun initWeb() {
var jsApi = JsApi() var jsApi = JsApi()
jsApi.mainVM = mainVM jsApi.mainVM = mainVM
......
...@@ -2,6 +2,7 @@ package com.sd.geelyhmiweb.ui ...@@ -2,6 +2,7 @@ package com.sd.geelyhmiweb.ui
import android.Manifest import android.Manifest
import android.content.Intent import android.content.Intent
import android.os.Build
import android.os.Bundle import android.os.Bundle
import androidx.activity.viewModels import androidx.activity.viewModels
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
...@@ -46,12 +47,15 @@ class LoginActivity : AppCompatActivity() { ...@@ -46,12 +47,15 @@ class LoginActivity : AppCompatActivity() {
fun requestPers() { fun requestPers() {
var list = listOf( var pers = mutableListOf<String>()
Manifest.permission.WRITE_EXTERNAL_STORAGE, if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
Manifest.permission.READ_EXTERNAL_STORAGE, pers.add(Manifest.permission.READ_EXTERNAL_STORAGE)
) pers.add(Manifest.permission.MANAGE_EXTERNAL_STORAGE)
} else {
pers.add(Manifest.permission.READ_EXTERNAL_STORAGE)
}
PermissionX.init(this) PermissionX.init(this)
.permissions(list) .permissions(pers)
.onExplainRequestReason { scope, deniedList -> .onExplainRequestReason { scope, deniedList ->
scope.showRequestReasonDialog( scope.showRequestReasonDialog(
deniedList, deniedList,
......
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