forked from androidthings/doorbell
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- update placeholder image + timestamp to firebase - use cloudvisionutils to annotate image Change-Id: I35b4c6b599f014dc13aba0ac51cce9dbaa90fdf5 TODO: add camera capture (currently broken on jaqen)
- Loading branch information
0 parents
commit 534edd5
Showing
16 changed files
with
643 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
*.iml | ||
.gradle | ||
local.properties | ||
.idea | ||
.DS_Store | ||
build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
Brillo empty sample template | ||
===================================== | ||
|
||
Use this empty project as a template for your Brillo 2 project. | ||
|
||
|
||
Pre-requisites | ||
-------------- | ||
|
||
- Intel Edison | ||
- Brillo 2.0 | ||
- ... | ||
|
||
Schematics | ||
---------- | ||
|
||
 | ||
|
||
License | ||
------- | ||
|
||
Copyright 2016 The Android Open Source Project, Inc. | ||
|
||
Licensed to the Apache Software Foundation (ASF) under one or more contributor | ||
license agreements. See the NOTICE file distributed with this work for | ||
additional information regarding copyright ownership. The ASF licenses this | ||
file to you under the Apache License, Version 2.0 (the "License"); you may not | ||
use this file except in compliance with the License. You may obtain a copy of | ||
the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
License for the specific language governing permissions and limitations under | ||
the License. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
apply plugin: 'com.android.application' | ||
|
||
android { | ||
compileSdkVersion 24 | ||
buildToolsVersion '24.0.0' | ||
|
||
defaultConfig { | ||
applicationId "com.google.samples.mysample" | ||
minSdkVersion 21 | ||
targetSdkVersion 24 | ||
versionCode 1 | ||
versionName "1.0" | ||
jackOptions { | ||
enabled true | ||
} | ||
} | ||
buildTypes { | ||
debug { | ||
multiDexEnabled true | ||
} | ||
release { | ||
multiDexEnabled true | ||
minifyEnabled false | ||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
} | ||
} | ||
compileOptions { | ||
sourceCompatibility JavaVersion.VERSION_1_8 | ||
targetCompatibility JavaVersion.VERSION_1_8 | ||
} | ||
} | ||
|
||
dependencies { | ||
compile 'com.google.brillo:brillo-sdk:0.3' | ||
compile 'com.google.firebase:firebase-core:9.4.0' | ||
compile 'com.google.firebase:firebase-database:9.4.0' | ||
compile 'com.google.apis:google-api-services-vision:v1-rev22-1.22.0' | ||
compile 'com.google.api-client:google-api-client-android:1.22.0' exclude module: 'httpclient' | ||
compile 'com.google.http-client:google-http-client-gson:1.22.0' exclude module: 'httpclient' | ||
} | ||
|
||
apply plugin: 'com.google.gms.google-services' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
{ | ||
"project_info": { | ||
"project_number": "119965653790", | ||
"firebase_url": "https://brillo-doorbell.firebaseio.com", | ||
"project_id": "brillo-doorbell", | ||
"storage_bucket": "brillo-doorbell.appspot.com" | ||
}, | ||
"client": [ | ||
{ | ||
"client_info": { | ||
"mobilesdk_app_id": "1:119965653790:android:7b48594571f1620a", | ||
"android_client_info": { | ||
"package_name": "com.google.samples.mysample" | ||
} | ||
}, | ||
"oauth_client": [ | ||
{ | ||
"client_id": "119965653790-5leom7thdtl49tt9u8m3u75tmofn6d86.apps.googleusercontent.com", | ||
"client_type": 3 | ||
} | ||
], | ||
"api_key": [ | ||
{ | ||
"current_key": "AIzaSyCBVWcsGMeaYkRwQMmKaVF6lCtn3l3D1A8" | ||
} | ||
], | ||
"services": { | ||
"analytics_service": { | ||
"status": 1 | ||
}, | ||
"appinvite_service": { | ||
"status": 1, | ||
"other_platform_oauth_client": [] | ||
}, | ||
"ads_service": { | ||
"status": 2 | ||
} | ||
} | ||
} | ||
], | ||
"configuration_version": "1" | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
# Add project specific ProGuard rules here. | ||
# By default, the flags in this file are appended to flags specified | ||
# in /usr/local/google/home/stammt/Android/Sdk/tools/proguard/proguard-android.txt | ||
# You can edit the include path and order by changing the proguardFiles | ||
# directive in build.gradle. | ||
# | ||
# For more details, see | ||
# http://developer.android.com/guide/developing/tools/proguard.html | ||
|
||
# Add any project specific keep options here: | ||
|
||
# If your project uses WebView with JS, uncomment the following | ||
# and specify the fully qualified class name to the JavaScript interface | ||
# class: | ||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview { | ||
# public *; | ||
#} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
package="com.google.samples.mysample"> | ||
<uses-permission android:name="android.permission.CAMERA"/> | ||
<uses-permission android:name="android.permission.INTERNET"/> | ||
<application | ||
android:allowBackup="true" | ||
android:icon="@android:drawable/sym_def_app_icon" | ||
android:label="@string/app_name"> | ||
<service | ||
android:name="com.google.samples.mysample.MyHomeService" | ||
android:exported="true"> | ||
<intent-filter> | ||
<action android:name="android.service.headless.HomeService" /> | ||
<category android:name="android.intent.category.DEFAULT" /> | ||
</intent-filter> | ||
</service> | ||
|
||
</application> | ||
|
||
|
||
</manifest> |
95 changes: 95 additions & 0 deletions
95
app/src/main/java/com/google/samples/mysample/CloudVisionUtils.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,95 @@ | ||
package com.google.samples.mysample; | ||
|
||
import android.os.AsyncTask; | ||
import android.util.Log; | ||
|
||
import com.google.api.client.extensions.android.http.AndroidHttp; | ||
import com.google.api.client.googleapis.json.GoogleJsonResponseException; | ||
import com.google.api.client.http.HttpTransport; | ||
import com.google.api.client.json.JsonFactory; | ||
import com.google.api.client.json.gson.GsonFactory; | ||
import com.google.api.services.vision.v1.Vision; | ||
import com.google.api.services.vision.v1.VisionRequestInitializer; | ||
import com.google.api.services.vision.v1.model.AnnotateImageRequest; | ||
import com.google.api.services.vision.v1.model.BatchAnnotateImagesRequest; | ||
import com.google.api.services.vision.v1.model.BatchAnnotateImagesResponse; | ||
import com.google.api.services.vision.v1.model.EntityAnnotation; | ||
import com.google.api.services.vision.v1.model.Feature; | ||
import com.google.api.services.vision.v1.model.Image; | ||
|
||
import java.io.IOException; | ||
import java.util.ArrayList; | ||
import java.util.HashMap; | ||
import java.util.List; | ||
import java.util.Map; | ||
|
||
public class CloudVisionUtils { | ||
|
||
public static final String TAG = "CloudVisionUtils"; | ||
private static final String CLOUD_VISION_API_KEY = "AIzaSyAEW9mLKZKnN-0GSXSeDBaSEQwNo-8ljQg"; | ||
|
||
public static Image createImage(byte[] imageBytes) { | ||
Image image = new Image(); | ||
image.encodeContent(imageBytes); | ||
return image; | ||
} | ||
|
||
public static Map<String, Float> annotateImage(Image image) { | ||
try { | ||
HttpTransport httpTransport = AndroidHttp.newCompatibleTransport(); | ||
JsonFactory jsonFactory = GsonFactory.getDefaultInstance(); | ||
|
||
Vision vision = new Vision.Builder(httpTransport, jsonFactory, null) | ||
.setVisionRequestInitializer( | ||
new VisionRequestInitializer(CLOUD_VISION_API_KEY)) | ||
.build(); | ||
|
||
BatchAnnotateImagesRequest batchAnnotateImagesRequest = | ||
new BatchAnnotateImagesRequest(); | ||
batchAnnotateImagesRequest.setRequests(new ArrayList<AnnotateImageRequest>() {{ | ||
AnnotateImageRequest annotateImageRequest = new AnnotateImageRequest(); | ||
annotateImageRequest.setImage(image); | ||
|
||
// add the features we want | ||
annotateImageRequest.setFeatures(new ArrayList<Feature>() {{ | ||
Feature labelDetection = new Feature(); | ||
labelDetection.setType("LABEL_DETECTION"); | ||
labelDetection.setMaxResults(10); | ||
add(labelDetection); | ||
}}); | ||
|
||
// Add the list of one thing to the request | ||
add(annotateImageRequest); | ||
}}); | ||
|
||
Vision.Images.Annotate annotateRequest = | ||
vision.images().annotate(batchAnnotateImagesRequest); | ||
// Due to a bug: requests to Vision API containing large images fail when GZipped. | ||
annotateRequest.setDisableGZipContent(true); | ||
Log.d(TAG, "created Cloud Vision request object, sending request"); | ||
|
||
BatchAnnotateImagesResponse response = annotateRequest.execute(); | ||
|
||
Map<String, Float> annotations = convertResponseToMap(response); | ||
Log.d(TAG, "Cloud Vision request completed:" + annotations); | ||
return annotations; | ||
} catch (GoogleJsonResponseException e) { | ||
Log.d(TAG, "failed to make API request because " + e.getContent()); | ||
} catch (IOException e) { | ||
Log.d(TAG, "failed to make API request because of other IOException " + | ||
e.getMessage()); | ||
} | ||
return null; | ||
} | ||
|
||
private static Map<String, Float> convertResponseToMap(BatchAnnotateImagesResponse response) { | ||
Map<String, Float> annotations = new HashMap<>(); | ||
List<EntityAnnotation> labels = response.getResponses().get(0).getLabelAnnotations(); | ||
if (labels != null) { | ||
for (EntityAnnotation label : labels) { | ||
annotations.put(label.getDescription(), label.getScore()); | ||
} | ||
} | ||
return annotations; | ||
} | ||
} |
99 changes: 99 additions & 0 deletions
99
app/src/main/java/com/google/samples/mysample/MyHomeService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,99 @@ | ||
package com.google.samples.mysample; | ||
|
||
|
||
import android.os.AsyncTask; | ||
import android.os.Handler; | ||
import android.os.HandlerThread; | ||
import android.os.RemoteException; | ||
import android.pio.Gpio; | ||
import android.pio.PeripheralManagerService; | ||
import android.pio.PioInterruptEventListener; | ||
import android.service.headless.HomeService; | ||
|
||
import android.system.ErrnoException; | ||
import android.util.Base64; | ||
import android.util.Base64OutputStream; | ||
import android.util.Log; | ||
|
||
import com.google.api.services.vision.v1.model.Image; | ||
import com.google.common.io.ByteStreams; | ||
import com.google.firebase.database.DatabaseReference; | ||
import com.google.firebase.database.FirebaseDatabase; | ||
import com.google.firebase.database.ServerValue; | ||
|
||
import java.io.ByteArrayOutputStream; | ||
import java.io.IOException; | ||
import java.net.URL; | ||
import java.util.Map; | ||
|
||
/** | ||
* Implement your device logic here. | ||
*/ | ||
public class MyHomeService extends HomeService { | ||
private static final String TAG = "MyHomeService"; | ||
private HandlerThread mThread; | ||
private Handler mHandler; | ||
private static final String PLACEHOLDER_IMAGE_URL = "http://thecatapi.com/api/images/get?type=jpg"; | ||
|
||
@Override | ||
public void onCreate() { | ||
Log.d(TAG, "Service started"); | ||
|
||
mThread = new HandlerThread("backgroundThread"); | ||
mThread.start(); | ||
mHandler = new Handler(mThread.getLooper()); | ||
PeripheralManagerService pioService = new PeripheralManagerService(); | ||
try { | ||
Log.d(TAG, "gpio: " + pioService.getGpioList()); | ||
Gpio buttonPin = pioService.openGpio("22"); | ||
buttonPin.setDirection(Gpio.DIRECTION_IN); | ||
buttonPin.setEdgeTriggerType(Gpio.EDGE_FALLING);; | ||
buttonPin.registerInterruptHandler(new PioInterruptEventListener() { | ||
@Override | ||
public boolean onInterruptEvent(String name) { | ||
Log.d(TAG, "button pressed"); | ||
onDoorbellRang(); | ||
return true; | ||
} | ||
@Override | ||
public void onError(String name, int errorCode) { | ||
Log.e(TAG, "gpio interrupt error: " + name + ": " + errorCode); | ||
} | ||
}); | ||
} catch (RemoteException|ErrnoException e) { | ||
Log.e(TAG, "gpio error", e); | ||
} | ||
|
||
} | ||
|
||
void onDoorbellRang() { | ||
mHandler.post(() -> { | ||
// create new log entry | ||
DatabaseReference log = FirebaseDatabase.getInstance().getReference("logs").push(); | ||
log.child("timestamp").setValue(ServerValue.TIMESTAMP); | ||
byte[] imageBytes = capturePlaceholderImage(); | ||
if (imageBytes != null) { | ||
// upload image to firebase | ||
Image image = CloudVisionUtils.createImage(imageBytes); | ||
log.child("image").setValue(image.getContent()); | ||
// annotate image | ||
Map<String, Float> annotations = CloudVisionUtils.annotateImage(image); | ||
Log.d(TAG, "annotations:" + annotations); | ||
if (annotations != null) { | ||
log.child("annotations").setValue(annotations); | ||
} | ||
} | ||
}); | ||
} | ||
|
||
byte[] capturePlaceholderImage() { | ||
byte[] bs = null; | ||
try { | ||
URL imageURL = new URL(PLACEHOLDER_IMAGE_URL); | ||
bs = ByteStreams.toByteArray(imageURL.openStream()); | ||
} catch (IOException e) { | ||
Log.e(TAG, "error fetching image", e); | ||
} | ||
return bs; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<resources> | ||
<string name="app_name">My Brillo 2.0 app</string> | ||
</resources> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
// Top-level build file where you can add configuration options common to all sub-projects/modules. | ||
|
||
buildscript { | ||
repositories { | ||
jcenter() | ||
} | ||
dependencies { | ||
classpath 'com.android.tools.build:gradle:2.1.3' | ||
classpath 'com.google.gms:google-services:3.0.0' | ||
|
||
// NOTE: Do not place your application dependencies here; they belong | ||
// in the individual module build.gradle files | ||
} | ||
} | ||
|
||
allprojects { | ||
repositories { | ||
jcenter() | ||
} | ||
} | ||
|
||
task clean(type: Delete) { | ||
delete rootProject.buildDir | ||
} |
Binary file not shown.
Oops, something went wrong.