Merge pull request #545 from TakayukiHoshi1984/feature_host_camera

HostプラグインのRecorder周りの修正

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle

@@ -103,8 +103,8 @@ dependencies {
     implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:1.9.7'
     implementation 'org.deviceconnect:dconnect-device-plugin-sdk:2.8.6'
     implementation 'org.deviceconnect:dconnect-demo-lib:1.0.1'
-    implementation 'org.deviceconnect:libmedia:1.2.0'
-    implementation 'org.deviceconnect:libsrt:1.2.0'
+    implementation 'org.deviceconnect:libmedia:1.2.2'
+    implementation 'org.deviceconnect:libsrt:1.2.2'
 //    implementation project(':libmedia')
 //    implementation project(':libsrt')
 }

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/AndroidManifest.xml

@@ -62,23 +62,23 @@
             android:exported="false"
             android:launchMode="singleInstance"
             android:taskAffinity=".canvas"
-            android:theme="@style/AppCompatTheme" />
+            android:theme="@style/AppCompatTheme.NoActionBar" />
 
         <activity
             android:name="org.deviceconnect.android.deviceplugin.host.activity.profile.TouchProfileActivity"
             android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleInstance"
             android:taskAffinity=".touch"
-            android:theme="@style/AppCompatTheme" />
+            android:theme="@style/AppCompatTheme.NoActionBar" />
 
         <activity
             android:name="org.deviceconnect.android.deviceplugin.host.activity.profile.KeyEventProfileActivity"
             android:excludeFromRecents="true"
             android:exported="false"
             android:launchMode="singleInstance"
             android:taskAffinity=".keyevent"
-            android:theme="@style/AppCompatTheme" />
+            android:theme="@style/AppCompatTheme.NoActionBar" />
 
         <!-- パーミッション要求画面 -->
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/HostDevicePluginBindActivity.java

@@ -44,10 +44,7 @@ public void onCreate(Bundle savedInstanceState) {
     @Override
     public void onResume() {
         super.onResume();
-
-        if (isManagerStarted()) {
-            bindService();
-        }
+        bindService();
     }
 
     @Override
@@ -75,7 +72,7 @@ public boolean isManagerStarted() {
         ActivityManager manager = (ActivityManager) getSystemService(Context.ACTIVITY_SERVICE);
         for (ActivityManager.RunningServiceInfo serviceInfo : manager.getRunningServices(Integer.MAX_VALUE)) {
             if ("org.deviceconnect.android.manager".equals(serviceInfo.service.getPackageName())) {
-                return true;
+                return serviceInfo.started;
             }
         }
         return false;

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/fragment/HostDevicePluginBindFragment.java

@@ -113,6 +113,20 @@ public void showToast(int resId) {
         });
     }
 
+    /**
+     * トーストを表示します.
+     *
+     * @param message メッセージ
+     */
+    public void showToast(String message) {
+        runOnUiThread(() -> {
+            Context context = getContext();
+            if (context != null) {
+                Toast.makeText(context, message, Toast.LENGTH_SHORT).show();
+            }
+        });
+    }
+
     /**
      * UI スレッドで Runnable を実行します.
      *

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/fragment/HostDevicePluginBindPreferenceFragment.java

@@ -16,9 +16,8 @@
 
 import org.deviceconnect.android.deviceplugin.host.HostDevicePlugin;
 import org.deviceconnect.android.deviceplugin.host.activity.HostDevicePluginBindActivity;
-import org.deviceconnect.android.deviceplugin.host.activity.recorder.camera.CameraActivity;
 
-public abstract class HostDevicePluginBindPreferenceFragment extends PreferenceFragmentCompat implements CameraActivity.OnHostDevicePluginListener {
+public abstract class HostDevicePluginBindPreferenceFragment extends PreferenceFragmentCompat implements HostDevicePluginBindActivity.OnHostDevicePluginListener {
 
     private final Handler mUIHandler = new Handler(Looper.getMainLooper());
 

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/profile/CanvasProfileActivity.java

@@ -153,22 +153,21 @@ protected void onCreate(final Bundle savedInstanceState) {
     @Override
     protected void onResume() {
         super.onResume();
-
         mForegroundFlag = true;
 
-        IntentFilter filter = new IntentFilter();
-        filter.addAction(CanvasDrawImageObject.ACTION_DRAW_CANVAS);
-        filter.addAction(CanvasDrawImageObject.ACTION_DELETE_CANVAS);
-        LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter);
-
-        refreshImage(mIntent);
-
         if (mDownloadThread != null) {
             mDownloadThread.terminate();
         }
         mDownloadThread = new DownloadThread();
         mDownloadThread.setName("Canvas-Download-Thread");
         mDownloadThread.start();
+
+        refreshImage(mIntent);
+
+        IntentFilter filter = new IntentFilter();
+        filter.addAction(CanvasDrawImageObject.ACTION_DRAW_CANVAS);
+        filter.addAction(CanvasDrawImageObject.ACTION_DELETE_CANVAS);
+        LocalBroadcastManager.getInstance(this).registerReceiver(mReceiver, filter);
     }
 
     @Override