From b7a362520016a5ba61eb646211734ffd40a0b4af Mon Sep 17 00:00:00 2001 From: MRSa Date: Sun, 5 Aug 2018 11:15:24 +0900 Subject: [PATCH] =?utf8?q?=E8=A8=AD=E5=AE=9A=E7=94=BB=E9=9D=A2=E3=82=92?= =?utf8?q?=E8=A1=A8=E7=A4=BA=E3=81=99=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?= =?utf8?q?=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 2 -- .../liveview/LiveViewClickTouchListener.java | 11 ++++----- .../gr2control/liveview/LiveViewFragment.java | 15 ++++++++++++- .../preference/IPreferencePropertyAccessor.java | 4 +++- .../ricohgr2/RicohGr2PreferenceFragment.java | 14 +++++++----- app/src/main/res/drawable/ic_raw_black_1x.png | Bin 0 -> 272 bytes .../main/res/drawable/ic_settings_black_24dp.xml | 9 ++++++++ .../main/res/layout-land/fragment_live_view.xml | 14 ++++++++++++ app/src/main/res/values-ja/styles.xml | 2 +- app/src/main/res/values/strings.xml | 7 +++++- app/src/main/res/xml/preferences_ricoh_gr2.xml | 25 +++++++++++++++++++-- 11 files changed, 85 insertions(+), 18 deletions(-) create mode 100644 app/src/main/res/drawable/ic_raw_black_1x.png create mode 100644 app/src/main/res/drawable/ic_settings_black_24dp.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b59c59a..7e3de3f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,11 +17,9 @@ - - diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java index 22bb391..3e6a687 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewClickTouchListener.java @@ -140,6 +140,12 @@ class LiveViewClickTouchListener implements View.OnClickListener, View.OnTouchLi confirmExitApplication(); break; + case R.id.show_preference_button: + // カメラの設定 + changeScene.changeSceneToConfiguration(); + break; + + /* case R.id.show_hide_grid_button: // グリッドの ON/OFF @@ -147,11 +153,6 @@ class LiveViewClickTouchListener implements View.OnClickListener, View.OnTouchLi statusViewDrawer.updateGridIcon(); break; - case R.id.show_preference_button: - // カメラの設定 - changeScene.changeSceneToConfiguration(); - break; - case R.id.camera_property_settings_button: // カメラのプロパティ設定 changeScene.changeSceneToCameraPropertyList(); diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java index ac40051..9a6893a 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/liveview/LiveViewFragment.java @@ -7,6 +7,8 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v4.app.Fragment; import android.support.v4.content.res.ResourcesCompat; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; import android.support.v7.preference.PreferenceManager; import android.util.Log; import android.view.LayoutInflater; @@ -154,6 +156,7 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo setOnClickListener(view, R.id.focusUnlockImageView); setOnClickListener(view, R.id.show_images_button); setOnClickListener(view, R.id.camera_power_off_button); + setOnClickListener(view, R.id.show_preference_button); /* view.findViewById(R.id.show_preference_button).setOnClickListener(onClickTouchListener); @@ -463,6 +466,17 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo { super.onResume(); Log.v(TAG, "onResume() Start"); + + AppCompatActivity activity = (AppCompatActivity)getActivity(); + if (activity != null) + { + ActionBar bar = activity.getSupportActionBar(); + if (bar != null) + { + bar.hide(); // ActionBarの表示を消す + } + } + /* // 撮影モードかどうかを確認して、撮影モードではなかったら撮影モードに切り替える if ((changeRunModeExecutor != null)&&(!changeRunModeExecutor.isRecordingMode())) @@ -562,7 +576,6 @@ public class LiveViewFragment extends Fragment implements IStatusViewDrawer, IFo public void startLiveView() { ICameraConnection.CameraConnectionMethod connectionMethod = interfaceProvider.getCammeraConnectionMethod(); - if (liveViewControl == null) { if (connectionMethod == ICameraConnection.CameraConnectionMethod.OPC) diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/preference/IPreferencePropertyAccessor.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/IPreferencePropertyAccessor.java index 8b4e1ec..7fdaeab 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/IPreferencePropertyAccessor.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/IPreferencePropertyAccessor.java @@ -18,6 +18,8 @@ public interface IPreferencePropertyAccessor String SOUND_VOLUME_LEVEL = "sound_volume_level"; String SOUND_VOLUME_LEVEL_DEFAULT_VALUE = "OFF"; + String USE_PLAYBACK_MENU = "use_playback_menu"; + String RAW = "raw"; String LIVE_VIEW_QUALITY = "live_view_quality"; @@ -41,7 +43,7 @@ public interface IPreferencePropertyAccessor String OLYCAMERA_BLUETOOTH_SETTINGS = "olympus_air_bt"; String CONNECTION_METHOD = "connection_method"; - String CONNECTION_METHOD_DEFAULT_VALUE = "OPC"; + String CONNECTION_METHOD_DEFAULT_VALUE = "RICOH_GR2"; String GR2_DISPLAY_MODE = "gr2_display_mode"; String GR2_DISPLAY_MODE_DEFAULT_VALUE = "0"; diff --git a/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java index 974a8e5..be93792 100644 --- a/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java +++ b/app/src/main/java/net/osdn/gokigen/gr2control/preference/ricohgr2/RicohGr2PreferenceFragment.java @@ -75,7 +75,6 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem { super.onAttach(activity); Log.v(TAG, "onAttach()"); - try { // Preference をつかまえる @@ -109,6 +108,9 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem if (!items.containsKey(IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW)) { editor.putBoolean(IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW, true); } + if (!items.containsKey(IPreferencePropertyAccessor.USE_PLAYBACK_MENU)) { + editor.putBoolean(IPreferencePropertyAccessor.USE_PLAYBACK_MENU, false); + } if (!items.containsKey(IPreferencePropertyAccessor.CONNECTION_METHOD)) { editor.putString(IPreferencePropertyAccessor.CONNECTION_METHOD, IPreferencePropertyAccessor.CONNECTION_METHOD_DEFAULT_VALUE); } @@ -149,6 +151,11 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem Log.v(TAG, " " + key + " , " + value); break; + case IPreferencePropertyAccessor.USE_PLAYBACK_MENU: + value = preferences.getBoolean(key, false); + Log.v(TAG, " " + key + " , " + value); + break; + case IPreferencePropertyAccessor.GR2_LCD_SLEEP: value = preferences.getBoolean(key, false); Log.v(TAG, " " + key + " , " + value); @@ -213,7 +220,6 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem { super.onResume(); Log.v(TAG, "onResume() Start"); - try { synchronizedProperty(); @@ -224,7 +230,6 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem } Log.v(TAG, "onResume() End"); - } /** @@ -236,7 +241,6 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem { super.onPause(); Log.v(TAG, "onPause() Start"); - try { // Preference変更のリスナを解除 @@ -317,8 +321,8 @@ public class RicohGr2PreferenceFragment extends PreferenceFragmentCompat implem // Preferenceの画面に反映させる setBooleanPreference(IPreferencePropertyAccessor.AUTO_CONNECT_TO_CAMERA, IPreferencePropertyAccessor.AUTO_CONNECT_TO_CAMERA, defaultValue); setBooleanPreference(IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW, IPreferencePropertyAccessor.CAPTURE_BOTH_CAMERA_AND_LIVE_VIEW, defaultValue); + setBooleanPreference(IPreferencePropertyAccessor.USE_PLAYBACK_MENU, IPreferencePropertyAccessor.USE_PLAYBACK_MENU, defaultValue); setBooleanPreference(IPreferencePropertyAccessor.GR2_LCD_SLEEP, IPreferencePropertyAccessor.GR2_LCD_SLEEP, defaultValue); - } catch (Exception e) { diff --git a/app/src/main/res/drawable/ic_raw_black_1x.png b/app/src/main/res/drawable/ic_raw_black_1x.png new file mode 100644 index 0000000000000000000000000000000000000000..980f2b719e519b718e86cf4ad4ae088d63ff60f6 GIT binary patch literal 272 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|Y$ZW{!3_UF&^$uA7ASJm)5S5Q zB5vv=Tdo!Zf!6t_Cs~Pa@DL8-TGXj_+U=37pLN!;@|tY6|a@r#+^{k7Bf87#QQz`vB4en>gf1Ftx4Cf T-1zJZ^bmumtDnm{r-UW|w2yKW literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml new file mode 100644 index 0000000..ace746c --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout-land/fragment_live_view.xml b/app/src/main/res/layout-land/fragment_live_view.xml index 797ddc4..25cc52f 100644 --- a/app/src/main/res/layout-land/fragment_live_view.xml +++ b/app/src/main/res/layout-land/fragment_live_view.xml @@ -115,6 +115,20 @@ android:textStyle="normal" android:textSize="6pt" /> + @color/colorPrimary @color/colorPrimaryDark @color/colorAccent + @style/PreferenceThemeOverlay - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5274a0f..df66f24 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,8 +36,13 @@ Auto Connect To Camera Normally to keep ON. + Others + Share after Save + Use playback screen menu + + GOKIGEN - A01d Instructions + Instructions Privacy Policy This feature is only available for a OPC Camera. diff --git a/app/src/main/res/xml/preferences_ricoh_gr2.xml b/app/src/main/res/xml/preferences_ricoh_gr2.xml index 5ed4cbe..a35e379 100644 --- a/app/src/main/res/xml/preferences_ricoh_gr2.xml +++ b/app/src/main/res/xml/preferences_ricoh_gr2.xml @@ -47,15 +47,36 @@ + + + + + + android:data="https://osdn.net/projects/gokigen/wiki/GR2Control" />