GET /gotapi/midi/onMessage の実装を追加。

Author: masaru-takano

dConnectDevicePlugin/dConnectDeviceMidi/plugin/src/main/java/org/deviceconnect/android/deviceplugin/midi/DConnectMidiDeviceService.java

@@ -85,6 +85,10 @@ public class DConnectMidiDeviceService extends DConnectService implements MidiMe
      */
     private final ServiceInfo mServiceInfo;
 
+    /**
+     * 直前の MIDI メッセージ受信イベント.
+     */
+    private MidiMessageEvent mLastMessageEvent;
 
     private DConnectMidiDeviceService(final @NonNull String serviceId, final MidiDeviceInfo deviceInfo) {
         super(serviceId);
@@ -213,6 +217,25 @@ public boolean onRequest(final Intent request, final Intent response) {
                     }
                 });
 
+                // GET /gotapi/midi/onMessage
+                addApi(new GetApi() {
+                    @Override
+                    public String getAttribute() {
+                        return "onMessage";
+                    }
+
+                    @Override
+                    public boolean onRequest(final Intent request, final Intent response) {
+                        MidiMessageEvent lastEvent = mLastMessageEvent;
+                        if (lastEvent != null) {
+                            response.putExtra("message", lastEvent.getMessage());
+                            response.putExtra("port", lastEvent.getPort());
+                        }
+                        setResult(response, DConnectMessage.RESULT_OK);
+                        return true;
+                    }
+                });
+
                 // PUT /gotapi/midi/onMessage
                 addApi(new PutApi() {
                     @Override
@@ -395,17 +418,21 @@ public void onSend(final byte[] data, final int offset, final int count, final l
                 List<Event> events = EventManager.INSTANCE.getEventList(getId(), "midi", null, "onMessage");
                 String message = stringify(data, offset, count);
                 LOGGER.info("Event: /midi/onMessage: size = " + events.size() + ", message = " + message);
+
+                MidiMessageEvent messageEvent = new MidiMessageEvent(port, message);
                 for (Event event : events) {
                     Intent intent = EventManager.createEventMessage(event);
-                    intent.putExtra("message", stringify(data, offset, count));
-                    intent.putExtra("port", port);
+                    intent.putExtra("message", messageEvent.getMessage());
+                    intent.putExtra("port", messageEvent.getPort());
                     getPluginContext().sendEvent(intent, event.getAccessToken());
                 }
 
                 MidiMessage midiMessage = mMessageParser.parse(data, offset, count);
                 if (midiMessage != null) {
                     handleParsedMessage(port, midiMessage, timestamp);
                 }
+
+                mLastMessageEvent = messageEvent;
             }
         };
     }
@@ -478,17 +505,6 @@ static String createServiceId(final MidiDeviceInfo deviceInfo) {
         return concat(array);
     }
 
-    static String createServiceId(final BluetoothDevice device) {
-        final String deviceType = "bluetooth";
-        final String deviceId = device.getAddress();
-        final String[] array = {
-                "midi",
-                deviceType,
-                deviceId
-        };
-        return concat(array);
-    }
-
     private static String createServiceName(final MidiDeviceInfo deviceInfo) {
         Bundle props = deviceInfo.getProperties();
         if (props != null) {
@@ -521,4 +537,22 @@ private String stringify(final byte[] message, final int offset, final int count
         }
         return result.toString();
     }
+
+    private static class MidiMessageEvent {
+        private final int mPort;
+        private final String mMessage;
+
+        public MidiMessageEvent(final int port, final String message) {
+            mPort = port;
+            mMessage = message;
+        }
+
+        public int getPort() {
+            return mPort;
+        }
+
+        public String getMessage() {
+            return mMessage;
+        }
+    }
 }