From 8c04e8e9e28f7fdf1df36f2630bd998d0acc746c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 21 十月 2024 14:01:41 +0800
Subject: [PATCH] 更新uniSDk后，Android14打开uni界面正常
---
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 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 ab8b31b..8e4e0a7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -10,8 +10,6 @@
import android.location.Location;
import android.location.LocationManager;
import android.os.IBinder;
-import android.os.SystemClock;
-import android.print.PageRange;
import android.provider.Settings;
import android.text.TextUtils;
@@ -34,16 +32,12 @@
import com.hdl.photovoltaic.bean.ModBusBean;
import com.hdl.photovoltaic.bean.PageNumberObject;
import com.hdl.photovoltaic.config.AppConfigManage;
-import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
-import com.hdl.photovoltaic.enums.LowerTagType;
import com.hdl.photovoltaic.internet.HttpServer.MyNanoHttpServer;
import com.hdl.photovoltaic.internet.TcpClient;
-import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.internet.api.TopicApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.listener.LinkCallBack;
-import com.hdl.photovoltaic.ui.bean.BUserInfo;
import com.hdl.photovoltaic.ui.bean.CUserInfo;
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.DeviceInfoBean;
@@ -74,10 +68,10 @@
import com.hdl.sdk.link.core.callback.GatewayCallBack;
import com.hdl.sdk.link.core.callback.HDLLinkCallBack;
import com.hdl.sdk.link.core.callback.ModbusCallBack;
+import com.hdl.sdk.link.core.config.HDLLinkConfig;
import com.hdl.sdk.link.core.connect.HDLModBusConnect;
import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.gateway.HDLLinkLocalGateway;
-import com.huawei.hms.api.Api;
import org.greenrobot.eventbus.EventBus;
import org.json.JSONObject;
@@ -96,7 +90,6 @@
import java.util.Objects;
import java.util.concurrent.atomic.AtomicInteger;
-import io.dcloud.feature.sdk.DCUniMPSDK;
import io.dcloud.feature.unimp.DCUniMPJSCallback;
import okhttp3.ResponseBody;
@@ -166,8 +159,16 @@
jsonObject.addProperty("user_name", UserConfigManage.getInstance().getUserName());
jsonObject.addProperty("user_image_url", UserConfigManage.getInstance().getUserImageUrl());
jsonObject.addProperty("user_account", UserConfigManage.getInstance().getAccount());
- uniSuccessCallback(mode_type, jsonObject, callback);
+ jsonObject.addProperty("token", HDLLinkPMUser.getInstance().getAccessToken());
+ jsonObject.addProperty("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
+ if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
+ AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
+ }
+ jsonObject.addProperty("serverAddress", AppConfigManage.getUserRegionUrl());
+ jsonObject.addProperty("appKey", AppConfigManage.getAppKey());
+ jsonObject.addProperty("appSecret", AppConfigManage.getAppSecret());
+ uniSuccessCallback(mode_type, jsonObject, callback);
}
break;
}
@@ -669,6 +670,30 @@
//uni閫氱煡鍘熺敓閫�鍑虹櫥褰�
case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOGOUT: {
HDLLinkPMUser.getInstance().logout(0);
+ }
+ break;
+ //鏈湴瀵嗛挜鑾峰彇
+ case HDLUniMP.UNI_EVENT_REPLY_OTHER_LOCAL_ENCRYPT_GET: {
+ String localSecret = HDLLinkConfig.getInstance().getLocalSecret();
+ JsonObject jsonObject = new JsonObject();
+ jsonObject.addProperty("local_encrypt", localSecret);
+ if (callback != null) {
+ uniSuccessCallback(type, jsonObject, callback);
+ }
+ 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);
+
}
break;
}
@@ -2601,8 +2626,8 @@
}
if (isTokenAndRefreshToken) {
//灏忕▼搴忛偅閲屾湁鑷繁鐨勮姹傛柟娉�,浣嗛渶瑕佸師鐢熸彁渚涜繖浜涙暟鎹�
- data.put("token", UserConfigManage.getInstance().getToken());
- data.put("refreshToken", UserConfigManage.getInstance().getRefreshToken());
+ data.put("token", HDLLinkPMUser.getInstance().getAccessToken());
+ data.put("refreshToken", HDLLinkPMUser.getInstance().getRefreshToken());
if (TextUtils.isEmpty(AppConfigManage.getUserRegionUrl())) {
AppConfigManage.setUserRegionUrl(HDLLinkPMUser.getInstance().getUserRegionUrl());
}
--
Gitblit v1.8.0