| Révision | d85f7b59ac2babbb25eeea93fcf7cc8fff3e1bec (tree) |
|---|---|
| l'heure | 2021-10-14 23:51:41 |
| Auteur | MRSa <mrsa@myad...> |
| Commiter | MRSa |
Panasonic機のJPEGマーカーの探し方が間違っていたので修正する。
app/src/main/java/net/osdn/gokigen/a01d/camera/panasonic/wrapper/PanasonicLiveViewControl.java (diff)| @@ -48,56 +48,51 @@ public class PanasonicLiveViewControl implements ILiveViewControl | ||
| 48 | 48 | Log.v(TAG, "startLiveView()"); |
| 49 | 49 | try |
| 50 | 50 | { |
| 51 | - Thread thread = new Thread(new Runnable() | |
| 52 | - { | |
| 53 | - @Override | |
| 54 | - public void run() | |
| 51 | + Thread thread = new Thread(() -> { | |
| 52 | + try | |
| 55 | 53 | { |
| 56 | - try | |
| 54 | + startReceiveStream(); | |
| 55 | + if (!whileStreamReceive) | |
| 57 | 56 | { |
| 58 | - startReceiveStream(); | |
| 59 | - if (!whileStreamReceive) | |
| 60 | - { | |
| 61 | - Log.v(TAG, "CANNOT OPEN : UDP RECEIVE SOCKET"); | |
| 62 | - return; | |
| 63 | - } | |
| 64 | - String requestUrl = camera.getCmdUrl() + LIVEVIEW_START_REQUEST; | |
| 65 | - String reply = SimpleHttpClient.httpGet(requestUrl, TIMEOUT_MS); | |
| 66 | - if (!reply.contains("<result>ok</result>")) | |
| 57 | + Log.v(TAG, "CANNOT OPEN : UDP RECEIVE SOCKET"); | |
| 58 | + return; | |
| 59 | + } | |
| 60 | + String requestUrl = camera.getCmdUrl() + LIVEVIEW_START_REQUEST; | |
| 61 | + String reply = SimpleHttpClient.httpGet(requestUrl, TIMEOUT_MS); | |
| 62 | + if (!reply.contains("<result>ok</result>")) | |
| 63 | + { | |
| 64 | + try | |
| 67 | 65 | { |
| 68 | - try | |
| 69 | - { | |
| 70 | - // エラー回数のカウントアップ | |
| 71 | - errorOccur++; | |
| 66 | + // エラー回数のカウントアップ | |
| 67 | + errorOccur++; | |
| 72 | 68 | |
| 73 | - // 少し待つ... | |
| 74 | - Thread.sleep(TIMEOUT_MS); | |
| 69 | + // 少し待つ... | |
| 70 | + Thread.sleep(TIMEOUT_MS); | |
| 75 | 71 | |
| 76 | - if (errorOccur < ERROR_MAX) | |
| 77 | - { | |
| 78 | - Log.v(TAG, "RETRY START LIVEVIEW... : " + errorOccur); | |
| 79 | - startLiveView(); | |
| 80 | - } | |
| 81 | - else | |
| 82 | - { | |
| 83 | - Log.v(TAG, "RETRY OVER : START LIVEVIEW"); | |
| 84 | - } | |
| 72 | + if (errorOccur < ERROR_MAX) | |
| 73 | + { | |
| 74 | + Log.v(TAG, "RETRY START LIVEVIEW... : " + errorOccur); | |
| 75 | + startLiveView(); | |
| 85 | 76 | } |
| 86 | - catch (Exception e) | |
| 77 | + else | |
| 87 | 78 | { |
| 88 | - e.printStackTrace(); | |
| 79 | + Log.v(TAG, "RETRY OVER : START LIVEVIEW"); | |
| 89 | 80 | } |
| 90 | 81 | } |
| 91 | - else | |
| 82 | + catch (Exception e) | |
| 92 | 83 | { |
| 93 | - Log.v(TAG, " ----- START LIVEVIEW ----- : " + requestUrl); | |
| 84 | + e.printStackTrace(); | |
| 94 | 85 | } |
| 95 | 86 | } |
| 96 | - catch (Exception e) | |
| 87 | + else | |
| 97 | 88 | { |
| 98 | - e.printStackTrace(); | |
| 89 | + Log.v(TAG, " ----- START LIVEVIEW ----- : " + requestUrl); | |
| 99 | 90 | } |
| 100 | 91 | } |
| 92 | + catch (Exception e) | |
| 93 | + { | |
| 94 | + e.printStackTrace(); | |
| 95 | + } | |
| 101 | 96 | }); |
| 102 | 97 | thread.start(); |
| 103 | 98 | } |
| @@ -113,30 +108,25 @@ public class PanasonicLiveViewControl implements ILiveViewControl | ||
| 113 | 108 | Log.v(TAG, "stopLiveView()"); |
| 114 | 109 | try |
| 115 | 110 | { |
| 116 | - Thread thread = new Thread(new Runnable() | |
| 117 | - { | |
| 118 | - @Override | |
| 119 | - public void run() | |
| 111 | + Thread thread = new Thread(() -> { | |
| 112 | + try | |
| 120 | 113 | { |
| 121 | - try | |
| 114 | + String reply = SimpleHttpClient.httpGet(camera.getCmdUrl() + LIVEVIEW_STOP_REQUEST, TIMEOUT_MS); | |
| 115 | + if (!reply.contains("<result>ok</result>")) | |
| 122 | 116 | { |
| 123 | - String reply = SimpleHttpClient.httpGet(camera.getCmdUrl() + LIVEVIEW_STOP_REQUEST, TIMEOUT_MS); | |
| 124 | - if (!reply.contains("<result>ok</result>")) | |
| 125 | - { | |
| 126 | - Log.v(TAG, "stopLiveview() reply is fail... " + reply); | |
| 127 | - } | |
| 128 | - else | |
| 129 | - { | |
| 130 | - Log.v(TAG, "stopLiveview() is issued."); | |
| 131 | - } | |
| 132 | - // ライブビューウォッチャーを止める | |
| 133 | - whileStreamReceive = false; | |
| 134 | - closeReceiveSocket(); | |
| 117 | + Log.v(TAG, "stopLiveview() reply is fail... " + reply); | |
| 135 | 118 | } |
| 136 | - catch (Exception e) | |
| 119 | + else | |
| 137 | 120 | { |
| 138 | - e.printStackTrace(); | |
| 121 | + Log.v(TAG, "stopLiveview() is issued."); | |
| 139 | 122 | } |
| 123 | + // ライブビューウォッチャーを止める | |
| 124 | + whileStreamReceive = false; | |
| 125 | + closeReceiveSocket(); | |
| 126 | + } | |
| 127 | + catch (Exception e) | |
| 128 | + { | |
| 129 | + e.printStackTrace(); | |
| 140 | 130 | } |
| 141 | 131 | }); |
| 142 | 132 | thread.start(); |
| @@ -193,12 +183,7 @@ public class PanasonicLiveViewControl implements ILiveViewControl | ||
| 193 | 183 | } |
| 194 | 184 | |
| 195 | 185 | // 受信スレッドを動かす |
| 196 | - Thread thread = new Thread(new Runnable() { | |
| 197 | - @Override | |
| 198 | - public void run() { | |
| 199 | - receiverThread(); | |
| 200 | - } | |
| 201 | - }); | |
| 186 | + Thread thread = new Thread(this::receiverThread); | |
| 202 | 187 | try |
| 203 | 188 | { |
| 204 | 189 | thread.start(); |
| @@ -236,6 +221,10 @@ public class PanasonicLiveViewControl implements ILiveViewControl | ||
| 236 | 221 | break; |
| 237 | 222 | } |
| 238 | 223 | } |
| 224 | + else | |
| 225 | + { | |
| 226 | + searchIndex = 0; | |
| 227 | + } | |
| 239 | 228 | } |
| 240 | 229 | catch (Exception e) |
| 241 | 230 | { |
Fork