Merge branch 'release/v1.6.0' into 'master'

THETA Z1 is supported.
ricohapi · Jun 5, 2019 · 32cbcee · 32cbcee
2 parents 2755742 + 0be29f8
commit 32cbcee
Show file tree

Hide file tree

Showing 28 changed files with 4,949 additions and 732 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
 # Automatic Face Blur plug-in
 
 # 1. Overview
+
 This plug-in detects faces from spherical pictures and blur them.
 
 # 2. Terms of Service
@@ -9,37 +10,19 @@ This plug-in detects faces from spherical pictures and blur them.
 
 By using the Automatic Face Blur plug-in, you are agreeing to the above and the license terms, [license.txt](license.txt).
 
-Copyright &copy; 2018 Ricoh Company, Ltd.
-
-# 3. Build and Use Environment
-
-## 3-1. Hardware
-
-* RICOH THETA V
-* Firmware ver.2.31.1 and above
-
-    > Information on checking and updating the firmware is [here](https://theta360.com/en/support/manual/v/content/pc/pc_09.html).
-
-## 3-2.  Development Environment
+Copyright &copy; 2019 Ricoh Company, Ltd.
 
-This plug-in has been built under the following conditions.
+# 3. Development Environment
 
-#### Operating System
+* RICOH THETA V and Z1
+* Firmware version 2.50.1 (V), 1.03.5 (Z1)
 
-* Windows&trade; 10 Version 1709
-* macOS&reg; High Sierra ver.10.13
-
-#### Development environment
-
-* Android&trade; Studio 3.1+
-* gradle 3.1.3
-* Android SDK (API Level 25)
-* compileSdkVersion 26
-* buildToolsVersion "27.0.3"
-* minSdkVersion 25
-* targetSdkVersion 25
+    > How to update your RICOH THETA
+    > * [THETA V](https://support.theta360.com/en/manual/v/content/update/update_01.html)
+    > * [THETA Z1](https://support.theta360.com/en/manual/z1/content/update/update_01.html)
 
 # 4. Install
+
 Android Studio install apk after build automatically. Or use the following command after build.
 
 ```
@@ -51,34 +34,34 @@ adb install -r app-debug.apk
   Using desktop viewing app as Vysor, open Settings app and turns on the permissions at "Apps" > "Automatic Face Blur" > "Permissions"
 
 # 5. How to Use
+
 1. Turn on the THETA.
 2. Open RICOH THETA app on your Win/Mac.
 3. Set this plug-in as an active plugin from "File" > "Plug-in management..."
-4. Connect THETA V to Wireless-LAN by client mode or access point mode.
-   To connect THETA V to Wireless-LAN by client mode,
+4. Connect THETA to Wireless-LAN by client mode or access point mode.  
+   To connect THETA to Wireless-LAN by client mode,
    for example, let's assume that there is a macOS machine,
-   a THETA V and an iPhone on the same wireless LAN.  
-   We also recommend that the THETA V be close to fully charged with an AC-USB adapter.
+   a THETA and an iPhone on the same wireless LAN.  
+   We also recommend that the THETA be close to fully charged with an AC-USB adapter.
 5. Set default plug-in  
-   Open the THETA mobile app on an iOS/Android smartphone
+   Open the THETA mobile app on an iOS/Android smartphone  
    Tap "Settings" at right bottom corner  
    Confirm "Connection" is "Wi-Fi" or "Wi-Fi+Bluetooth".  
    Tap "Camera settings"  
    Tap "Plug-in"  
    Select "Automatic Face Blur"  
-6. Check IP address of the camera
+6. Check IP address of the camera  
    Back to the Camera settings  
-   Check IP-address of THETA V on smartphone app
+   Check IP-address of THETA on smartphone app  
    If you use macOS type "dns-sd -q THETAYL01234567.local" in Terminal. Here "THETAYL01234567" is an example, please change to your serial number.
-7. Launch plug-in
-      Press Mode button till LED2 turns white or Open from the smartphone app (RICOH THETA)
-
+7. Launch plug-in  
+   Press Mode button till LED2 turns white or Open from the smartphone app (RICOH THETA)
 8. If you use WebUI of the plug-in,
-    when you connect with THETA V by access point mode,
-    open the URL (http://192.168.1.1/:8888) on the browser.
-    When you connect with THETA V by client mode,
-    open the URL (http://(ip-address):8888) on the browser.
-    Here, (ip-address) is example. Change it to your THETA V's IP address.
+    when you connect with THETA by access point mode,
+    open the URL (http://192.168.1.1/:8888) on the browser.  
+    When you connect with THETA by client mode,
+    open the URL (http://(ip-address):8888) on the browser.  
+    Here, (ip-address) is example. Change it to your THETA's IP address.
 9. You can set options like shooting mode, shutter speed, ISO sensitivity, White balance and EV by WebUI of the plug-in.
 10. Position the camera and press the shutter button on the WebUI of the plug-in to take a picture that will be blurred.
 11. If you do not use WebUI of the plug-in,
@@ -87,11 +70,13 @@ adb install -r app-debug.apk
 13. Press the Mode Button more than 2 seconds to finish this plugin.
 
 # 6. History
-* ver.1.01.00 (2018/07/25): Initial version for github.
-* ver.1.02.00 (2018/08/08): Bug fix.
-* ver.1.03.00 (2018/10/05): Bug fix.
-* ver.1.04.00 (2018/11/05): Check remaining space of Theta.
-* ver.1.05.00 (2018/12/04): Terminate the plug-in when there is no space for Theta to take picture.
+
+* v.1.1.0 (2018/07/25): Initial version for github.
+* v.1.2.0 (2018/08/08): Bug fix.
+* v.1.3.0 (2018/10/05): Bug fix.
+* v.1.4.0 (2018/11/05): Check remaining space of Theta.
+* v.1.5.0 (2018/12/04): Terminate the plug-in when there is no space for Theta to take picture.
+* v.1.6.0 (2019/05/08): THETA Z1 is supported.
 
 ---
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,4 +1,14 @@
 apply plugin: 'com.android.application'
+buildscript {
+    repositories {
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.cookpad.android.licensetools:license-tools-plugin:1.6.0'
+    }
+}
+apply plugin: 'com.cookpad.android.licensetools'
 
 android {
     compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION)
@@ -7,8 +17,8 @@ android {
         applicationId "com.theta360.automaticfaceblur"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 4
-        versionName "1.05.00"
+        versionCode 6
+        versionName "1.6.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/app/licenses.yml b/app/licenses.yml
@@ -0,0 +1,143 @@
+- artifact: com.android.support:support-v4:+
+  name: Android Support Library v4
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-core-utils:+
+  name: Android Support Library core utils
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-media-compat:+
+  name: Android Support Library v4
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-compat:+
+  name: Android Support Library compat
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.koushikdutta.async:androidasync:+
+  name: AndroidAsync
+  copyrightHolder: koush
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/koush/AndroidAsync
+- artifact: com.android.support:support-vector-drawable:+
+  name: Android Support VectorDrawable
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: android.arch.lifecycle:common:+
+  name: Android Lifecycle-Common
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/topic/libraries/architecture/index.html
+- artifact: com.android.support:appcompat-v7:+
+  name: Android AppCompat Library v7
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-fragment:+
+  name: Android Support Library v4
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-fragment:+
+  name: Android Support Library fragment
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-annotations:+
+  name: Android Support Library Annotations
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-core-ui:+
+  name: Android Support Library v4
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:animated-vector-drawable:+
+  name: Android Support AnimatedVectorDrawable
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.jakewharton.timber:timber:+
+  name: Timber
+  copyrightHolder: Jake Wharton
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://github.com/JakeWharton/timber
+- artifact: com.android.support:support-annotations:+
+  name: Android Support Library Annotations
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:support-core-ui:+
+  name: Android Support Library core UI
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:appcompat-v7:+
+  name: Android AppCompat Library v7
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: android.arch.lifecycle:runtime:+
+  name: Android Lifecycle Runtime
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/topic/libraries/architecture/index.html
+- artifact: com.android.support:support-vector-drawable:+
+  name: Android Support VectorDrawable
+  copyrightHolder: The Android Open Source Project
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: android.arch.core:common:+
+  name: Android Arch-Common
+  copyrightHolder: The Android Open Source Projects
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: https://developer.android.com/topic/libraries/architecture/index.html
+- artifact: com.android.support:support-core-utils:+
+  name: Android Support Library v4
+  copyrightHolder: The Android Open Source Projects
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.google.code.gson:gson:+
+  name: Gson
+  copyrightHolder: Google Inc.
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+- artifact: com.android.support:support-compat:+
+  name: Android Support Library compat
+  copyrightHolder: The Android Open Source Projects
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
+- artifact: com.android.support:animated-vector-drawable:+
+  name: Android Support AnimatedVectorDrawable
+  copyrightHolder: The Android Open Source Projects
+  license: The Apache Software License, Version 2.0
+  licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
+  url: http://developer.android.com/tools/extras/support-library.html
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -7,6 +7,9 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <uses-feature android:name="com.theta360.receptor.v" android:required="true" />
+    <uses-feature android:name="com.theta360.receptor.z1" android:required="true" />
+
     <application
         android:allowBackup="true"
         tools:replace="android:name"