From b75795836a851a13e54cc4efb597262fb448217c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 08 五月 2024 15:22:01 +0800
Subject: [PATCH] 2024年05月08日15:21:54
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 51 ++++++++++++++++++++++++---------------------------
1 files changed, 24 insertions(+), 27 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..e1e9f89 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -77,7 +77,7 @@
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
//C绔惎鍔ˋpp鑷姩鎵撳紑灏忕▼搴忕數绔欒鎯呯晫闈�
-// startAppAutomaticallyOpenUni();
+ startAppAutomaticallyOpenUni();
//娉ㄥ唽鐩戝惉
this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
@@ -87,37 +87,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 +123,7 @@
if (TextUtils.isEmpty(event.getTopic())) {
return;
}
- //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡
+ //缃戝叧mqtt绉橀挜鏇存柊閫氱煡
if (event.getTopic().contains("/custom/mqtt/secret/change")) {
String[] topics = event.getTopic().split("/");
//涓婚涓嶇鍚堣鍒欎笉澶勭悊
@@ -185,6 +179,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,7 +208,7 @@
*/
private void startAppAutomaticallyOpenUni(boolean delay) {
- if(delay) {
+ if (delay) {
SystemClock.sleep(2000);
}
List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList();
@@ -346,7 +343,7 @@
@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(), null);
MqttRecvClient.getInstance().connect();
}
}
--
Gitblit v1.8.0