Merge pull request #716 from TakayukiHoshi1984/feature_host_plugin_update

Feature host plugin update

Author: TakayukiHoshi1984

dConnectDevicePlugin/dConnectDeviceHost/app/build.gradle

@@ -33,7 +33,7 @@ android {
         buildConfigField "String", "DEMO_DIR", "\"demo\""
         buildConfigField "String", "DEMO_ZIP", "\"" + DEMO_ZIP_NAME + "\""
         buildConfigField "long", "STATS_INTERVAL", "5000L"
-    }
+     }
 
     signingConfigs {
         releaseConfig {
@@ -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.2'
-    implementation 'org.deviceconnect:libsrt:1.2.2'
+    implementation 'org.deviceconnect:libmedia:1.3.0'
+    implementation 'org.deviceconnect:libsrt:1.3.0'
 //    implementation project(':libmedia')
 //    implementation project(':libsrt')
 }

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

@@ -112,13 +112,15 @@
             android:name="org.deviceconnect.android.deviceplugin.host.setting.HostSettingActivity"
             android:exported="false"
             android:launchMode="singleTask"
+            android:taskAffinity=".settings"
             android:theme="@style/AppCompatTheme" />
 
         <!-- レコーダー設定画面用の Activity -->
         <activity
             android:name=".activity.recorder.settings.SettingsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:exported="false"
+            android:taskAffinity=".recorder_settings"
             android:theme="@style/AppCompatTheme" />
 
         <!-- プラグイン本体サービス -->

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/assets/org_deviceconnect_android_deviceplugin_host/api/mediaStreamRecording.json

@@ -311,7 +311,7 @@ protected void onKeyStoreUpdated(final KeyStore keyStore, final Certificate cert
             }
             mSSLContext = createSSLContext(keyStore, DEFAULT_PASSWORD);
         } catch (Exception e) {
-            mLogger.log(Level.SEVERE, "Failed to update keystore", e);
+            mLogger.log(Level.WARNING, "Failed to update keystore", e);
         }
     }
 

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

@@ -31,11 +31,6 @@ public class HostDevicePluginBindActivity extends AppCompatActivity {
      */
     private boolean mIsBound = false;
 
-    /**
-     * 画面の回転固定フラグ.
-     */
-    private boolean mDisplayRotationFixed = false;
-
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -179,9 +174,18 @@ public void onServiceDisconnected(ComponentName name) {
      * @param fixed 固定する場合はtrue、それ以外はfalse
      */
     public void setDisplayRotation(boolean fixed) {
-        mDisplayRotationFixed = fixed;
+        setDisplayRotation(fixed, getDisplayOrientation());
+    }
+
+    /**
+     * 画面に表示されている状態で回転を固定します.
+     *
+     * @param fixed 固定する場合はtrue、それ以外はfalse
+     * @param orientation 固定する向き
+     */
+    public void setDisplayRotation(boolean fixed, int orientation) {
         if (fixed) {
-            setRequestedOrientation(getDisplayOrientation());
+            setRequestedOrientation(orientation);
         } else {
             setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED);
         }
@@ -193,14 +197,14 @@ public void setDisplayRotation(boolean fixed) {
      * @return 画面が固定されている場合はtrue、それ以外はfalse
      */
     public boolean isDisplayRotationFixed() {
-        return mDisplayRotationFixed;
+        return getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
     }
 
     /**
      * 画面固定を切り替えます.
      */
     public void toggleDisplayRotation() {
-        setDisplayRotation(!mDisplayRotationFixed);
+        setDisplayRotation(!isDisplayRotationFixed());
     }
 
     /**

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

@@ -67,7 +67,15 @@ public static AlertDialogFragment create(final String tag, final String title, f
      * @return AlertDialogFragmentのインスタンス
      */
     public static AlertDialogFragment create(final String tag, final String title, final String message,
-                                                                   final String positive, final String negative) {
+                                             final String positive, final String negative) {
+        Bundle args = createParam(tag, title, message, positive, negative);
+        AlertDialogFragment dialog = new AlertDialogFragment();
+        dialog.setArguments(args);
+        return dialog;
+    }
+
+    public static Bundle createParam(final String tag, final String title, final String message,
+                                     final String positive, final String negative) {
         Bundle args = new Bundle();
         args.putString(KEY_TAG, tag);
         args.putString(KEY_TITLE, title);
@@ -78,10 +86,7 @@ public static AlertDialogFragment create(final String tag, final String title, f
         if (negative != null) {
             args.putString(KEY_NEGATIVE, negative);
         }
-
-        AlertDialogFragment dialog = new AlertDialogFragment();
-        dialog.setArguments(args);
-        return dialog;
+        return args;
     }
 
     @Override

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

@@ -3,11 +3,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.ActivityInfo;
+import android.content.res.Configuration;
 import android.os.Bundle;
 import android.view.MenuItem;
 
 import androidx.appcompat.app.ActionBar;
 
+import org.deviceconnect.android.deviceplugin.host.HostDevicePlugin;
 import org.deviceconnect.android.deviceplugin.host.R;
 import org.deviceconnect.android.deviceplugin.host.activity.HostDevicePluginBindActivity;
 import org.deviceconnect.android.deviceplugin.host.recorder.HostMediaRecorder;
@@ -17,6 +19,7 @@ public class SettingsActivity extends HostDevicePluginBindActivity {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        setRequestedOrientation(getDisplayOrientation());
         setContentView(R.layout.activity_recorder_settings);
 
         ActionBar actionBar = getSupportActionBar();
@@ -27,9 +30,8 @@ public void onCreate(Bundle savedInstanceState) {
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-        setRequestedOrientation(getDisplayOrientation());
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
     }
 
     @Override
@@ -60,17 +62,20 @@ public int getDisplayOrientation() {
         return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
     }
 
-    public HostMediaRecorder getRecorder() {
-        String recorderId = null;
+    public String getRecorderId() {
         Intent intent = getIntent();
         if (intent != null) {
-            recorderId = intent.getStringExtra("recorder_id");
+            return intent.getStringExtra("recorder_id");
         }
-        return getHostDevicePlugin().getHostMediaRecorderManager().getRecorder(recorderId);
+        return null;
     }
 
-    public String getRecorderId() {
-        return getRecorder().getId();
+    public HostMediaRecorder getRecorder() {
+        HostDevicePlugin plugin = getHostDevicePlugin();
+        if (plugin != null) {
+            return plugin.getHostMediaRecorderManager().getRecorder(getRecorderId());
+        }
+        return null;
     }
 
     public static Intent createSettingsActivityIntent(Context context, String recorderId, Integer rotationFlag) {

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsActivity.java

@@ -17,13 +17,16 @@ public class SettingsAudioFragment extends SettingsParameterFragment {
 
     @Override
     public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
-        getPreferenceManager().setSharedPreferencesName(getRecorderId().replaceAll("/", "_"));
+        getPreferenceManager().setSharedPreferencesName(getRecorderId());
         setPreferencesFromResource(R.xml.settings_host_recorder_audio, rootKey);
     }
 
     @Override
     public void onBindService() {
         mMediaRecorder = getRecorder();
+        if (mMediaRecorder == null) {
+            return;
+        }
 
         setPreviewAudioSource(mMediaRecorder.getSettings());
         setPreviewSampleRate(mMediaRecorder.getSettings());

dConnectDevicePlugin/dConnectDeviceHost/app/src/main/java/org/deviceconnect/android/deviceplugin/host/activity/recorder/settings/SettingsAudioFragment.java

@@ -49,4 +49,17 @@ public String getRecorderId() {
         }
         return null;
     }
+
+    /**
+     * プレビューサーバ、配信設定ファイル名を取得します.
+     *
+     * @return 設定のファイル名
+     */
+    public String getEncoderId() {
+        Bundle args = getArguments();
+        if (args != null) {
+            return args.getString("encoder_id");
+        }
+        return null;
+    }
 }