OSDN Git Service

Panasonic用コマンド送信ダイアログ。
authorMRSa <mrsa@myad.jp>
Thu, 25 Jul 2019 15:42:18 +0000 (00:42 +0900)
committerMRSa <mrsa@myad.jp>
Thu, 25 Jul 2019 15:42:18 +0000 (00:42 +0900)
app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/operation/PanasonicSendCommandDialog.java
app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/wrapper/PanasonicLiveViewControl.java

index 0b77e1e..137abf5 100644 (file)
@@ -163,7 +163,19 @@ public class PanasonicSendCommandDialog  extends DialogFragment implements View.
                         commandStr = commandStr + "&" + parameterStr;
                     }
                 }
-                final String sendString = serviceStr + "?" + commandStr;
+                if (serviceStr.contains("pic"))
+                {
+                    serviceStr = camera.getPictureUrl() + serviceStr;
+                }
+                else if (serviceStr.contains("obj"))
+                {
+                    serviceStr = camera.getObjUrl() + serviceStr;
+                }
+                else
+                {
+                    serviceStr = camera.getCmdUrl() + serviceStr;
+                }
+                final String url = serviceStr + "?" + commandStr;
 
                 Thread thread = new Thread(new Runnable() {
                     @Override
@@ -171,7 +183,6 @@ public class PanasonicSendCommandDialog  extends DialogFragment implements View.
                     {
                         try
                         {
-                            String url = camera.getCmdUrl() + sendString;
                             final String response = SimpleHttpClient.httpGet(url, TIMEOUT_MS);
                             Log.v(TAG, "URL : " + url + " RESPONSE : " + response);
                             activity.runOnUiThread(new Runnable() {
index f8ec285..085b37f 100644 (file)
@@ -244,7 +244,7 @@ public class PanasonicLiveViewControl implements ILiveViewControl
             }
         }
         int offset = startPosition - startmarker.length;
-        liveViewListener.onUpdateLiveView(Arrays.copyOfRange(receivedData, offset, dataLength - offset), null);
+        liveViewListener.onUpdateLiveView(Arrays.copyOfRange(receivedData, offset, dataLength - (offset + startmarker.length)), null);
     }
 
     private void receiverThread()