撮影モード変更時の処理を変更。

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/ICameraController.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/ICameraController.java
index 15d98d6..18c586f 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/ICameraController.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/ICameraController.java
@@ -22,6 +22,9 @@ import jp.sfjp.gokigen.a01c.preference.PreferenceAccessWrapper;
  */
 public interface ICameraController
 {
+    /** 接続終了(ライブビュースタート前の準備) **/
+    void connectFinished();
+
     /** ライブビュー関係 **/
     void setLiveViewListener(@NonNull CameraLiveViewListenerImpl listener);
     void changeLiveViewSize(String size);

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java
index 7910fcd..83c4f5d 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/MainActivity.java
@@ -516,6 +516,7 @@ public class MainActivity extends AppCompatActivity implements  IChangeScene, IS
         try
         {
             // ライブビューの開始 ＆ タッチ/ボタンの操作を可能にする
+            currentCoordinator.connectFinished();
             currentCoordinator.startLiveView();
             currentCoordinator.setRecViewMode(false);
             listener.setEnableOperation(operation.ENABLE);

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/OlyCameraCoordinator.java b/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/OlyCameraCoordinator.java
index 356232d..745f053 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/OlyCameraCoordinator.java
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/olycamerawrapper/OlyCameraCoordinator.java
@@ -114,6 +114,12 @@ public class OlyCameraCoordinator implements ICameraController, IIndicatorContro
     }
 
     @Override
+    public void connectFinished()
+    {
+        // 何もしない
+    }
+
+    @Override
     public void setLiveViewListener(@NonNull CameraLiveViewListenerImpl listener)
     {
         Log.v(TAG, "setLiveViewListener()");

diff --git a/wear/src/main/java/jp/sfjp/gokigen/a01c/thetacamerawrapper/ThetaCameraController.kt b/wear/src/main/java/jp/sfjp/gokigen/a01c/thetacamerawrapper/ThetaCameraController.kt
index b8d618f..10fc220 100644 (file)
--- a/wear/src/main/java/jp/sfjp/gokigen/a01c/thetacamerawrapper/ThetaCameraController.kt
+++ b/wear/src/main/java/jp/sfjp/gokigen/a01c/thetacamerawrapper/ThetaCameraController.kt
@@ -39,6 +39,19 @@ class ThetaCameraController(val context: AppCompatActivity, private val focusFra
     private val movieShot = ThetaMovieRecordingControl(context, sessionIdHolder, this, showInformation, this)
     private val optionSet = ThetaOptionUpdateControl(sessionIdHolder, this, this)
 
+    override fun connectFinished()
+    {
+        try
+        {
+            // スチルモードに切り替える
+            changeCaptureImageMode(sessionIdHolder.isApiLevelV21())
+        }
+        catch (e : Exception)
+        {
+            e.printStackTrace()
+        }
+    }
+
     override fun setLiveViewListener(listener: CameraLiveViewListenerImpl)
     {
         Log.v(TAG, " setLiveViewListener() : ${sessionIdHolder.isApiLevelV21()} ")
@@ -55,9 +68,6 @@ class ThetaCameraController(val context: AppCompatActivity, private val focusFra
     {
         try
         {
-            // スチルモードに切り替える
-            changeCaptureImageMode(sessionIdHolder.isApiLevelV21())
-
             // ライブビューの表示...
             if (::liveViewControl.isInitialized)
             {