Skip to content

Commit 944fd37

Browse files
yuxitongyuxitong
committed
完整提交适配部分摄像头Camera2的api调用模型V6
1 parent edbe140 commit 944fd37

File tree

95 files changed

+8979
-873
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+8979
-873
lines changed

‎.gitignore

+61-7
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,63 @@
1+
# Built application files
2+
*.apk
3+
*.ap_
4+
5+
# Files for the ART/Dalvik VM
6+
*.dex
7+
8+
# Java class files
9+
*.class
10+
11+
# Generated files
12+
bin/
13+
gen/
14+
out/
15+
16+
# Gradle files
17+
.gradle/
18+
build/
19+
20+
# Local configuration file (sdk path, etc)
21+
local.properties
22+
23+
# Proguard folder generated by Eclipse
24+
proguard/
25+
26+
# Log Files
27+
*.log
28+
29+
# Android Studio Navigation editor temp files
30+
.navigation/
31+
32+
# Android Studio captures folder
33+
captures/
34+
35+
# IntelliJ
136
*.iml
2-
.gradle
3-
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
6-
.DS_Store
7-
/build
8-
/captures
37+
.idea/workspace.xml
38+
.idea/tasks.xml
39+
.idea/gradle.xml
40+
.idea/dictionaries
41+
.idea/libraries
42+
43+
# Keystore files
44+
# Uncomment the following line if you do not want to check your keystore files in.
45+
#*.jks
46+
47+
# External native build folder generated in Android Studio 2.2 and later
948
.externalNativeBuild
49+
50+
# Google Services (e.g. APIs or Firebase)
51+
google-services.json
52+
53+
# Freeline
54+
freeline.py
55+
freeline/
56+
freeline_project_description.json
57+
58+
# fastlane
59+
fastlane/report.xml
60+
fastlane/Preview.html
61+
fastlane/screenshots
62+
fastlane/test_output
63+
fastlane/readme.md

‎.idea/misc.xml

+3-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎README.md

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
本Demo 是为了在android上跑TensorFlow模型的
2+
方便那些想把TensorFlow官网上的demo集成到自己项目里却又找不到头绪的人使用
3+
4+
本项目使用的是Camera2的api
5+
6+
过段时间我还会陆续公布一些更好玩的模型
7+
8+
9+
目前本Demo模型能识别出 抽烟 打电话 闭眼 睁眼

‎README.txt

-9
This file was deleted.

‎app/.gitignore

-1
This file was deleted.

‎app/build.gradle

+39-14
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,61 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 26
5-
buildToolsVersion "27.0.2"
5+
buildToolsVersion "26.0.1"
66
defaultConfig {
7-
applicationId "com.youbanganda"
7+
applicationId "com.tfcamerademo"
88
minSdkVersion 15
99
targetSdkVersion 26
1010
versionCode 1
1111
versionName "1.0"
1212
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
13+
14+
// Remove this block.
15+
jackOptions {
16+
enabled true
17+
}
18+
}
19+
lintOptions {
20+
abortOnError false
1321
}
1422
buildTypes {
1523
release {
1624
minifyEnabled false
1725
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1826
}
1927
}
28+
sourceSets {
29+
main {
30+
jniLibs.srcDirs = ['libs']
31+
}
32+
}
33+
aaptOptions {
34+
noCompress "tflite"
35+
}
36+
2037
compileOptions {
21-
targetCompatibility 1.8
22-
sourceCompatibility 1.8
38+
sourceCompatibility JavaVersion.VERSION_1_8
39+
targetCompatibility JavaVersion.VERSION_1_8
2340
}
2441
}
2542

26-
dependencies {
27-
implementation fileTree(dir: 'libs', include: ['*.jar'])
28-
implementation 'com.android.support:appcompat-v7:26.0.0-beta1'
29-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
30-
testImplementation 'junit:junit:4.12'
31-
androidTestImplementation 'com.android.support.test:runner:0.5'
32-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
33-
34-
35-
compile 'org.tensorflow:tensorflow-android:1.4.0'
43+
repositories {
44+
maven {
45+
url 'https://google.bintray.com/tensorflow'
46+
}
47+
}
3648

49+
dependencies {
50+
compile fileTree(include: ['*.jar'], dir: 'libs')
51+
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
52+
exclude group: 'com.android.support', module: 'support-annotations'
53+
})
54+
compile 'com.android.support:appcompat-v7:25.2.0'
55+
compile 'com.android.support.constraint:constraint-layout:1.0.2'
56+
compile 'com.android.support:design:25.2.0'
57+
compile 'com.android.support:support-annotations:25.3.1'
58+
compile 'com.android.support:support-v13:25.2.0'
59+
// compile 'org.tensorflow:tensorflow-lite:+'
60+
testCompile 'junit:junit:4.12'
61+
compile files('libs/libandroid_tensorflow_inference_java.jar')
3762
}

‎app/libs/armeabi-v7a/benchmark_model

13.6 MB
Binary file not shown.

‎app/src/main/assets/frozen_inference_graph_v1.pb renamed to ‎app/libs/armeabi-v7a/libandroid_tensorflow_lib.lo

21.8 MB
Binary file not shown.

‎app/libs/armeabi-v7a/libtensorflow_demo.so

403 KB
Binary file not shown.

‎app/libs/armeabi-v7a/libtensorflow_inference.so

13.2 MB
Binary file not shown.

‎app/libs/libandroid_tensorflow_inference_java.jar

38.4 KB
Binary file not shown.

‎app/proguard-rules.pro

-21
This file was deleted.

‎app/src/androidTest/java/com/youbanganda/ExampleInstrumentedTest.java

-26
This file was deleted.

‎app/src/main/AndroidManifest.xml

+31-92
Original file line numberDiff line numberDiff line change
@@ -1,105 +1,44 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
Copyright 2014 The Android Open Source Project
4+
5+
Licensed under the Apache License, Version 2.0 (the "License");
6+
you may not use this file except in compliance with the License.
7+
You may obtain a copy of the License at
8+
9+
http://www.apache.org/licenses/LICENSE-2.0
10+
11+
Unless required by applicable law or agreed to in writing, software
12+
distributed under the License is distributed on an "AS IS" BASIS,
13+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
See the License for the specific language governing permissions and
15+
limitations under the License.
16+
-->
17+
218
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
package="com.youbanganda"
5-
>
6-
<!--android:sharedUserId="android.uid.system"-->
7-
<uses-permission android:name="android.permission.INSTALL_PACKAGES"
8-
tools:ignore="ProtectedPermissions" />
9-
<uses-permission android:name="android.permission.SHUTDOWN"
10-
tools:ignore="ProtectedPermissions" />
11-
<!-- Required -->
12-
<permission
13-
android:name="com.youbanganda.permission.JPUSH_MESSAGE"
14-
android:protectionLevel="signature" />
15-
<!-- Required -->
16-
<uses-permission android:name="com.youbanganda.permission.JPUSH_MESSAGE" />
17-
<uses-permission android:name="android.permission.RECEIVE_USER_PRESENT" />
18-
<!-- 用于开启 debug 版本的应用在6.0 系统上 层叠窗口权限 -->
19-
<uses-permission android:name="android.permission.INTERNET" />
20-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
21-
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
22-
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
23-
<uses-permission android:name="android.permission.WAKE_LOCK" />
24-
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
25-
<uses-permission android:name="android.permission.WRITE_SETTINGS" />
26-
<!-- 写系统权限 -->
27-
<uses-permission android:name="android.permission.WRITE_SECURE_SETTINGS"
28-
tools:ignore="ProtectedPermissions" />
29-
<uses-permission android:name="android.permission.MASTER_CLEAR"
30-
tools:ignore="ProtectedPermissions" />
31-
<!-- 恢复出厂设置权限 -->
32-
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
33-
<uses-permission android:name="android.permission.REORDER_TASKS" />
34-
<uses-permission android:name="android.permission.CHANGE_CONFIGURATION" />
35-
<!-- 语言设置权限 -->
36-
<uses-permission android:name="android.permission.SEND_SMS" />
37-
<!-- 发送短信权限 -->
38-
<uses-permission android:name="android.permission.RECEIVE_SMS" />
39-
<!-- 接收短信权限 -->
40-
<uses-permission android:name="android.permission.READ_SMS" />
41-
<!-- 接收短信权限 -->
42-
<uses-permission android:name="android.permission.WRITE_SMS" />
43-
<!-- 接收短信权限 -->
44-
<uses-permission android:name="android.permission.CALL_PHONE" />
45-
<!-- 拨打电话的权限 -->
46-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
47-
<!-- 取得网络状态的权限 -->
48-
<uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
49-
<!-- 取得GSM信号强度权限 -->
50-
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
51-
<!-- 使用GPS权限 -->
52-
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
53-
<!-- 读取本机号码和IMEI权限 -->
54-
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
55-
<!-- 设置WIFI热点的权限 -->
56-
<uses-permission android:name="android.permission.ACCESS_LOCATION_EXTRA_COMMANDS" />
57-
<!-- 发送GPS冷启命令的权限 -->
58-
<uses-permission android:name="android.permission.GET_TASKS" />
59-
<!-- 获取当前活动的activity -->
19+
package="com.tfcamerademo">
20+
6021
<uses-permission android:name="android.permission.CAMERA" />
61-
<!-- 访问照像机的权限 -->
62-
<uses-permission android:name="android.permission.MOUNT_UNMOUNT_FILESYSTEMS" />
63-
<!-- 允许挂载和移除文件系统可移动存储器 -->
6422
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
65-
<!-- 允许写扩展存储器 -->
66-
<uses-permission android:name="android.permission.RECEIVE_MMS" />
67-
<!-- 接收彩信权限 -->
68-
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
69-
<uses-permission android:name="android.permission.SET_TIME_ZONE" />
70-
<!-- 允许设置系统时区 -->
71-
<uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
72-
<uses-permission android:name="android.permission.VIBRATE" />
73-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
74-
<!-- 录制视频/音频权限 -->
23+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
24+
25+
<uses-feature android:name="android.hardware.camera" />
26+
<uses-feature android:name="android.hardware.camera.autofocus" />
7527

76-
<uses-permission android:name="android.permission.REBOOT"
77-
tools:ignore="ProtectedPermissions" />
78-
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
79-
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE"
80-
tools:ignore="ProtectedPermissions" />
81-
<uses-permission android:name="android.permission.DELETE_CACHE_FILES"
82-
tools:ignore="ProtectedPermissions" />
83-
<uses-permission android:name="android.permission.ACCESS_CACHE_FILESYSTEM"
84-
tools:ignore="ProtectedPermissions" />
85-
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
28+
<uses-sdk android:minSdkVersion="21" />
8629

87-
<application
88-
android:allowBackup="true"
89-
android:icon="@mipmap/ic_launcher"
30+
<application android:allowBackup="true"
9031
android:label="@string/app_name"
91-
android:persistent="true"
92-
android:supportsRtl="true"
93-
android:theme="@android:style/Theme.Light.NoTitleBar"
94-
android:largeHeap="true"
95-
tools:node="replace">
96-
<activity android:name=".MainActivity">
32+
android:icon="@drawable/tile"
33+
android:theme="@style/MaterialTheme">
34+
35+
<activity android:name="com.tfcamerademo.CameraActivity"
36+
android:label="@string/app_name">
9737
<intent-filter>
9838
<action android:name="android.intent.action.MAIN" />
99-
10039
<category android:name="android.intent.category.LAUNCHER" />
10140
</intent-filter>
10241
</activity>
10342
</application>
10443

105-
</manifest>
44+
</manifest>

0 commit comments

Comments
 (0)