From 0582b05b1f9dc97a71a72e4784452e5a43510256 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 29 十月 2024 17:23:48 +0800
Subject: [PATCH] 2024年10月29日17:21:51
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 0dd24b0..664e55c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -10,6 +10,7 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
+import android.os.SystemClock;
import android.provider.Settings;
import android.text.TextUtils;
@@ -19,6 +20,7 @@
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.google.gson.reflect.TypeToken;
+import com.hdl.link.error.HDLLinkCode;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.device.bean.DeviceOidInfoBean;
import com.hdl.linkpm.sdk.ota.bean.CloudDeviceFirmwaresBean;
@@ -61,7 +63,6 @@
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.NetworkUtils;
import com.hdl.photovoltaic.utils.WifiUtils;
-import com.hdl.sdk.link.common.exception.HDLLinkCode;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
@@ -672,7 +673,7 @@
if (callback != null) {
uniSuccessCallback(type, jsonObject, callback);
}
- HdlLogLogic.print("uni---log---" + localSecret, true);
+ HdlLogLogic.print("uni---log---鏈湴瀵嗛挜鑾峰彇---" + localSecret, true);
}
break;
@@ -685,7 +686,7 @@
UserConfigManage.getInstance().Save();
//閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
- HdlLogLogic.print("uni---log---" + local_encrypt, true);
+ HdlLogLogic.print("uni---log---鏈湴瀵嗛挜璁剧疆---" + local_encrypt, true);
}
}
break;
@@ -750,6 +751,7 @@
HdlDeviceLogic.getInstance().getPasswordVerification(mac, password, new LinkCallBack<LocalResponse>() {
@Override
public void onSuccess(LocalResponse obj) {
+
if (callback != null) {
uniCallbackData(type, obj.getObjects(), obj.getCode(), obj.getMsg(), callback);
}
@@ -757,6 +759,7 @@
@Override
public void onError(HDLLinkException e) {
+
if (callback != null) {
uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
}
@@ -799,7 +802,7 @@
HdlUniLogic.getInstance().openUniMP(path, null);
} else {
HouseIdBean houseIdBean = HouseIdList.get(0);//榛樿鎷跨涓�涓�
- HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
+ HdlResidenceLogic.getInstance().switchHouse(houseIdBean,true);
JsonObject jsonObject = new JsonObject();
jsonObject.addProperty("homeId", houseIdBean.getHomeId());
jsonObject.addProperty("homeName", houseIdBean.getHomeName());
--
Gitblit v1.8.0