Fix camera black screen/bufferqueue abandonment and bump to v23.01.63
This commit is contained in:
1 parent
23c1e3c78f
commit
a9c689185a
11 files changed
+76
-50
No files matched your search
@@ -46,3 +46,5 @@
|
|||||||
4 34 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
4 34 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
||||||
5 37 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
5 37 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
||||||
6 42 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
6 42 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
||||||
|
4 42 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
||||||
|
3 29 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/arm64-v8a/CMakeFiles/cmake.verify_globs 5250f1b80cb55465
|
||||||
@@ -2,41 +2,41 @@ C/C++ Structured Logg
|
|||||||
e
|
e
|
||||||
cC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\additional_project_files.txtC
|
cC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\additional_project_files.txtC
|
||||||
A
|
A
|
||||||
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint „¿Öü‚4Å, Üû—ö‚4d
|
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint Áû·þ‚4Å, Üû—ö‚4d
|
||||||
b
|
b
|
||||||
`C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\android_gradle_build.json „¿Öü‚4û" Þû—ö‚4i
|
`C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\android_gradle_build.json Áû·þ‚4û" Þû—ö‚4i
|
||||||
g
|
g
|
||||||
eC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\android_gradle_build_mini.json „¿Öü‚4ï —ü—ö‚4V
|
eC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\android_gradle_build_mini.json Áû·þ‚4ï —ü—ö‚4V
|
||||||
T
|
T
|
||||||
RC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\build.ninja „¿Öü‚4œÞ Íø—ö‚4Z
|
RC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\build.ninja Áû·þ‚4œÞ Íø—ö‚4Z
|
||||||
X
|
X
|
||||||
VC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\build.ninja.txt „¿Öü‚4_
|
VC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\build.ninja.txt Áû·þ‚4_
|
||||||
]
|
]
|
||||||
[C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\build_file_index.txt …¿Öü‚4� ™ü—ö‚4`
|
[C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\build_file_index.txt Áû·þ‚4� ™ü—ö‚4`
|
||||||
^
|
^
|
||||||
\C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\compile_commands.json …¿Öü‚4‘Ø Ëø—ö‚4d
|
\C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\compile_commands.json Áû·þ‚4‘Ø Ëø—ö‚4d
|
||||||
b
|
b
|
||||||
`C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\compile_commands.json.bin …¿Öü‚4 Ê„ Ëø—ö‚4j
|
`C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\compile_commands.json.bin Áû·þ‚4 Ê„ Ëø—ö‚4j
|
||||||
h
|
h
|
||||||
fC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\metadata_generation_command.txt …¿Öü‚4
|
fC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\metadata_generation_command.txt Áû·þ‚4
|
||||||
¸ ˜ü—ö‚4]
|
¸ ˜ü—ö‚4]
|
||||||
[
|
[
|
||||||
YC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\prefab_config.json …¿Öü‚4€ ˜ü—ö‚4b
|
YC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\prefab_config.json Áû·þ‚4€ ˜ü—ö‚4b
|
||||||
`
|
`
|
||||||
^C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\symbol_folder_index.txt …¿Öü‚4␍] ˜ü—ö‚4{
|
^C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\arm64-v8a\symbol_folder_index.txt Áû·þ‚4␍] ˜ü—ö‚4{
|
||||||
y
|
y
|
||||||
wC:\GitHub\Schnappix\node_modules\react-native-gesture-handler\android\build\generated\source\codegen\jni\CMakeLists.txt …¿Öü‚4␍¾ ‡•‚ö‚4v
|
wC:\GitHub\Schnappix\node_modules\react-native-gesture-handler\android\build\generated\source\codegen\jni\CMakeLists.txt Áû·þ‚4␍¾ ‡•‚ö‚4v
|
||||||
t
|
t
|
||||||
rC:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\generated\source\codegen\jni\CMakeLists.txt …¿Öü‚4ö ’•‚ö‚4µ
|
rC:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\generated\source\codegen\jni\CMakeLists.txt Áû·þ‚4ö ’•‚ö‚4µ
|
||||||
²
|
²
|
||||||
¯C:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json …¿Öü‚4Y
|
¯C:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json Áû·þ‚4Y
|
||||||
W
|
W
|
||||||
UC:\GitHub\Schnappix\node_modules\react-native-svg\android\src\main\jni\CMakeLists.txt …¿Öü‚4½ œ§ØÖç3u
|
UC:\GitHub\Schnappix\node_modules\react-native-svg\android\src\main\jni\CMakeLists.txt Áû·þ‚4½ œ§ØÖç3u
|
||||||
s
|
s
|
||||||
qC:\GitHub\Schnappix\node_modules\react-native-view-shot\android\build\generated\source\codegen\jni\CMakeLists.txt …¿Öü‚4ê û”‚ö‚4t
|
qC:\GitHub\Schnappix\node_modules\react-native-view-shot\android\build\generated\source\codegen\jni\CMakeLists.txt Áû·þ‚4ê û”‚ö‚4t
|
||||||
r
|
r
|
||||||
pC:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\generated\source\codegen\jni\CMakeLists.txt …¿Öü‚4ê Ÿ•‚ö‚4³
|
pC:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\generated\source\codegen\jni\CMakeLists.txt Áû·þ‚4ê Ÿ•‚ö‚4³
|
||||||
°
|
°
|
||||||
C:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json …¿Öü‚4k
|
C:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json Áû·þ‚4k
|
||||||
i
|
i
|
||||||
gC:\GitHub\Schnappix\node_modules\react-native\ReactAndroid\cmake-utils\default-app-setup\CMakeLists.txt …¿Öü‚4ð ®¡ÈÑç3
|
gC:\GitHub\Schnappix\node_modules\react-native\ReactAndroid\cmake-utils\default-app-setup\CMakeLists.txt Áû·þ‚4ð ®¡ÈÑç3
|
||||||
@@ -46,3 +46,5 @@
|
|||||||
3 26 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
3 26 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
||||||
3 35 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
3 35 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
||||||
3 28 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
3 28 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
||||||
|
5 33 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
||||||
|
4 36 0 C:/GitHub/Schnappix/android/app/.cxx/RelWithDebInfo/3x5j4n2e/armeabi-v7a/CMakeFiles/cmake.verify_globs 1eb2d1da6ebc2e74
|
||||||
@@ -2,41 +2,41 @@ C/C++ Structured Logi
|
|||||||
g
|
g
|
||||||
eC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\additional_project_files.txtC
|
eC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\additional_project_files.txtC
|
||||||
A
|
A
|
||||||
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint ÔÀÖü‚4ý, Óì™ö‚4f
|
?com.android.build.gradle.internal.cxx.io.EncodedFileFingerPrint ôü·þ‚4ý, Óì™ö‚4f
|
||||||
d
|
d
|
||||||
bC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\android_gradle_build.json ÔÀÖü‚4�# Øì™ö‚4k
|
bC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\android_gradle_build.json ôü·þ‚4�# Øì™ö‚4k
|
||||||
i
|
i
|
||||||
gC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\android_gradle_build_mini.json ÔÀÖü‚4‘ ˆí™ö‚4X
|
gC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\android_gradle_build_mini.json ôü·þ‚4‘ ˆí™ö‚4X
|
||||||
V
|
V
|
||||||
TC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\build.ninja ÔÀÖü‚4Áå é™ö‚4\
|
TC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\build.ninja ôü·þ‚4Áå é™ö‚4\
|
||||||
Z
|
Z
|
||||||
XC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\build.ninja.txt ÔÀÖü‚4a
|
XC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\build.ninja.txt ôü·þ‚4a
|
||||||
_
|
_
|
||||||
]C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\build_file_index.txt ÔÀÖü‚4� �í™ö‚4b
|
]C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\build_file_index.txt ôü·þ‚4� �í™ö‚4b
|
||||||
`
|
`
|
||||||
^C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\compile_commands.json ÔÀÖü‚4´à žé™ö‚4f
|
^C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\compile_commands.json ôü·þ‚4´à žé™ö‚4f
|
||||||
d
|
d
|
||||||
bC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\compile_commands.json.bin ÔÀÖü‚4 ò„ žé™ö‚4l
|
bC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\compile_commands.json.bin ôü·þ‚4 ò„ žé™ö‚4l
|
||||||
j
|
j
|
||||||
hC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\metadata_generation_command.txt ÔÀÖü‚4
|
hC:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\metadata_generation_command.txt ôü·þ‚4
|
||||||
Ä Ší™ö‚4_
|
Ä Ší™ö‚4_
|
||||||
]
|
]
|
||||||
[C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\prefab_config.json ÔÀÖü‚4€ ‹í™ö‚4d
|
[C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\prefab_config.json ôü·þ‚4€ ‹í™ö‚4d
|
||||||
b
|
b
|
||||||
`C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\symbol_folder_index.txt ÔÀÖü‚4␍_ Œí™ö‚4{
|
`C:\GitHub\Schnappix\android\app\.cxx\RelWithDebInfo\3x5j4n2e\armeabi-v7a\symbol_folder_index.txt ôü·þ‚4␍_ Œí™ö‚4{
|
||||||
y
|
y
|
||||||
wC:\GitHub\Schnappix\node_modules\react-native-gesture-handler\android\build\generated\source\codegen\jni\CMakeLists.txt ÔÀÖü‚4␍¾ ‡•‚ö‚4v
|
wC:\GitHub\Schnappix\node_modules\react-native-gesture-handler\android\build\generated\source\codegen\jni\CMakeLists.txt ôü·þ‚4␍¾ ‡•‚ö‚4v
|
||||||
t
|
t
|
||||||
rC:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\generated\source\codegen\jni\CMakeLists.txt ÔÀÖü‚4ö ’•‚ö‚4µ
|
rC:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\generated\source\codegen\jni\CMakeLists.txt ôü·þ‚4ö ’•‚ö‚4µ
|
||||||
²
|
²
|
||||||
¯C:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json ÔÀÖü‚4Y
|
¯C:\GitHub\Schnappix\node_modules\react-native-reanimated\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json ôü·þ‚4Y
|
||||||
W
|
W
|
||||||
UC:\GitHub\Schnappix\node_modules\react-native-svg\android\src\main\jni\CMakeLists.txt ÔÀÖü‚4½ œ§ØÖç3u
|
UC:\GitHub\Schnappix\node_modules\react-native-svg\android\src\main\jni\CMakeLists.txt ôü·þ‚4½ œ§ØÖç3u
|
||||||
s
|
s
|
||||||
qC:\GitHub\Schnappix\node_modules\react-native-view-shot\android\build\generated\source\codegen\jni\CMakeLists.txt ÔÀÖü‚4ê û”‚ö‚4t
|
qC:\GitHub\Schnappix\node_modules\react-native-view-shot\android\build\generated\source\codegen\jni\CMakeLists.txt ôü·þ‚4ê û”‚ö‚4t
|
||||||
r
|
r
|
||||||
pC:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\generated\source\codegen\jni\CMakeLists.txt ÔÀÖü‚4ê Ÿ•‚ö‚4³
|
pC:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\generated\source\codegen\jni\CMakeLists.txt ôü·þ‚4ê Ÿ•‚ö‚4³
|
||||||
°
|
°
|
||||||
C:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json ÔÀÖü‚4k
|
C:\GitHub\Schnappix\node_modules\react-native-worklets\android\build\intermediates\prefab_package_configuration\release\prefabReleaseConfigurePackage\prefab_publication.json ôü·þ‚4k
|
||||||
i
|
i
|
||||||
gC:\GitHub\Schnappix\node_modules\react-native\ReactAndroid\cmake-utils\default-app-setup\CMakeLists.txt ÔÀÖü‚4ð ®¡ÈÑç3
|
gC:\GitHub\Schnappix\node_modules\react-native\ReactAndroid\cmake-utils\default-app-setup\CMakeLists.txt ôü·þ‚4ð ®¡ÈÑç3
|
||||||
@@ -92,8 +92,8 @@ android {
|
|||||||
applicationId 'de.orfel.schnappix'
|
applicationId 'de.orfel.schnappix'
|
||||||
minSdkVersion rootProject.ext.minSdkVersion
|
minSdkVersion rootProject.ext.minSdkVersion
|
||||||
targetSdkVersion rootProject.ext.targetSdkVersion
|
targetSdkVersion rootProject.ext.targetSdkVersion
|
||||||
versionCode 62
|
versionCode 63
|
||||||
versionName "23.01.62"
|
versionName "23.01.63"
|
||||||
|
|
||||||
buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
|
buildConfigField "String", "REACT_NATIVE_RELEASE_LEVEL", "\"${findProperty('reactNativeReleaseLevel') ?: 'stable'}\""
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -3,7 +3,7 @@
|
|||||||
"newArchEnabled": true,
|
"newArchEnabled": true,
|
||||||
"name": "Schnappix",
|
"name": "Schnappix",
|
||||||
"slug": "Schnappix",
|
"slug": "Schnappix",
|
||||||
"version": "23.01.62",
|
"version": "23.01.63",
|
||||||
"orientation": "landscape",
|
"orientation": "landscape",
|
||||||
"icon": "./Icon.png",
|
"icon": "./Icon.png",
|
||||||
"userInterfaceStyle": "dark",
|
"userInterfaceStyle": "dark",
|
||||||
@@ -13,7 +13,7 @@
|
|||||||
},
|
},
|
||||||
"android": {
|
"android": {
|
||||||
"package": "de.orfel.schnappix",
|
"package": "de.orfel.schnappix",
|
||||||
"versionCode": 62,
|
"versionCode": 63,
|
||||||
"usesCleartextTraffic": true,
|
"usesCleartextTraffic": true,
|
||||||
"adaptiveIcon": {
|
"adaptiveIcon": {
|
||||||
"backgroundColor": "#050510",
|
"backgroundColor": "#050510",
|
||||||
|
|||||||
@@ -106,15 +106,17 @@ class UsbCameraView(context: Context, appContext: AppContext) : ExpoView(context
|
|||||||
|
|
||||||
private var permissionReceiver: android.content.BroadcastReceiver? = null
|
private var permissionReceiver: android.content.BroadcastReceiver? = null
|
||||||
private var registeredContext: Context? = null
|
private var registeredContext: Context? = null
|
||||||
|
private var safeContext: UsbContextWrapperJava? = null
|
||||||
|
|
||||||
init {
|
init {
|
||||||
val activityContext = appContext.currentActivity ?: context
|
val activityContext = appContext.currentActivity ?: context
|
||||||
if (activityContext !is androidx.lifecycle.LifecycleOwner) {
|
if (activityContext !is androidx.lifecycle.LifecycleOwner) {
|
||||||
throw IllegalStateException("Cannot initialize UsbCameraView because activityContext is not a LifecycleOwner!")
|
throw IllegalStateException("Cannot initialize UsbCameraView because activityContext is not a LifecycleOwner!")
|
||||||
}
|
}
|
||||||
val safeContext = UsbContextWrapperJava(activityContext)
|
val safeContextVal = UsbContextWrapperJava(activityContext)
|
||||||
|
safeContext = safeContextVal
|
||||||
|
|
||||||
textureView = AspectRatioTextureView(safeContext)
|
textureView = AspectRatioTextureView(safeContextVal)
|
||||||
addView(textureView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
|
addView(textureView, LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT))
|
||||||
|
|
||||||
try {
|
try {
|
||||||
@@ -173,8 +175,8 @@ class UsbCameraView(context: Context, appContext: AppContext) : ExpoView(context
|
|||||||
activityContext.registerReceiver(permissionReceiver, filter)
|
activityContext.registerReceiver(permissionReceiver, filter)
|
||||||
}
|
}
|
||||||
|
|
||||||
cameraClient = CameraClient.newBuilder(safeContext)
|
cameraClient = CameraClient.newBuilder(safeContextVal)
|
||||||
.setCameraStrategy(CameraUvcStrategy(safeContext))
|
.setCameraStrategy(CameraUvcStrategy(safeContextVal))
|
||||||
.setCameraRequest(cameraRequest)
|
.setCameraRequest(cameraRequest)
|
||||||
.setEnableGLES(false)
|
.setEnableGLES(false)
|
||||||
.build()
|
.build()
|
||||||
@@ -277,5 +279,12 @@ class UsbCameraView(context: Context, appContext: AppContext) : ExpoView(context
|
|||||||
e.printStackTrace()
|
e.printStackTrace()
|
||||||
}
|
}
|
||||||
cameraClient = null
|
cameraClient = null
|
||||||
|
|
||||||
|
try {
|
||||||
|
safeContext?.destroy()
|
||||||
|
} catch (e: Exception) {
|
||||||
|
e.printStackTrace()
|
||||||
|
}
|
||||||
|
safeContext = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+13
-3
@@ -10,18 +10,28 @@ import android.os.Build;
|
|||||||
import android.os.Handler;
|
import android.os.Handler;
|
||||||
import androidx.lifecycle.Lifecycle;
|
import androidx.lifecycle.Lifecycle;
|
||||||
import androidx.lifecycle.LifecycleOwner;
|
import androidx.lifecycle.LifecycleOwner;
|
||||||
|
import androidx.lifecycle.LifecycleRegistry;
|
||||||
|
|
||||||
public class UsbContextWrapperJava extends ContextWrapper implements LifecycleOwner {
|
public class UsbContextWrapperJava extends ContextWrapper implements LifecycleOwner {
|
||||||
private final LifecycleOwner mLifecycleOwner;
|
private final LifecycleRegistry mLifecycleRegistry;
|
||||||
|
|
||||||
public UsbContextWrapperJava(Context base) {
|
public UsbContextWrapperJava(Context base) {
|
||||||
super(base);
|
super(base);
|
||||||
this.mLifecycleOwner = (LifecycleOwner) base;
|
this.mLifecycleRegistry = new LifecycleRegistry(this);
|
||||||
|
this.mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_CREATE);
|
||||||
|
this.mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_START);
|
||||||
|
this.mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_RESUME);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Lifecycle getLifecycle() {
|
public Lifecycle getLifecycle() {
|
||||||
return mLifecycleOwner.getLifecycle();
|
return mLifecycleRegistry;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void destroy() {
|
||||||
|
this.mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_PAUSE);
|
||||||
|
this.mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_STOP);
|
||||||
|
this.mLifecycleRegistry.handleLifecycleEvent(Lifecycle.Event.ON_DESTROY);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "schnappix",
|
"name": "schnappix",
|
||||||
"version": "23.01.62",
|
"version": "23.01.63",
|
||||||
"main": "index.ts",
|
"main": "index.ts",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@fortawesome/fontawesome-svg-core": "^6.7.2",
|
"@fortawesome/fontawesome-svg-core": "^6.7.2",
|
||||||
|
|||||||
Reference in new issue
Block a user