サービス一覧画面でリアルタイムにオフライン表示が切り替わらない問題を修正。別のUSB MIDIデバイスに差し替えても前のデバイスとして認識してしまう問題を修正。

Author: masaru-takano

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

@@ -39,6 +39,8 @@
 import java.net.HttpURLConnection;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.logging.Logger;
 
@@ -346,6 +348,8 @@ private String getDirectionName() {
 
     void destroy() {
         mMidiDevice = null;
+        setOnline(false);
+
         mMidiFilePlayer.stop();
         synchronized (mMidiInputBuffers) {
             for (int index = 0; index < mMidiInputBuffers.size(); index++) {
@@ -399,6 +403,8 @@ synchronized void setMidiDevice(final MidiDevice device) {
         for (int port = 0; port < device.getInfo().getOutputPortCount(); port++) {
             connectOutputPort(port);
         }
+
+        setOnline(mMidiDevice != null);
     }
 
     private void connectOutputPort(final int port) {
@@ -473,10 +479,13 @@ static String createServiceId(final MidiDeviceInfo deviceInfo) {
                 deviceType = "usb";
                 UsbDevice device = props.getParcelable(MidiDeviceInfo.PROPERTY_USB_DEVICE);
                 if (device != null) {
-                    deviceId = Integer.toString(device.getDeviceId());
+                    LOGGER.info("createServiceId: USB Device ID = " + device.getDeviceId() + ", MIDI ID = " + deviceInfo.getId());
+                    String deviceName = createServiceName(deviceInfo);
+                    deviceId = device.getDeviceId() + "_" + md5(deviceName);
                 } else {
-                    LOGGER.warning("createServiceId: NO USB DEVICE INFO; id = " + deviceInfo.getId());
-                    deviceId = "midi" + deviceInfo.getId();
+                    
+                    LOGGER.warning("createServiceId: NO USB DEVICE INFO; MIDI ID = " + deviceInfo.getId());
+                    deviceId = "midi_" + deviceInfo.getId();
                 }
                 break;
             }
@@ -505,6 +514,22 @@ static String createServiceId(final MidiDeviceInfo deviceInfo) {
         return concat(array);
     }
 
+    public static String md5(final String s) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            md.update(s.getBytes());
+            byte[] messageDigest = md.digest();
+
+            StringBuilder hex = new StringBuilder();
+            for (int i = 0; i < messageDigest.length; i++) {
+                hex.append(String.format("%02x", messageDigest[i] & 0xFF));
+            }
+            return hex.toString();
+        } catch (NoSuchAlgorithmException e) {
+            return s;
+        }
+    }
+
     private static String createServiceName(final MidiDeviceInfo deviceInfo) {
         Bundle props = deviceInfo.getProperties();
         if (props != null) {

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

@@ -10,12 +10,15 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.logging.Logger;
 
 /**
  * MIDI プラグインのサービス一覧画面.
  */
 public class DConnectMidiServiceListActivity extends DConnectServiceListActivity {
 
+    private final Logger mLogger = Logger.getLogger("midi-plugin");
+
     @Override
     protected Class<? extends DConnectMessageService> getMessageServiceClass() {
         return MidiMessageService.class;
@@ -52,4 +55,22 @@ private List<String> getProfileNameList(final DConnectService service) {
         }
         return result;
     }
+
+    @Override
+    public void onServiceAdded(DConnectService service) {
+        mLogger.info("*** onServiceAdded: name = " + service.getName());
+        super.onServiceAdded(service);
+    }
+
+    @Override
+    public void onServiceRemoved(DConnectService service) {
+        mLogger.info("*** onServiceRemoved: name = " + service.getName());
+        super.onServiceRemoved(service);
+    }
+
+    @Override
+    public void onStatusChange(DConnectService service) {
+        mLogger.info("*** onStatusChange: name = " + service.getName() + " isOnline = " + service.isOnline());
+        super.onStatusChange(service);
+    }
 }