Skip to content

Commit a9c6ccf

Browse files
Update camera kit library
1 parent dfcdbd0 commit a9c6ccf

File tree

4 files changed

+39
-13
lines changed

4 files changed

+39
-13
lines changed

app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@
1717
apply plugin: 'com.android.application'
1818

1919
android {
20-
compileSdkVersion 25
21-
buildToolsVersion "25.0.2"
20+
compileSdkVersion 27
21+
buildToolsVersion "25.0.3"
2222
defaultConfig {
2323
applicationId "com.mindorks.tensorflowexample"
2424
minSdkVersion 16
25-
targetSdkVersion 25
25+
targetSdkVersion 27
2626
versionCode 1
2727
versionName "1.0"
2828
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -40,8 +40,8 @@ dependencies {
4040
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
4141
exclude group: 'com.android.support', module: 'support-annotations'
4242
})
43-
compile 'com.android.support:appcompat-v7:25.1.1'
43+
compile 'com.android.support:appcompat-v7:27.0.2'
4444
testCompile 'junit:junit:4.12'
4545
compile files('libs/libandroid_tensorflow_inference_java.jar')
46-
compile 'com.flurgle:camerakit:0.9.13'
46+
compile 'com.wonderkiln:camerakit:0.13.1'
4747
}

app/src/main/java/com/mindorks/tensorflowexample/MainActivity.java

+25-7
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
package com.mindorks.tensorflowexample;
1818

1919
import android.graphics.Bitmap;
20-
import android.graphics.BitmapFactory;
2120
import android.os.Bundle;
2221
import android.support.v7.app.AppCompatActivity;
2322
import android.text.method.ScrollingMovementMethod;
@@ -26,8 +25,12 @@
2625
import android.widget.ImageView;
2726
import android.widget.TextView;
2827

29-
import com.flurgle.camerakit.CameraListener;
30-
import com.flurgle.camerakit.CameraView;
28+
import com.wonderkiln.camerakit.CameraKitError;
29+
import com.wonderkiln.camerakit.CameraKitEvent;
30+
import com.wonderkiln.camerakit.CameraKitEventListener;
31+
import com.wonderkiln.camerakit.CameraKitImage;
32+
import com.wonderkiln.camerakit.CameraKitVideo;
33+
import com.wonderkiln.camerakit.CameraView;
3134

3235
import java.util.List;
3336
import java.util.concurrent.Executor;
@@ -64,12 +67,21 @@ protected void onCreate(Bundle savedInstanceState) {
6467
btnToggleCamera = (Button) findViewById(R.id.btnToggleCamera);
6568
btnDetectObject = (Button) findViewById(R.id.btnDetectObject);
6669

67-
cameraView.setCameraListener(new CameraListener() {
70+
cameraView.addCameraKitListener(new CameraKitEventListener() {
6871
@Override
69-
public void onPictureTaken(byte[] picture) {
70-
super.onPictureTaken(picture);
72+
public void onEvent(CameraKitEvent cameraKitEvent) {
7173

72-
Bitmap bitmap = BitmapFactory.decodeByteArray(picture, 0, picture.length);
74+
}
75+
76+
@Override
77+
public void onError(CameraKitError cameraKitError) {
78+
79+
}
80+
81+
@Override
82+
public void onImage(CameraKitImage cameraKitImage) {
83+
84+
Bitmap bitmap = cameraKitImage.getBitmap();
7385

7486
bitmap = Bitmap.createScaledBitmap(bitmap, INPUT_SIZE, INPUT_SIZE, false);
7587

@@ -78,6 +90,12 @@ public void onPictureTaken(byte[] picture) {
7890
final List<Classifier.Recognition> results = classifier.recognizeImage(bitmap);
7991

8092
textViewResult.setText(results.toString());
93+
94+
}
95+
96+
@Override
97+
public void onVideo(CameraKitVideo cameraKitVideo) {
98+
8199
}
82100
});
83101

app/src/main/res/layout/activity_main.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:paddingTop="@dimen/activity_vertical_margin"
2626
tools:context="com.mindorks.tensorflowexample.MainActivity">
2727

28-
<com.flurgle.camerakit.CameraView
28+
<com.wonderkiln.camerakit.CameraView
2929
android:id="@+id/cameraView"
3030
android:layout_width="300dp"
3131
android:layout_height="300dp"

build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
buildscript {
2020
repositories {
2121
jcenter()
22+
maven {
23+
url 'https://maven.google.com/'
24+
name 'Google'
25+
}
2226
}
2327
dependencies {
2428
classpath 'com.android.tools.build:gradle:2.2.0'
@@ -31,6 +35,10 @@ buildscript {
3135
allprojects {
3236
repositories {
3337
jcenter()
38+
maven {
39+
url 'https://maven.google.com/'
40+
name 'Google'
41+
}
3442
}
3543
}
3644

0 commit comments

Comments
 (0)