mirror of
https://github.com/Skysamara/FaceControl.git
synced 2025-12-06 06:16:00 +00:00
Добавил коллбэк на запрос доступа к файловой системе
This commit is contained in:
parent
89a111d50e
commit
4647fe5dfa
@ -7,6 +7,7 @@ import android.graphics.BitmapFactory
|
|||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Environment
|
import android.os.Environment
|
||||||
|
import android.widget.Toast
|
||||||
import androidx.core.app.ActivityCompat
|
import androidx.core.app.ActivityCompat
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import kotlinx.android.synthetic.main.activity_photo.*
|
import kotlinx.android.synthetic.main.activity_photo.*
|
||||||
@ -24,10 +25,9 @@ class Photo : AppCompatActivity() {
|
|||||||
startActivity(intent)
|
startActivity(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
val user = intent.getStringExtra("USER")
|
|
||||||
val fileName = "/MeridianFC/" + user + ".jpg"
|
|
||||||
|
|
||||||
var f = File(Environment.getExternalStorageDirectory(), fileName)
|
|
||||||
|
|
||||||
|
|
||||||
if (ContextCompat.checkSelfPermission(
|
if (ContextCompat.checkSelfPermission(
|
||||||
this@Photo,
|
this@Photo,
|
||||||
@ -41,15 +41,36 @@ class Photo : AppCompatActivity() {
|
|||||||
)
|
)
|
||||||
// TODO: 26.06.2020 Добавить коллбэк
|
// TODO: 26.06.2020 Добавить коллбэк
|
||||||
} else {
|
} else {
|
||||||
try {
|
getPhoto()
|
||||||
var fso = FileInputStream(f)
|
|
||||||
var b: Bitmap = BitmapFactory.decodeStream(fso)
|
|
||||||
im_photo.setImageBitmap(b)
|
|
||||||
getSupportActionBar()?.setTitle(user)
|
|
||||||
} catch (e: Exception) {
|
|
||||||
im_photo.setImageBitmap(null)
|
|
||||||
getSupportActionBar()?.setTitle("Не найден! " + user)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getPhoto() {
|
||||||
|
val user = intent.getStringExtra("USER")
|
||||||
|
val fileName = "/MeridianFC/" + user + ".jpg"
|
||||||
|
var f = File(Environment.getExternalStorageDirectory(), fileName)
|
||||||
|
|
||||||
|
try {
|
||||||
|
var fso = FileInputStream(f)
|
||||||
|
var b: Bitmap = BitmapFactory.decodeStream(fso)
|
||||||
|
im_photo.setImageBitmap(b)
|
||||||
|
getSupportActionBar()?.setTitle(user)
|
||||||
|
} catch (e: Exception) {
|
||||||
|
im_photo.setImageBitmap(null)
|
||||||
|
getSupportActionBar()?.setTitle("Не найден! " + user)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onRequestPermissionsResult(
|
||||||
|
requestCode: Int,
|
||||||
|
permissions: Array<out String>,
|
||||||
|
grantResults: IntArray
|
||||||
|
) {
|
||||||
|
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)
|
||||||
|
getPhoto()
|
||||||
|
else Toast.makeText(this, "Необходим доступ для показа фото", Toast.LENGTH_SHORT).show()
|
||||||
|
|
||||||
|
|
||||||
|
// super.onRequestPermissionsResult(requestCode, permissions, grantResults)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Loading…
x
Reference in New Issue
Block a user