From 1a758b1bfbff1b910cd912c4e7434bf8f63a210a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 10 四月 2024 10:50:01 +0800
Subject: [PATCH] 2024年04月10日10:49:56
---
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 21 +--------------------
1 files changed, 1 insertions(+), 20 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..b66e48c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -88,7 +88,6 @@
super.onResume();
//鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱
AppManagerUtils.getAppManager().finishActivity(StartActivity.class);
- this.portConflictDialog();
}
@Subscribe(threadMode = ThreadMode.MAIN)
@@ -315,7 +314,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();
}
}
@@ -394,24 +393,6 @@
}
};
HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener);
- }
-
-
- /**
- * 绔彛鍐茬獊
- */
- 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();
- }
- });
- }
}
--
Gitblit v1.8.0