OSDN > Finden Software > GOKIGEN > SCM > git > A01f > Commit

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
A01f
prpr1

A01f: Commit

Andoroid用オブジェクト検出アプリ

ライブラリ、オブジェクトのモデルを更新。

--- a/.idea/deploymentTargetDropDown.xml

+++ /dev/null

		@@ -1,17 +0,0 @@
1		-<?xml version="1.0" encoding="UTF-8"?>
2		-<project version="4">
3		- <component name="deploymentTargetDropDown">
4		- <runningDeviceTargetSelectedWithDropDown>
5		- <Target>
6		- <type value="RUNNING_DEVICE_TARGET" />
7		- <deviceKey>
8		- <Key>
9		- <type value="SERIAL_NUMBER" />
10		- <value value="3e50111c1220" />
11		- </Key>
12		- </deviceKey>
13		- </Target>
14		- </runningDeviceTargetSelectedWithDropDown>
15		- <timeTargetWasSelectedWithDropDown value="2022-05-15T13:38:10.363224900Z" />
16		- </component>
17		-</project>
		\ No newline at end of file

--- a/app/build.gradle

+++ b/app/build.gradle

		@@ -4,12 +4,12 @@ plugins {
4	4	}
5	5
6	6	// ----- for Jetpack Compose
7		-def compose_version = '1.2.0-beta01'
8		-def navigation_version = '2.5.0-rc01'
	7	+def compose_version = '1.2.0-rc02'
	8	+def navigation_version = '2.5.0-rc02'
9	9
10	10	// ----- for cameraX
11		-def camerax_version = "1.1.0-beta03"
12		-def camerax_view_version = "1.1.0-beta03"
	11	+def camerax_version = "1.2.0-alpha02"
	12	+def camerax_view_version = "1.2.0-alpha02"
13	13
14	14	android {
15	15	compileSdk 32

		@@ -18,8 +18,8 @@ android {
18	18	applicationId "net.osdn.gokigen.objectdetection.a01f"
19	19	minSdk 21
20	20	targetSdk 32
21		- versionCode 80000
22		- versionName "0.8.0"
	21	+ versionCode 80001
	22	+ versionName "0.8.1"
23	23	}
24	24
25	25	buildTypes {

		@@ -28,9 +28,6 @@ android {
28	28	proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
29	29	}
30	30	}
31		- aaptOptions {
32		- noCompress "tflite"
33		- }
34	31	compileOptions {
35	32	sourceCompatibility JavaVersion.VERSION_1_8
36	33	targetCompatibility JavaVersion.VERSION_1_8

		@@ -49,18 +46,21 @@ android {
49	46	excludes += '/META-INF/{AL2.0,LGPL2.1}'
50	47	}
51	48	}
	49	+ androidResources {
	50	+ noCompress 'tflite'
	51	+ }
52	52	}
53	53
54	54	dependencies {
55	55
56		- implementation 'androidx.core:core-ktx:1.7.0'
57		- implementation 'androidx.appcompat:appcompat:1.4.1'
58		- implementation 'androidx.activity:activity-ktx:1.6.0-alpha03'
	56	+ implementation 'androidx.core:core-ktx:1.8.0'
	57	+ implementation 'androidx.appcompat:appcompat:1.4.2'
	58	+ implementation 'androidx.activity:activity-ktx:1.6.0-alpha05'
59	59
60		- implementation "androidx.core:core-splashscreen:1.0.0-beta02"
	60	+ implementation "androidx.core:core-splashscreen:1.0.0-rc01"
61	61
62		- implementation 'com.google.android.material:material:1.6.0'
63		- implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
	62	+ implementation 'com.google.android.material:material:1.6.1'
	63	+ implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
64	64
65	65	implementation 'androidx.preference:preference-ktx:1.2.0'
66	66	implementation 'androidx.exifinterface:exifinterface:1.3.3'

Binary files a/app/src/main/assets/aohina-model0-5.tflite and /dev/null differ

Binary files /dev/null and b/app/src/main/assets/aohina-model0_11.tflite differ

--- a/app/src/main/java/net/osdn/gokigen/objectdetection/a01f/tflite/ObjectDetectionModelReader.kt

+++ b/app/src/main/java/net/osdn/gokigen/objectdetection/a01f/tflite/ObjectDetectionModelReader.kt

		@@ -275,7 +275,7 @@ class ObjectDetectionModelReader(private val activity: AppCompatActivity, privat
275	275
276	276	companion object
277	277	{
278		- private const val TFLITE_OBJECT_FILE = "aohina-model0-5.tflite"
	278	+ private const val TFLITE_OBJECT_FILE = "aohina-model0_11.tflite"
279	279	private val TAG = ObjectDetectionModelReader::class.java.simpleName
280	280	}
281	281	}

--- a/build.gradle

+++ b/build.gradle

		@@ -1,7 +1,7 @@
1	1	// Top-level build file where you can add configuration options common to all sub-projects/modules.
2	2	plugins {
3		- id 'com.android.application' version '7.2.0' apply false
4		- id 'com.android.library' version '7.2.0' apply false
	3	+ id 'com.android.application' version '7.2.1' apply false
	4	+ id 'com.android.library' version '7.2.1' apply false
5	5	id 'org.jetbrains.kotlin.android' version '1.6.21' apply false
6	6	}
7	7