Added Device list request

hubaksis · Sep 23, 2021 · 9a1bf04 · 9a1bf04
1 parent eb2a798
commit 9a1bf04
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 0 deletions.
diff --git a/...org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoCommand.java b/...org.openhab.binding.miio/src/main/java/org/openhab/binding/miio/internal/MiIoCommand.java
@@ -114,6 +114,10 @@ public enum MiIoCommand {
     GET_NIGHTLIGHT_RGB("get_night_light_rgb"),
     GET_LUMI_BIND("get_lumi_bind"),
 
+    TELNET_ENABLE("enable_telnet_service"),
+
+    GET_DEVICE_LIST("get_device_list"),
+
     UNKNOWN("");
 
     private final String command;

diff --git a/...ing.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoAbstractHandler.java b/...ing.miio/src/main/java/org/openhab/binding/miio/internal/handler/MiIoAbstractHandler.java
@@ -47,6 +47,9 @@
 import org.openhab.binding.miio.internal.basic.MiIoDatabaseWatchService;
 import org.openhab.binding.miio.internal.cloud.CloudConnector;
 import org.openhab.binding.miio.internal.transport.MiIoAsyncCommunication;
+
+import org.openhab.binding.miio.internal.json.GatewayDevicesList;
+
 import org.openhab.core.cache.ExpiringCache;
 import org.openhab.core.common.NamedThreadFactory;
 import org.openhab.core.config.core.Configuration;
@@ -467,6 +470,11 @@ private void updateDeviceIdConfig(String deviceId) {
 
     protected boolean initializeData() {
         this.miioCom = getConnection();
+
+        if (this.miioCom != null && this instanceof MiIoGatewayHandler) {
+            sendCommand(MiIoCommand.GET_DEVICE_LIST);
+        }
+
         return true;
     }
 
@@ -649,6 +657,9 @@ public void onMessageReceived(MiIoSendCommand response) {
                     }
                     updateNetwork(response.getResult().getAsJsonObject());
                     break;
+                case GET_DEVICE_LIST:
+                    parseDeviceList(response.getResponse().toString());
+                    break;
                 default:
                     break;
             }
@@ -663,4 +674,12 @@ public void onMessageReceived(MiIoSendCommand response) {
             logger.debug("Error while handing message {}", response.getResponse(), e);
         }
     }
+
+    private void parseDeviceList(String str){
+        GatewayDevicesList message = new Gson().fromJson(str, GatewayDevicesList.class);
+        logger.info("Found devices count: {}", message.result.size());
+        //if(bridge != null)
+        //    bridge.getDevicesListRequestCompleted(message);
+
+    }
 }
diff --git a/....binding.miio/src/main/java/org/openhab/binding/miio/internal/json/GatewayDeviceItem.java b/....binding.miio/src/main/java/org/openhab/binding/miio/internal/json/GatewayDeviceItem.java
@@ -0,0 +1,24 @@
+package org.openhab.binding.miio.internal.json;
+
+import org.eclipse.jdt.annotation.Nullable;
+import org.eclipse.jdt.annotation.NonNull;
+
+import com.google.gson.annotations.SerializedName;
+
+public class GatewayDeviceItem {
+    @SerializedName("did")
+    @NonNull
+    public String did = "";
+
+    @SerializedName("model")
+    @NonNull
+    public String model = "";
+
+    @SerializedName("num")
+    @Nullable
+    public Integer num;
+
+    @SerializedName("total")
+    @Nullable
+    public Integer total;
+}
diff --git a/...binding.miio/src/main/java/org/openhab/binding/miio/internal/json/GatewayDevicesList.java b/...binding.miio/src/main/java/org/openhab/binding/miio/internal/json/GatewayDevicesList.java
@@ -0,0 +1,20 @@
+package org.openhab.binding.miio.internal.json;
+
+import org.eclipse.jdt.annotation.Nullable;
+
+import com.google.gson.annotations.SerializedName;
+
+import org.eclipse.jdt.annotation.NonNullByDefault;
+import java.util.List;
+
+
+@NonNullByDefault
+public class GatewayDevicesList {
+    @SerializedName("code")
+    @Nullable
+    public Integer code;
+
+    @SerializedName("result")
+    @Nullable
+    public List<GatewayDeviceItem> result;
+}