From 7144851df5b937afba441b53e1f090b4fb4ea44b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 28 十月 2024 15:10:40 +0800
Subject: [PATCH] 修复c端token创新的问题
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 65 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 30 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 768cb99..fc9a55e 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;
@@ -29,6 +30,7 @@
import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
import com.hdl.photovoltaic.HDLApp;
import com.hdl.photovoltaic.R;
+import com.hdl.photovoltaic.bean.LocalResponse;
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
@@ -671,46 +673,26 @@
if (callback != null) {
uniSuccessCallback(type, jsonObject, callback);
}
- HdlLogLogic.print("uni---log---" + localSecret, true);
+ HdlLogLogic.print("uni---log---鏈湴瀵嗛挜鑾峰彇---" + localSecret, true);
}
break;
//鏈湴瀵嗛挜璁剧疆
case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_SET: {
String local_encrypt = getKeyValue("local_encrypt", getKeyValue("data", data));
- //閲嶆柊璁剧疆鏈湴閫氳绉橀挜
- UserConfigManage.getInstance().setLocalSecret(local_encrypt);
- UserConfigManage.getInstance().Save();
- //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
- HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
- HdlLogLogic.print("uni---log---" + local_encrypt, true);
-
+ if (!TextUtils.isEmpty(local_encrypt)) {
+ //閲嶆柊璁剧疆鏈湴閫氳绉橀挜
+ UserConfigManage.getInstance().setLocalSecret(local_encrypt);
+ UserConfigManage.getInstance().Save();
+ //閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
+ HDLLinkConfig.getInstance().setLocalSecret(local_encrypt);
+ HdlLogLogic.print("uni---log---鏈湴瀵嗛挜璁剧疆---" + local_encrypt, true);
+ }
}
break;
//link杩涜瀵嗙爜楠岃瘉
case HDLUniMP.UNI_EVENT_REPLY_OTHER_Password_verifiy: {
- String password = getKeyValue("password", getKeyValue("data", data));
- String mac = getKeyValue("mac", getKeyValue("data", data));
-
- String requestUrl = TopicApi.DELETING_GATEWAY_password_verifiy;
- JsonObject json = new JsonObject();
- json.addProperty("password", password);
- json.addProperty("mac", mac);
- TcpClient.getInstance().sendDataToLinkGateway(mac, true, requestUrl, json, "", new HDLLinkCallBack() {
- @Override
- public void onSuccess(String msg) {
- if (callback != null) {
- uniSuccessCallback(type, msg, callback);
- }
- }
-
- @Override
- public void onError(HDLLinkException e) {
- if (callback != null) {
- uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
- }
- }
- });
+ uniCheckPasswordVerification(mode_type, data, callback);
}
break;
}
@@ -761,6 +743,29 @@
//region ******uni鎺ュ彛鏂规硶******
/**
+ * link杩涜瀵嗙爜楠岃瘉
+ */
+ private void uniCheckPasswordVerification(String type, Object data, DCUniMPJSCallback callback) {
+ String password = getKeyValue("password", getKeyValue("data", data));
+ String mac = getKeyValue("mac", getKeyValue("data", data));
+ 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);
+ }
+ }
+
+ @Override
+ public void onError(HDLLinkException e) {
+ if (callback != null) {
+ uniCallbackData(type, null, e.getCode(), e.getMsg(), callback);
+ }
+ }
+ });
+ }
+
+ /**
* 鐢电珯鍒犻櫎
*/
private void uniGetDelResidence(String type, Object data, DCUniMPJSCallback callback) {
--
Gitblit v1.8.0