From 1078968985ae81e79ea149e3251841cd9bd54a1e Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期四, 11 四月 2024 15:24:20 +0800
Subject: [PATCH] Merge branch 'wxw_new' into dev-hxb
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 63 +++++++++++++++++++------------
1 files changed, 38 insertions(+), 25 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 dbeacb9..9238a58 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -5,7 +5,10 @@
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;
@@ -74,7 +77,7 @@
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
- startAppAutomaticallyOpenUni();
+// startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
@@ -84,11 +87,37 @@
}
@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);
+// AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
this.portConflictDialog();
+ startAppAutomaticallyOpenUni();
+ }
+ 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() {
+ startAppAutomaticallyOpenUni(true);
+ }
+ });
+ }
+ }).start();
+ }
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -176,11 +205,15 @@
}
}
+
/**
* C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
*/
- private void startAppAutomaticallyOpenUni() {
+ private void startAppAutomaticallyOpenUni(boolean 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;
@@ -198,8 +231,6 @@
String path = HDLUniMP.UNI_EVENT_OPEN_HOME_DETAILS_C + "?homeId=" + houseIdBean.getHomeId() + "&homeName=" + houseIdBean.getHomeName() + "&powerStationStatus=" + houseIdBean.getPowerStationStatus();
HdlUniLogic.getInstance().openUniMP(path, null);
}
-
-
}
// /**
@@ -315,7 +346,7 @@
@Override
public void onSuccess(MqttInfo info) {
if (info != null) {
- MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord());
+ MqttRecvClient.getInstance().setConnectParam(info.getUrl(), info.getClientId(), info.getUserName(), info.getPassWord(),null);
MqttRecvClient.getInstance().connect();
}
}
@@ -397,22 +428,4 @@
}
- /**
- * 绔彛鍐茬獊
- */
- private void portConflictDialog() {
- if (!HDLUdpConnect.getInstance().isBindSuccess()) {
- ConfirmationTipDialog dialog = new ConfirmationTipDialog(_mActivity);
- dialog.show();
- dialog.setTitle(getString(R.string.home_account_registered_successfully));
- dialog.setYesOnclickListener(new ConfirmationCancelDialog.onYesOnclickListener() {
- @Override
- public void Confirm() {
- finish();
- }
- });
- }
- }
-
-
-}
\ No newline at end of file
+}
--
Gitblit v1.8.0