GR3のAF駆動応答に focused 情報がないので エラーログにしないようにした。

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt
index 647cf25..ee5fc69 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/camera/ricohpentax/operation/takepicture/RicohGr2AutoFocusControl.kt
@@ -188,14 +188,23 @@ class RicohGr2AutoFocusControl(private val frameDisplayer: IAutoFocusFrameDispla
             var afResult = false
             try
             {
-                Log.v(TAG, " findTouchAFPositionResult() : $replyString")
+                //Log.v(TAG, " findTouchAFPositionResult() : $replyString")
                 val resultObject = JSONObject(replyString)
                 val result = resultObject.getString("errMsg")
-                val focused = resultObject.getBoolean("focused")
-                if (result.contains("OK"))
+                try
+                {
+                    val focused = resultObject.getBoolean("focused")
+                    if (result.contains("OK"))
+                    {
+                        afResult = focused
+                        Log.v(TAG, "AF drive Result : $afResult")
+                    }
+                }
+                catch (e : Exception)
                 {
-                    afResult = focused
-                    Log.v(TAG, "AF Result : $afResult")
+                    // GR3 は、 focusedを返してくれないので、
+                    Log.v(TAG, " AF Result : $replyString")
+                    afResult = result.contains("OK")
                 }
             }
             catch (e: Exception)

diff --git a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
index a4bd42d..45c36e3 100644 (file)
--- a/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
+++ b/app/src/main/java/jp/osdn/gokigen/gokigenassets/liveview/LiveImageViewFragment.kt
@@ -184,12 +184,12 @@ class LiveImageViewFragment(private val contentLayoutId: Int = ID_LIVE_VIEW_LAYO
             }
             if ((!isCameraControl0)&&(!isCameraControl1))
             {
-                val area = liveviewView.findViewById<LiveImageView>(ID_VIEW_UPPER_AREA)
+                val area = liveviewView.findViewById<View>(ID_VIEW_UPPER_AREA)
                 area.visibility = View.GONE
             }
             if ((!isCameraControl2)&&(!isCameraControl3))
             {
-                val area = liveviewView.findViewById<LiveImageView>(ID_VIEW_LOWER_AREA)
+                val area = liveviewView.findViewById<View>(ID_VIEW_LOWER_AREA)
                 area.visibility = View.GONE
             }
             liveviewView.postInvalidate()