| 修订版 | dc298bd22d2bdfe63cbd014b27fc45bc13852423 (tree) |
|---|---|
| 时间 | 2020-10-21 23:38:26 |
| 作者 | MRSa <mrsa@myad...> |
| Commiter | MRSa |
NikonのLV、すこし改善。
app/src/main/java/net/osdn/gokigen/a01d/camera/nikon/wrapper/NikonInterfaceProvider.java (diff) app/src/main/java/net/osdn/gokigen/a01d/camera/nikon/wrapper/command/messages/specific/NikonLiveViewRequestMessage.java (diff)
app/src/main/java/net/osdn/gokigen/a01d/camera/ptpip/wrapper/command/PtpIpCommandPublisher.kt (diff)| @@ -65,7 +65,7 @@ public class NikonInterfaceProvider implements IPtpIpInterfaceProvider, IDisplay | ||
| 65 | 65 | { |
| 66 | 66 | this.activity = context; |
| 67 | 67 | commandPublisher = new PtpIpCommandPublisher(CAMERA_IP, CONTROL_PORT, true, false); |
| 68 | - liveViewControl = new NikonLiveViewControl(context, this, 20); | |
| 68 | + liveViewControl = new NikonLiveViewControl(context, this, 30); | |
| 69 | 69 | asyncReceiver = new PtpIpAsyncResponseReceiver(CAMERA_IP, ASYNC_RESPONSE_PORT); |
| 70 | 70 | statusChecker = new NikonStatusChecker(activity, commandPublisher, CAMERA_IP, EVENT_PORT); |
| 71 | 71 | canonConnection = new NikonConnection(context, provider, this, statusChecker); |
| @@ -64,13 +64,13 @@ public class NikonLiveViewRequestMessage extends PtpIpCommandBase | ||
| 64 | 64 | @Override |
| 65 | 65 | public boolean isRetrySend() |
| 66 | 66 | { |
| 67 | - return (true); | |
| 67 | + return (false); | |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | @Override |
| 71 | 71 | public int maxRetryCount() |
| 72 | 72 | { |
| 73 | - return (5); | |
| 73 | + return (3); | |
| 74 | 74 | } |
| 75 | 75 | |
| 76 | 76 | @Override |
| @@ -338,10 +338,12 @@ class PtpIpCommandPublisher(private val ipAddress : String, private val portNumb | ||
| 338 | 338 | return (if (callback != null && callback.isReceiveMulti) |
| 339 | 339 | { |
| 340 | 340 | // 受信したら逐次「受信したよ」と応答するパターン |
| 341 | + Log.v(TAG, " receiveMulti() : $delayMs [id:${command.id}]") | |
| 341 | 342 | receiveMulti(command, delayMs) |
| 342 | 343 | } |
| 343 | 344 | else |
| 344 | 345 | { |
| 346 | + Log.v(TAG, " receiveSingle() : $delayMs [id:${command.id}]") | |
| 345 | 347 | receiveSingle(command, delayMs) |
| 346 | 348 | }) |
| 347 | 349 | // 受信した後、すべてをまとめて「受信したよ」と応答するパターン |
| @@ -445,6 +447,8 @@ class PtpIpCommandPublisher(private val ipAddress : String, private val portNumb | ||
| 445 | 447 | Log.v(TAG, " --- SEND RETRY ---") |
| 446 | 448 | return (true) |
| 447 | 449 | } |
| 450 | + callback?.receivedMessage(id, null) | |
| 451 | + return (false) | |
| 448 | 452 | } |
| 449 | 453 | var targetLength: Int |
| 450 | 454 | var receivedLength: Int |
Fork