sky/FaceControl
1
0
Fork 0
mirror of https://github.com/Skysamara/FaceControl.git synced 2025-12-06 06:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Мелкие правки

Browse Source
This commit is contained in:
skysamara 2020-06-29 03:07:39 +03:00
parent e479452a3c
commit 88a61f27f0
2 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/ru/panorobot/fc/MainActivity.kt
View File

@ -31,10 +31,6 @@ class MainActivity : AppCompatActivity() {
var runnable = object:Runnable{ var runnable = object:Runnable{
override fun run() { override fun run() {
cameraSource.stop() cameraSource.stop()
// val alert = builder.create()
// alert.show()
// startActivity(Intent(this@MainActivity, Photo::class.java))
taskHandler.removeCallbacksAndMessages(null) taskHandler.removeCallbacksAndMessages(null)
} }
} }
@ -80,9 +76,11 @@ class MainActivity : AppCompatActivity() {
override fun surfaceCreated(holder: SurfaceHolder?) { override fun surfaceCreated(holder: SurfaceHolder?) {
print("4") print("4")
if (ContextCompat.checkSelfPermission(this@MainActivity, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED) if (ContextCompat.checkSelfPermission(this@MainActivity, android.Manifest.permission.CAMERA) == PackageManager.PERMISSION_GRANTED)
// && (ContextCompat.checkSelfPermission(this@MainActivity, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)) == PackageManager.PERMISSION_GRANTED))
cameraSource.start(svBarcode.holder) cameraSource.start(svBarcode.holder)
else ActivityCompat.requestPermissions(this@MainActivity, arrayOf(android.Manifest.permission.CAMERA), 321) else {
cameraSource.stop()
ActivityCompat.requestPermissions(this@MainActivity, arrayOf(android.Manifest.permission.CAMERA), 123)
}
} }
}) })
@ -96,11 +94,6 @@ class MainActivity : AppCompatActivity() {
cameraSource.start(svBarcode.holder) cameraSource.start(svBarcode.holder)
else Toast.makeText(this, "scanner", Toast.LENGTH_SHORT).show() else Toast.makeText(this, "scanner", Toast.LENGTH_SHORT).show()
} }
if (requestCode == 321) {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)
// cameraSource.start(svBarcode.holder)
else Toast.makeText(this, "scanner", Toast.LENGTH_SHORT).show()
}
} }
override fun onDestroy() { override fun onDestroy() {

8
app/src/main/java/ru/panorobot/fc/Photo.kt
View File

@ -25,10 +25,6 @@ class Photo : AppCompatActivity() {
startActivity(intent) startActivity(intent)
} }
if (ContextCompat.checkSelfPermission( if (ContextCompat.checkSelfPermission(
this@Photo, this@Photo,
android.Manifest.permission.READ_EXTERNAL_STORAGE android.Manifest.permission.READ_EXTERNAL_STORAGE
@ -39,7 +35,6 @@ class Photo : AppCompatActivity() {
arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE), arrayOf(android.Manifest.permission.READ_EXTERNAL_STORAGE),
123 123
) )
// TODO: 26.06.2020 Добавить коллбэк
} else { } else {
getPhoto() getPhoto()
} }
@ -69,8 +64,5 @@ class Photo : AppCompatActivity() {
if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED)
getPhoto() getPhoto()
else Toast.makeText(this, "Необходим доступ для показа фото", Toast.LENGTH_SHORT).show() else Toast.makeText(this, "Необходим доступ для показа фото", Toast.LENGTH_SHORT).show()
// super.onRequestPermissionsResult(requestCode, permissions, grantResults)
//
} }
} }