プレイヤーの画面にデバッグログを表示できるように修正

nobuo-kobayashi · nobuo-kobayashi · commit 7003fa8f60e9 · 2020-03-12T12:44:04.000+09:00
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/AndroidManifest.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/AndroidManifest.xml
@@ -27,6 +27,11 @@
             android:name=".RTSPPlayerActivity"
             android:exported="false"
             android:parentActivityName=".MainActivity" />
+
+        <activity
+            android:name=".RTSPSettingPreferenceActivity"
+            android:exported="false"
+            android:parentActivityName=".MainActivity" />
     </application>
 
 </manifest>
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/MainActivity.java b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/MainActivity.java
@@ -63,12 +63,19 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
         //noinspection SimplifiableIfStatement
         if (id == R.id.action_settings) {
+            gotoPreferences();
             return true;
         }
 
         return super.onOptionsItemSelected(item);
     }
 
+    private void gotoPreferences() {
+        Intent intent = new Intent();
+        intent.setClass(getApplicationContext(), RTSPSettingPreferenceActivity.class);
+        startActivity(intent);
+    }
+
     private void gotoRTSPPlayer(String uri) {
         Intent intent = new Intent();
         intent.setClass(getApplicationContext(), RTSPPlayerActivity.class);
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPPlayerActivity.java b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPPlayerActivity.java
@@ -8,9 +8,13 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.deviceconnect.android.libmedia.streaming.rtsp.player.RtspPlayer;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 
@@ -19,11 +23,17 @@ public class RTSPPlayerActivity extends AppCompatActivity {
     static final String EXTRA_URI = "_extra_uri";
 
     private RtspPlayer mRtspPlayer;
+    private RTSPSetting mSetting;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_rtsp_player);
+
+        mSetting = new RTSPSetting(getApplicationContext());
+
+        int visibility = mSetting.isEnabledDebugLog() ? View.VISIBLE : View.GONE;
+        findViewById(R.id.text_view_debug).setVisibility(visibility);
     }
 
     @Override
@@ -65,19 +75,23 @@ private void startPlayer() {
         mRtspPlayer.setOnEventListener(new RtspPlayer.OnEventListener() {
             @Override
             public void onConnected() {
+                addDebugLog("サーバに接続しました。");
             }
 
             @Override
             public void onDisconnected() {
+                addDebugLog("サーバから切断されました。");
             }
 
             @Override
             public void onReady() {
+                addDebugLog("SDP を受信しました。");
                 runOnUiThread(() -> progressBar.setVisibility(View.GONE));
             }
 
             @Override
             public void onSizeChanged(int width, int height) {
+                addDebugLog("サイズ変更: " + width + "x" + height);
                 runOnUiThread(() -> changePlayerSize(width, height));
             }
 
@@ -97,6 +111,33 @@ private void stopPlayer() {
         }
     }
 
+    private final List<String> mDebugMessage = new ArrayList<>();
+
+    private void addDebugLog(String message) {
+        synchronized (mDebugMessage) {
+            mDebugMessage.add(message);
+
+            if (mDebugMessage.size() > 5) {
+                mDebugMessage.remove(0);
+            }
+        }
+        runOnUiThread(() -> {
+            TextView textView = findViewById(R.id.text_view_debug);
+
+            StringBuilder sb = new StringBuilder();
+            synchronized (mDebugMessage) {
+                for (String s : mDebugMessage) {
+                    if (sb.length() > 0) {
+                        sb.append("\n");
+                    }
+                    sb.append(s);
+                }
+            }
+
+            textView.setText(sb.toString());
+        });
+    }
+
     private void showErrorDialog(String title, String message) {
         runOnUiThread(() ->
                 new AlertDialog.Builder(this)
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPSetting.java b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPSetting.java
@@ -4,22 +4,25 @@
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
 
-public class RTSPSetting {
+class RTSPSetting {
 
     private SharedPreferences mSharedPreferences;
 
-    public RTSPSetting(Context context) {
+    RTSPSetting(Context context) {
         mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(context);
     }
 
-
-    public void setServerUrl(String url) {
+    void setServerUrl(String url) {
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putString("rtsp_server_url", url);
         editor.apply();
     }
 
-    public String getServerUrl() {
+    String getServerUrl() {
         return mSharedPreferences.getString("rtsp_server_url", null);
     }
+
+    boolean isEnabledDebugLog() {
+        return mSharedPreferences.getBoolean("settings_debug_log", true);
+    }
 }
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPSettingPreferenceActivity.java b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/java/org/deviceconnect/android/rtspplayer/RTSPSettingPreferenceActivity.java
@@ -0,0 +1,46 @@
+package org.deviceconnect.android.rtspplayer;
+
+import android.os.Bundle;
+import android.view.MenuItem;
+
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceFragmentCompat;
+
+public class RTSPSettingPreferenceActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_settings);
+
+        ActionBar actionBar = getSupportActionBar();
+        if (actionBar != null) {
+            actionBar.setDisplayHomeAsUpEnabled(true);
+            actionBar.setHomeButtonEnabled(true);
+            actionBar.setTitle(R.string.settings_name);
+        }
+
+        getSupportFragmentManager()
+                .beginTransaction()
+                .replace(R.id.settings_container, new RtspPreferenceFragment())
+                .commit();
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        int id = item.getItemId();
+        if (id == android.R.id.home) {
+            finish();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    public static class RtspPreferenceFragment extends PreferenceFragmentCompat {
+        @Override
+        public void onCreatePreferences(final Bundle savedInstanceState, final String rootKey) {
+            setPreferencesFromResource(R.xml.rtsp_settings, rootKey);
+        }
+    }
+}
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/drawable/ic_settings_black_24dp.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
+</vector>
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/layout/activity_rtsp_player.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/layout/activity_rtsp_player.xml
@@ -27,4 +27,24 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent" />
 
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.45" />
+
+    <TextView
+        android:id="@+id/text_view_debug"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:background="#4000"
+        android:textColor="#fff"
+        android:padding="4dp"
+        android:layout_margin="4dp"
+        android:textSize="12sp"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="@id/guideline_1" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/layout/activity_settings.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="org.deviceconnect.android.rtspplayer.RTSPSettingPreferenceActivity">
+
+    <FrameLayout
+        android:id="@+id/settings_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/menu/menu_main.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/menu/menu_main.xml
@@ -2,9 +2,12 @@
       xmlns:app="http://schemas.android.com/apk/res-auto"
       xmlns:tools="http://schemas.android.com/tools"
       tools:context="org.deviceconnect.android.rtspplayer.MainActivity">
+
     <item
         android:id="@+id/action_settings"
+        android:icon="@drawable/ic_settings_black_24dp"
         android:orderInCategory="100"
         android:title="@string/action_settings"
-        app:showAsAction="never"/>
+        app:showAsAction="always" />
+
 </menu>
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/values/strings.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/values/strings.xml
@@ -1,4 +1,5 @@
 <resources>
     <string name="app_name">RtspPlayer</string>
     <string name="action_settings">Settings</string>
+    <string name="settings_name">RTSP 設定</string>
 </resources>
diff --git a/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/xml/rtsp_settings.xml b/dConnectSDK/dConnectLibStreaming/rtsp-player-app/src/main/res/xml/rtsp_settings.xml
@@ -0,0 +1,17 @@
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="デバッグ"
+        app:iconSpaceReserved="false">
+
+        <SwitchPreferenceCompat
+            android:defaultValue="true"
+            android:key="settings_debug_log"
+            android:title="デバッグログ"
+            app:iconSpaceReserved="false"
+            app:useSimpleSummaryProvider="true" />
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
diff --git a/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTPlayerActivity.java b/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTPlayerActivity.java
@@ -8,12 +8,15 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ProgressBar;
+import android.widget.TextView;
 
 import org.deviceconnect.android.libsrt.SRT;
 import org.deviceconnect.android.libsrt.SRTStats;
 import org.deviceconnect.android.libsrt.client.SRTPlayer;
 
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import androidx.appcompat.app.AlertDialog;
@@ -34,6 +37,9 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_srt_player);
 
         mSetting = new SRTSetting(getApplicationContext());
+
+        int visibility = mSetting.isEnabledDebugLog() ? View.VISIBLE : View.GONE;
+        findViewById(R.id.text_view_debug).setVisibility(visibility);
     }
 
     @Override
@@ -85,19 +91,23 @@ private void startSRTPlayer() {
         mSRTPlayer.setOnEventListener(new SRTPlayer.OnEventListener() {
             @Override
             public void onConnected() {
+                addDebugLog("サーバに接続しました。");
             }
 
             @Override
             public void onDisconnected() {
+                addDebugLog("サーバから切断しました。");
             }
 
             @Override
             public void onReady() {
+                addDebugLog("PMT を受信しました。");
                 runOnUiThread(() -> progressBar.setVisibility(View.GONE));
             }
 
             @Override
             public void onSizeChanged(int width, int height) {
+                addDebugLog("サイズ変更: " + width + "x" + height);
                 runOnUiThread(() -> changePlayerSize(width, height));
             }
 
@@ -109,6 +119,7 @@ public void onError(Exception e) {
 
             @Override
             public void onStats(SRTStats stats) {
+                addDebugLog(stats.toString());
             }
         });
         mSRTPlayer.start();
@@ -121,6 +132,33 @@ private void stopSRTPlayer() {
         }
     }
 
+    private final List<String> mDebugMessage = new ArrayList<>();
+
+    private void addDebugLog(String message) {
+        synchronized (mDebugMessage) {
+            mDebugMessage.add(message);
+
+            if (mDebugMessage.size() > 5) {
+                mDebugMessage.remove(0);
+            }
+        }
+        runOnUiThread(() -> {
+            TextView textView = findViewById(R.id.text_view_debug);
+
+            StringBuilder sb = new StringBuilder();
+            synchronized (mDebugMessage) {
+                for (String s : mDebugMessage) {
+                    if (sb.length() > 0) {
+                        sb.append("\n");
+                    }
+                    sb.append(s);
+                }
+            }
+
+            textView.setText(sb.toString());
+        });
+    }
+
     private void showErrorDialog(String title, String message) {
         runOnUiThread(() ->
             new AlertDialog.Builder(this)
diff --git a/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTSetting.java b/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTSetting.java
@@ -37,4 +37,8 @@ int getPeerIdleTimeo() {
         String value = mSharedPreferences.getString("settings_srt_peeridletimeo", "5000");
         return Integer.parseInt(value);
     }
+
+    boolean isEnabledDebugLog() {
+        return mSharedPreferences.getBoolean("settings_debug_log", true);
+    }
 }
diff --git a/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTSettingPreferenceActivity.java b/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/java/org/deviceconnect/android/srt_player_app/SRTSettingPreferenceActivity.java
diff --git a/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/res/layout/activity_srt_player.xml b/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/res/layout/activity_srt_player.xml
diff --git a/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/res/xml/srt_settings.xml b/dConnectSDK/dConnectLibStreaming/srt-player-app/src/main/res/xml/srt_settings.xml
