From 80f2ca2df62ff1cd03046864af504245be078eb2 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 05 六月 2025 10:37:28 +0800
Subject: [PATCH] 2025年06月05日10:37:26

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java |   50 ++++++++++++++++++++++++++++----------------------
 1 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java
index 35720bf..e7f7f5a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java
@@ -1,18 +1,26 @@
 package com.hdl.photovoltaic.other;
 
+import android.provider.Settings;
+import android.text.TextUtils;
+
 import com.google.gson.Gson;
 import com.google.gson.JsonObject;
 import com.google.gson.reflect.TypeToken;
 import com.hdl.hdlhttp.HxHttp;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.HDLApp;
 import com.hdl.photovoltaic.bean.HttpResponsePack;
+import com.hdl.photovoltaic.bean.MqttInfo;
 import com.hdl.photovoltaic.internet.HttpClient;
 import com.hdl.photovoltaic.internet.api.HttpApi;
 import com.hdl.photovoltaic.listener.BaseSuccessFailureCallBeak;
 import com.hdl.photovoltaic.listener.CloudCallBeak;
 import com.hdl.photovoltaic.ui.bean.CloudInverterChildDeviceBean;
+import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo;
 
 import java.lang.reflect.Type;
 import java.util.List;
+import java.util.Random;
 
 import io.reactivex.rxjava3.disposables.Disposable;
 
@@ -40,40 +48,38 @@
     }
 
     /**
-     * 鑾峰彇閫嗗彉鍣�(鑾峰彇璁惧杩滅▼閫氳淇℃伅)
+     * 鑾峰彇mqtt杩滅▼杩炴帴鏁版嵁
      *
-     * @param homeId        浣忓畢Id
-     * @param spk           spk
-     * @param mac           璁惧mac
+     * @param homeType      浣忓畢绫诲瀷 (1.ZIGBEE 2.BUSPRO 3.A 4.ALL锛�
      * @param cloudCallBeak 鍥炶皟
      */
-    public void getDeviceRemoteInfo(String homeId, String spk, String mac, CloudCallBeak<String> cloudCallBeak) {
-        String requestUrl = HttpApi.POST_Device_remoteInfo;
+    public void getMqttRemoteInfo(String homeType, CloudCallBeak<MqttInfo> cloudCallBeak) {
+        String requestUrl = HttpApi.POST_Mqtt_GetRemoteInfo;
+        int randomNumberClientId = new Random().nextInt(1000000000);
+        String deviceUuid = Settings.System.getString(HDLApp.getInstance().getContentResolver(), Settings.System.ANDROID_ID);
         JsonObject json = new JsonObject();
-        json.addProperty("homeId", homeId);
-        json.addProperty("spk", spk);
-        json.addProperty("mac", mac);
-        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), true, true, new BaseSuccessFailureCallBeak() {
+        json.addProperty("attachClientId", randomNumberClientId);
+        json.addProperty("homeType", homeType);
+        json.addProperty("deviceUuid", deviceUuid);
+        HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
             @Override
-            public void onSuccess(HttpResponsePack httpResponsePack) {
-//                if (httpResponsePack != null && httpResponsePack.getData() != null) {
-//                    Gson gson = new Gson();
-//                    String json = gson.toJson(httpResponsePack.getData());
-//                    Type typeOfT = new TypeToken<List<CloudInverterChildDeviceBean>>() {
-//                    }.getType();
-//                    if (cloudCallBeak != null) {
-//                        cloudCallBeak.onSuccess("list");
-//                    }
-//                }
+            public void onSuccess(String jsonStr) {
+                Type type = new TypeToken<MqttInfo>() {
+                }.getType();
+                MqttInfo mqttInfo = new Gson().fromJson(jsonStr, type);
+                if (cloudCallBeak != null) {
+                    cloudCallBeak.onSuccess(mqttInfo);
+                }
             }
 
             @Override
-            public void onFailure(Exception exception) {
+            public void onFailure(HDLException e) {
                 if (cloudCallBeak != null) {
-                    cloudCallBeak.onFailure(exception);
+                    cloudCallBeak.onFailure(e);
                 }
             }
         });
 
     }
+
 }

--
Gitblit v1.8.0