From fa1a77e3f95e5789c01a6dd542ac24e53b9515af Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期六, 22 六月 2024 09:14:54 +0800
Subject: [PATCH] 2024年06月22日09:14:46
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 73 +++++++++++++++++++-----------------
1 files changed, 38 insertions(+), 35 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index 9238a58..d86dc78 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -5,10 +5,7 @@
import android.os.Process;
import android.os.SystemClock;
import android.text.TextUtils;
-import android.util.Log;
-
-import androidx.annotation.Nullable;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@@ -36,8 +33,6 @@
import com.hdl.photovoltaic.uni.HDLUniMP;
import com.hdl.photovoltaic.uni.HDLUniMPSDKManager;
import com.hdl.photovoltaic.utils.AppManagerUtils;
-import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
-import com.hdl.photovoltaic.widget.ConfirmationTipDialog;
import com.hdl.sdk.link.HDLLinkLocalSdk;
import com.hdl.sdk.link.common.event.EventListener;
import com.hdl.sdk.link.core.bean.LinkResponse;
@@ -45,7 +40,6 @@
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.config.HDLLinkConfig;
-import com.hdl.sdk.link.core.connect.HDLUdpConnect;
import com.hdl.sdk.link.core.utils.mqtt.MqttRecvClient;
import org.greenrobot.eventbus.Subscribe;
@@ -77,7 +71,7 @@
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
-// startAppAutomaticallyOpenUni();
+ startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
@@ -87,37 +81,31 @@
}
@Override
- protected void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setTheme(R.style.NoAnimationTheme);
- }
-
- @Override
protected void onResume() {
super.onResume();
//鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱
// AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
- this.portConflictDialog();
- startAppAutomaticallyOpenUni();
+// this.portConflictDialog();
}
+
public void startAppAutomaticallyOpenUni() {
- //浣庝簬瀹夊崜14鐗堟湰
- if (android.os.Build.VERSION.SDK_INT < 34) {
- startAppAutomaticallyOpenUni(false);
- } else {
- new Thread(new Runnable() {
- @Override
- public void run() {
- SystemClock.sleep(10);
- runOnUiThread(new Runnable() {
- @Override
- public void run() {
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ SystemClock.sleep(10);
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ //浣庝簬瀹夊崜14鐗堟湰
+ if (android.os.Build.VERSION.SDK_INT < 34) {
+ startAppAutomaticallyOpenUni(false);
+ } else {
startAppAutomaticallyOpenUni(true);
}
- });
- }
- }).start();
- }
+ }
+ });
+ }
+ }).start();
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -129,7 +117,7 @@
if (TextUtils.isEmpty(event.getTopic())) {
return;
}
- //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
+ //缃戝叧mqtt绉橀挜鏇存柊閫氱煡
if (event.getTopic().contains("/custom/mqtt/secret/change")) {
String[] topics = event.getTopic().split("/");
//涓婚涓嶇鍚堣鍒欎笉澶勭悊
@@ -185,6 +173,9 @@
HdlThreadLogic.runSubThread(new Runnable() {
@Override
public void run() {
+ //闃叉app鍚姩鐨勬椂鍊欐病鏈夌綉缁�(app涔熺櫥褰曚笉浜�),瀵艰嚧鑾峰彇涓嶄簡mqtt杩滅▼杩炴帴淇℃伅;
+ initMqttClient();
+
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> obj) {
@@ -211,13 +202,17 @@
*/
private void startAppAutomaticallyOpenUni(boolean delay) {
- if(delay) {
+ if (delay) {
SystemClock.sleep(2000);
}
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
if (HouseIdList.size() == 0) {
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_Null_C;
- HdlUniLogic.getInstance().openUniMP(path, null);
+ if(delay){
+ HdlUniLogic.getInstance().openUniMPDelay(path, null);
+ }else {
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
} else {
int select_home = 0;
for (int i = 0; i < HouseIdList.size(); i++) {
@@ -229,7 +224,11 @@
HouseIdBean houseIdBean = HouseIdList.get(select_home);
HdlResidenceLogic.getInstance().switchHouse(houseIdBean);
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
- HdlUniLogic.getInstance().openUniMP(path, null);
+ if(delay) {
+ HdlUniLogic.getInstance().openUniMPDelay(path, null);
+ }else {
+ HdlUniLogic.getInstance().openUniMP(path, null);
+ }
}
}
@@ -341,12 +340,16 @@
* 鍒濆鍖杕qtt瀹㈡埛绔�
*/
public void initMqttClient() {
+ //妫�鏌ユ柇寮�鐘舵��
+ if (!MqttRecvClient.getInstance().isConnected()) {
+ MqttRecvClient.getInstance().reConnect();
+ }
if (!MqttRecvClient.getInstance().isInit()) {
HdlMqttLogic.getInstance().getMqttRemoteInfo(HomeType.A, new CloudCallBeak<MqttInfo>() {
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null);
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
MqttRecvClient.getInstance().connect();
}
}
--
Gitblit v1.8.0