ThetaVのクライアントモードに対応した。

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceTheta/app/build.gradle

@@ -17,7 +17,7 @@ android {
 
     defaultConfig {
         applicationId "org.deviceconnect.android.deviceplugin.theta"
-        minSdkVersion 14
+        minSdkVersion 16
         targetSdkVersion 26
         versionCode 7
         versionName getVersionName()
@@ -31,7 +31,16 @@ android {
             keyPassword = project.properties.keyPassword
         }
     }
-
+    lintOptions {
+        checkReleaseBuilds false
+        // Or, if you prefer, you can continue to check for errors in release builds,
+        // but continue the build even when errors are found:
+        abortOnError false
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
     buildTypes {
         release {
             minifyEnabled false
@@ -63,4 +72,5 @@ dependencies {
     implementation fileTree(include: '*.jar', dir: 'libs')
     implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.5.1'
     implementation 'com.squareup.okhttp:okhttp:2.5.0'
+    implementation 'com.burgstaller:okhttp-digest:1.16'
 }

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/ThetaDeviceApplication.java

@@ -8,9 +8,12 @@
 
 import android.app.Application;
 import android.content.Context;
+import android.os.Build;
 import android.support.v4.util.LruCache;
 
 import org.deviceconnect.android.deviceplugin.theta.core.SphericalViewApi;
+import org.deviceconnect.android.deviceplugin.theta.core.ThetaDeviceDetectionFromAccessPoint;
+import org.deviceconnect.android.deviceplugin.theta.core.ThetaDeviceDetectionFromLAN;
 import org.deviceconnect.android.deviceplugin.theta.core.ThetaDeviceManager;
 import org.deviceconnect.android.deviceplugin.theta.core.sensor.AbstractHeadTracker;
 import org.deviceconnect.android.deviceplugin.theta.core.sensor.DefaultHeadTracker;
@@ -78,6 +81,11 @@ public void onCreate() {
 
         Context context = getApplicationContext();
         mDeviceMgr = new ThetaDeviceManager(context);
+        mDeviceMgr.addDeviceDetection(new ThetaDeviceDetectionFromAccessPoint());
+        // 16以上でNsdManagerが使用できるので追加する
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+            mDeviceMgr.addDeviceDetection(new ThetaDeviceDetectionFromLAN());
+        }
         mHeadTracker = new HeadTrackerWrapper(new DefaultHeadTracker(context));
         mSphericalViewApi = new SphericalViewApi(context);
     }

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/ThetaDeviceService.java

@@ -87,6 +87,7 @@ public void onCreate() {
         mDeviceMgr = app.getDeviceManager();
         mDeviceMgr.registerDeviceEventListener(this);
         mDeviceMgr.checkConnectedDevice();
+        mDeviceMgr.startDeviceDetection();
         mClient = new ThetaDeviceClient(mDeviceMgr);
         mFileMgr = new FileManager(this);
 
@@ -103,6 +104,7 @@ public void onCreate() {
     @Override
     public void onDestroy() {
         unregisterReceiver(mWifiReceiver);
+        mDeviceMgr.dispose();
         mDeviceMgr.unregisterDeviceEventListener(this);
         try {
             PtpipInitiator.close();

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/activity/ThetaDeviceSettingsActivity.java

@@ -73,6 +73,7 @@ protected void onRestoreInstanceState(final Bundle savedInstanceState) {
     protected void onResume() {
         super.onResume();
         getDeviceManager().checkConnectedDevice();
+        getDeviceManager().startDeviceDetection();
     }
 
     @Override

dConnectDevicePlugin/dConnectDeviceTheta/app/src/main/java/org/deviceconnect/android/deviceplugin/theta/core/AbstractThetaDevice.java

@@ -0,0 +1,51 @@
+package org.deviceconnect.android.deviceplugin.theta.core;
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+abstract class AbstractThetaDeviceDetection implements ThetaDeviceDetection {
+
+    private final List<DetectionListener> mDetectionListeners = new ArrayList<>();
+
+    @Override
+    public void registerListener(final DetectionListener listener) {
+        synchronized (mDetectionListeners) {
+            for (DetectionListener cache : mDetectionListeners) {
+                if (cache == listener) {
+                    return;
+                }
+            }
+            mDetectionListeners.add(listener);
+        }
+    }
+
+    @Override
+    public void unregisterListener(final DetectionListener listener) {
+        synchronized (mDetectionListeners) {
+            for (Iterator<DetectionListener> it = mDetectionListeners.iterator(); it.hasNext(); ) {
+                DetectionListener cache = it.next();
+                if (cache == listener) {
+                    it.remove();
+                    return;
+                }
+            }
+        }
+    }
+
+    void notifyOnThetaDetected(final ThetaDevice device) {
+        synchronized (mDetectionListeners) {
+            for (DetectionListener cache : mDetectionListeners) {
+                cache.onThetaDetected(device);
+            }
+        }
+    }
+
+    void notifyOnThetaLost(final ThetaDevice device) {
+        synchronized (mDetectionListeners) {
+            for (DetectionListener cache : mDetectionListeners) {
+                cache.onThetaLost(device);
+            }
+        }
+    }
+}