From 530f810b4e3056d068ed8b91b6ecf173de7ef62d Mon Sep 17 00:00:00 2001 From: MRSa Date: Thu, 28 Dec 2017 23:33:12 +0900 Subject: [PATCH] =?utf8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0=E3=83=AD?= =?utf8?q?=E3=82=B0=EF=BC=88logcat=EF=BC=89=E3=81=AE=E8=A1=A8=E7=A4=BA?= =?utf8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=A6?= =?utf8?q?=E3=81=BF=E3=82=8B=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../main/java/net/osdn/gokigen/a01d/A01dMain.java | 22 +++ .../java/net/osdn/gokigen/a01d/IChangeScene.java | 1 + .../osdn/gokigen/a01d/logcat/LogCatFragment.java | 184 +++++++++++++++++++++ .../osdn/gokigen/a01d/logcat/LogCatUpdater.java | 70 ++++++++ .../net/osdn/gokigen/a01d/logcat/LogCatViewer.java | 48 ++++++ .../a01d/preference/PreferenceFragment.java | 5 + app/src/main/res/menu/debug_view.xml | 12 ++ app/src/main/res/values-ja/strings.xml | 7 + app/src/main/res/values/strings.xml | 5 + app/src/main/res/xml/preferences.xml | 8 + 10 files changed, 362 insertions(+) create mode 100644 app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java create mode 100644 app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatUpdater.java create mode 100644 app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java create mode 100644 app/src/main/res/menu/debug_view.xml diff --git a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java index 8dd3a17..86522a5 100644 --- a/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java +++ b/app/src/main/java/net/osdn/gokigen/a01d/A01dMain.java @@ -23,6 +23,7 @@ import net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.IOlyCameraConnect import net.osdn.gokigen.a01d.camera.olympus.wrapper.connection.ble.ICameraPowerOn; import net.osdn.gokigen.a01d.liveview.IStatusViewDrawer; import net.osdn.gokigen.a01d.liveview.LiveViewFragment; +import net.osdn.gokigen.a01d.logcat.LogCatFragment; import net.osdn.gokigen.a01d.preference.IPreferencePropertyAccessor; import net.osdn.gokigen.a01d.preference.PreferenceFragment; @@ -39,6 +40,7 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver private PreferenceFragment preferenceFragment = null; private OlyCameraPropertyListFragment propertyListFragment = null; + private LogCatFragment logCatFragment = null; @Override protected void onCreate(Bundle savedInstanceState) @@ -230,6 +232,26 @@ public class A01dMain extends AppCompatActivity implements ICameraStatusReceiver } /** + * デバッグ情報画面を開く + * + */ + @Override + public void changeSceneToDebugInformation() + { + if (logCatFragment == null) + { + logCatFragment = LogCatFragment.newInstance(); + } + FragmentTransaction transaction = getSupportFragmentManager().beginTransaction(); + transaction.replace(R.id.fragment1, logCatFragment); + // backstackに追加 + transaction.addToBackStack(null); + transaction.commit(); + } + + + + /** * カメラとの接続・切断のシーケンス */ @Override diff --git a/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java b/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java index 49298ca..1558095 100644 --- a/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java +++ b/app/src/main/java/net/osdn/gokigen/a01d/IChangeScene.java @@ -8,5 +8,6 @@ public interface IChangeScene void changeSceneToCameraPropertyList(); void changeSceneToConfiguration(); void changeCameraConnection(); + void changeSceneToDebugInformation(); void exitApplication(); } diff --git a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java new file mode 100644 index 0000000..533a0d3 --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatFragment.java @@ -0,0 +1,184 @@ +package net.osdn.gokigen.a01d.logcat; + +import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v4.app.FragmentActivity; +import android.support.v4.app.ListFragment; +import android.util.Log; +import android.view.LayoutInflater; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ArrayAdapter; +import android.widget.ListView; +import android.widget.Toast; + +import net.osdn.gokigen.a01d.R; + +import java.util.ArrayList; +import java.util.List; + +/** + * + */ +public class LogCatFragment extends ListFragment +{ + private final String TAG = toString(); + private ArrayAdapter adapter; + private List dataItems = new ArrayList<>(); + private LogCatUpdater updater = new LogCatUpdater(); + public static LogCatFragment newInstance() + { + LogCatFragment instance = new LogCatFragment(); + + // パラメータはBundleにまとめておく + Bundle arguments = new Bundle(); + //arguments.putString("title", title); + //arguments.putString("message", message); + instance.setArguments(arguments); + + //instance.prepare(); + return (instance); + } + + @Override + public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) + { + inflater.inflate(R.menu.debug_view, menu); +/* + String title = getString(R.string.app_name) + " " + getString(R.string.pref_degug_info); + try { + AppCompatActivity activity = (AppCompatActivity) getActivity(); + ActionBar bar = activity.getSupportActionBar(); + if (bar != null) + { + bar.setTitle(title); + } + } + catch (Exception e) + { + e.printStackTrace(); + } +*/ + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) + { + if (item.getItemId() == R.id.action_refresh) + { + update(); + return true; + } + return super.onOptionsItemSelected(item); + } + + /** + * 表示データの更新 + * + */ + private void update() + { + dataItems.clear(); + Thread thread = new Thread(new Runnable() + { + @Override + public void run() + { + Log.v(TAG, "START LOGCAT"); + dataItems = updater.getLogCat("main", "time", "*:v", "gokigen", ""); + Log.v(TAG, "FINISH LOGCAT"); + try + { + final FragmentActivity activity = getActivity(); + if (activity != null) + { + activity.runOnUiThread(new Runnable() + { + @Override + public void run() + { + try + { + // 中身があったらクリアする + if (adapter.getCount() > 0) + { + adapter.clear(); + } + + // リストの内容を更新する + adapter.addAll(dataItems); + + // 最下部にカーソルを移したい + ListView view = activity.findViewById(android.R.id.list); + view.setSelection(dataItems.size()); + + // 更新終了通知 + Toast.makeText(getActivity(), getString(R.string.finish_refresh), Toast.LENGTH_SHORT).show(); + } + catch (Exception ee) + { + ee.printStackTrace(); + } + } + }); + } + } + catch (Exception e) + { + e.printStackTrace(); + } + } + }); + try + { + // 本当は、ここでダイアログを出したい + thread.start(); + } + catch (Exception e) + { + e.printStackTrace(); + } + } + + @Override + public void onResume() + { + super.onResume(); + Log.v(TAG, "onResume()"); + + update(); + } + + @Override + public void onPause() + { + super.onPause(); + Log.v(TAG, "onPause()"); + } + + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + Log.v(TAG, "LogCatFragment::onCreate()"); + } + + @Override + public void onActivityCreated(@Nullable Bundle savedInstanceState) + { + super.onActivityCreated(savedInstanceState); + Log.v(TAG, "LogCatFragment::onActivityCreated()"); + setHasOptionsMenu(true); + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) + { + adapter = new ArrayAdapter<>(inflater.getContext(), android.R.layout.simple_list_item_1, dataItems); + setListAdapter(adapter); + return (super.onCreateView(inflater, container, savedInstanceState)); + } +} diff --git a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatUpdater.java b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatUpdater.java new file mode 100644 index 0000000..57cc0d3 --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatUpdater.java @@ -0,0 +1,70 @@ +package net.osdn.gokigen.a01d.logcat; + + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.ArrayList; +import java.util.List; + +class LogCatUpdater +{ + LogCatUpdater() + { + // + } + + /** + * + * @param ringbuffer : main - メイン ログバッファ, radio - 無線通信や電話に関連するメッセージが含まれるバッファ, events - イベントに関連するメッセージが含まれるバッファ + * @param logFormat : brief - 優先度 / タグとメッセージ発行元プロセスの PID, process - PID のみ, tag - 優先度 / タグのみ, raw - 生のログ, time - 日付、起動時刻、優先度 / タグ、メッセージ発行元プロセスの PID , threadtime - 日付、起動時刻、優先度、タグ、メッセージ発行元スレッドの PID および TID, long - すべてのメタデータ フィールド + * @param filterSpec　: レベル : SFEWIDV + * @param filterString : 指定した文字列がログに含まれている場合に表示 + * @param filterRegEx : 指定した正規表現の文字列がログに含まれている場合に表示 + * @return ログのリスト + */ + + List getLogCat(String ringbuffer, String logFormat, String filterSpec, String filterString, String filterRegEx) + { + final int BUFFER_SIZE = 8192; + ArrayList listItems = new ArrayList(); + try + { + ArrayList commandLine = new ArrayList(); + commandLine.add("logcat"); + commandLine.add("-d"); // -d: dump the log and then exit (don't block) + commandLine.add("-b"); // -b : request alternate ring buffer ('main' (default), 'radio', 'events') + commandLine.add(ringbuffer); // option. + commandLine.add("-v"); // -v : Sets the log print format, where is one of: + commandLine.add(logFormat); // brief process tag thread raw time threadtime long + commandLine.add(filterSpec); // + Process process = Runtime.getRuntime().exec(commandLine.toArray(new String[commandLine.size()])); + + BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(process.getInputStream()), BUFFER_SIZE); + String line = null; + do + { + line = bufferedReader.readLine(); + try + { + int filterLength = filterString.length(); + int filterRegExLength = filterRegEx.length(); + if (((filterLength == 0)&&(filterRegExLength == 0))|| + ((filterLength > 0)&&(line.contains(filterString)))|| + ((filterRegExLength > 0)&&(line.matches(filterRegEx)))) + { + listItems.add(line); + } + } + catch (Exception ee) + { + ee.printStackTrace(); + } + } while (line != null); + } + catch (Exception e) + { + e.printStackTrace(); + } + return (listItems); + } +} diff --git a/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java new file mode 100644 index 0000000..91db174 --- /dev/null +++ b/app/src/main/java/net/osdn/gokigen/a01d/logcat/LogCatViewer.java @@ -0,0 +1,48 @@ +package net.osdn.gokigen.a01d.logcat; + +import android.support.v7.preference.Preference; +import android.util.Log; + +import net.osdn.gokigen.a01d.IChangeScene; + +public class LogCatViewer implements android.support.v7.preference.Preference.OnPreferenceClickListener +{ + private final String TAG = toString(); + private final IChangeScene changeScene; + //private String preferenceKey = null; + + public LogCatViewer(IChangeScene changeScene) + { + this.changeScene = changeScene; + } + + public void prepare() + { + Log.v(TAG, "prepare() "); + } + + @Override + public boolean onPreferenceClick(Preference preference) + { + if (!preference.hasKey()) + { + return (false); + } + + String preferenceKey = preference.getKey(); + if ((preferenceKey.contains("debug_info"))&&(changeScene != null)) + { + try + { + // デバッグ情報を表示する + changeScene.changeSceneToDebugInformation(); + } + catch (Exception e) + { + e.printStackTrace(); + } + return (true); + } + return (false); + } +} diff --git a/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java index 256ac9c..f0eaa08 100644 --- a/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java +++ b/app/src/main/java/net/osdn/gokigen/a01d/preference/PreferenceFragment.java @@ -22,6 +22,7 @@ import net.osdn.gokigen.a01d.camera.olympus.wrapper.property.IOlyCameraProperty; import net.osdn.gokigen.a01d.camera.olympus.wrapper.property.IOlyCameraPropertyProvider; import net.osdn.gokigen.a01d.camera.olympus.IOlympusInterfaceProvider; import net.osdn.gokigen.a01d.camera.olympus.operation.CameraPowerOff; +import net.osdn.gokigen.a01d.logcat.LogCatViewer; import java.util.HashMap; import java.util.Locale; @@ -42,6 +43,7 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar private ICameraRunMode changeRunModeExecutor = null; private CameraPowerOff powerOffController = null; private OlyCameraPowerOnSelector powerOnSelector = null; + private LogCatViewer logCatViewer = null; private SharedPreferences preferences = null; private ProgressDialog busyDialog = null; private PreferenceSynchronizer preferenceSynchronizer = null; @@ -60,6 +62,8 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar powerOffController.prepare(); powerOnSelector = new OlyCameraPowerOnSelector(context); powerOnSelector.prepare(); + logCatViewer = new LogCatViewer(changeScene); + logCatViewer.prepare(); } /** @@ -203,6 +207,7 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar } findPreference("exit_application").setOnPreferenceClickListener(powerOffController); findPreference("olympus_air_bt").setOnPreferenceClickListener(powerOnSelector); + findPreference("debug_info").setOnPreferenceClickListener(logCatViewer); } /** diff --git a/app/src/main/res/menu/debug_view.xml b/app/src/main/res/menu/debug_view.xml new file mode 100644 index 0000000..731369b --- /dev/null +++ b/app/src/main/res/menu/debug_view.xml @@ -0,0 +1,12 @@ + + + + + + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 9e469ca..be5160e 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -71,6 +71,9 @@ Olympus AIRの設定を登録します。 登録しました : + デバッグ情報 + 調査用の情報を表示します + (自動保存) 設定反映 設定保存 @@ -94,4 +97,8 @@ Olympus Camera Kitが動作しないモードのため、カメラのリセットが必要です。電源ボタンを8秒以上長押しして、カメラをリセットしてください。 接続タイムアウト 設定を展開しました。 : + + 更新 + 更新終了 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8a8da73..8ec0bb6 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -82,6 +82,9 @@ Entry your Olympus Air Registerd : + Debug Information + LogCat Information + start check WIFI connecting @@ -99,4 +102,6 @@ Setting Properties… Restored Property : + Refresh + Finished Refresh diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index d4fe4cb..286abf2 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -120,6 +120,7 @@ + + + + + -- 2.11.0