Merge remote-tracking branch 'origin/master'

This commit is contained in:
2025-10-16 13:35:06 +08:00
4 changed files with 9 additions and 0 deletions
+3
View File
@@ -108,4 +108,7 @@ dependencies {
implementation(libs.core) implementation(libs.core)
implementation(libs.android.core) implementation(libs.android.core)
implementation (libs.pytorch.android)
implementation (libs.pytorch.android.torchvision)
} }
@@ -392,5 +392,6 @@ class MainActivity : BaseActivity<ActivityMainBinding>() {
SensorScaleUtils.closeScale() SensorScaleUtils.closeScale()
presentation?.dismiss() presentation?.dismiss()
super.onDestroy() super.onDestroy()
shutdownCamera()
} }
} }
BIN
View File
Binary file not shown.
+5
View File
@@ -26,6 +26,8 @@ fragmentKtx = "1.5.6"
lifecycleViewmodelKtx = "2.8.3" lifecycleViewmodelKtx = "2.8.3"
lifecycleRuntimeKtx = "2.8.3" lifecycleRuntimeKtx = "2.8.3"
pytorch="1.13.0"
[libraries] [libraries]
android-core = { module = "com.google.zxing:android-core", version.ref = "androidCore" } android-core = { module = "com.google.zxing:android-core", version.ref = "androidCore" }
core = { module = "com.google.zxing:core", version.ref = "core" } core = { module = "com.google.zxing:core", version.ref = "core" }
@@ -62,6 +64,9 @@ androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref
androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" } androidx-lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycleRuntimeKtx" }
androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" } androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
pytorch-android={ group = "org.pytorch", name = "pytorch_android", version.ref = "pytorch" }
pytorch-android-torchvision={ group = "org.pytorch", name = "pytorch_android_torchvision", version.ref = "pytorch" }
[plugins] [plugins]
android-application = { id = "com.android.application", version.ref = "agp" } android-application = { id = "com.android.application", version.ref = "agp" }
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }