From 32b5f366ceaad4aa9a33eccf0b109eef24175495 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 10 十月 2023 14:55:01 +0800
Subject: [PATCH] 2023年10月10日14:54:56
---
app/src/main/java/com/hdl/photovoltaic/other/HdlMqttLogic.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 233b542..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,19 +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;
@@ -41,31 +48,28 @@
}
/**
- * 鑾峰彇閫嗗彉鍣�(鑾峰彇璁惧杩滅▼閫氳淇℃伅)
+ * 鑾峰彇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);
+ 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(String jsonStr) {
-// 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");
-// }
-// }
+ Type type = new TypeToken<MqttInfo>() {
+ }.getType();
+ MqttInfo mqttInfo = new Gson().fromJson(jsonStr, type);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(mqttInfo);
+ }
}
@Override
@@ -77,4 +81,5 @@
});
}
+
}
--
Gitblit v1.8.0