From 3966f71e1361bc313966bc6fd07db90874a24a15 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 18 四月 2024 14:30:37 +0800 Subject: [PATCH] 2024年04月18日14:30:35 --- app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java | 15 --------------- app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 10 +++++++--- app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 7 +++++-- app/build.gradle | 2 ++ 4 files changed, 14 insertions(+), 20 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d53f677..75aeb39 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -183,6 +183,8 @@ + + //鑻ヤ笉闆嗘垚鍘傚晢閫氶亾锛屽彲鐩存帴璺宠繃浠ヤ笅渚濊禆 // 鏋佸厜鍘傚晢鎻掍欢鐗堟湰涓庢帴鍏� JPush 鐗堟湰淇濇寔涓�鑷达紝涓嬪悓 // 鎺ュ叆鍗庝负鍘傚晢 diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java index 68753a4..d968dc7 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlJpushLogic.java @@ -5,27 +5,12 @@ import android.text.TextUtils; import com.google.gson.Gson; -import com.hdl.photovoltaic.config.AppConfigManage; import com.hdl.photovoltaic.config.ConstantManage; import com.hdl.photovoltaic.config.UserConfigManage; import com.hdl.photovoltaic.enums.MessageStateType; import com.hdl.photovoltaic.jpush.JPushMessageInfoBean; -import com.hdl.photovoltaic.ui.CPowerStationActivity; import com.hdl.photovoltaic.ui.MyPowerStationActivity; import com.hdl.photovoltaic.ui.bean.MessageBean; -import com.hdl.photovoltaic.ui.me.AccountAndSecurityActivity; -import com.hdl.photovoltaic.ui.me.AsRegardsActivity; -import com.hdl.photovoltaic.ui.me.BindMailActivity; -import com.hdl.photovoltaic.ui.me.BindPhoneActivity; -import com.hdl.photovoltaic.ui.me.MeChangePasswordActivity; -import com.hdl.photovoltaic.ui.me.PersonalDataActivity; -import com.hdl.photovoltaic.ui.me.SetActivity; -import com.hdl.photovoltaic.ui.me.TemperatureUnitActivity; -import com.hdl.photovoltaic.ui.me.WebActivity; -import com.hdl.photovoltaic.ui.me.languageSelectionActivity; -import com.hdl.photovoltaic.ui.newC.MessageCenterList; -import com.hdl.photovoltaic.uni.HDLUniMP; -import com.hdl.photovoltaic.utils.AppManagerUtils; import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus; import org.greenrobot.eventbus.EventBus; 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 87db5a5..e1e9f89 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java @@ -93,6 +93,7 @@ // AppManagerUtils.getAppManager().finishActivity(StartActivity.class); // this.portConflictDialog(); } + public void startAppAutomaticallyOpenUni() { new Thread(new Runnable() { @Override @@ -122,7 +123,7 @@ if (TextUtils.isEmpty(event.getTopic())) { return; } - //缃戝叧鏇存柊mqtt绉橀挜鏇存柊閫氱煡 + //缃戝叧mqtt绉橀挜鏇存柊閫氱煡 if (event.getTopic().contains("/custom/mqtt/secret/change")) { String[] topics = event.getTopic().split("/"); //涓婚涓嶇鍚堣鍒欎笉澶勭悊 @@ -178,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) { @@ -204,7 +208,7 @@ */ private void startAppAutomaticallyOpenUni(boolean delay) { - if(delay) { + if (delay) { SystemClock.sleep(2000); } List<HouseIdBean> HouseIdList = HdlResidenceLogic.getInstance().getHouseIdList(); @@ -339,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(); } } diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java index 2ed3fac..0f32e3a 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -101,11 +101,12 @@ } + @Override protected void onResume() { super.onResume(); //鍚姩椤典笌mainActivity鏍峰紡涓�鏍凤紝杩欐牱鍚姩椤靛拰mainActivity鐪嬩笂鍘绘槸涓�涓晫闈紝鐩殑鏄负浜唌ainActivity閬綇涓嬩竴椤碉紱 - AppManagerUtils.getAppManager().finishActivity(StartActivity.class); +// AppManagerUtils.getAppManager().finishActivity(StartActivity.class); portConflictDialog(); // Intent intent = new Intent(_mActivity, MyPowerStationActivity.class); // intent.setFlags(Intent.Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); @@ -406,7 +407,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(); } } @@ -482,6 +483,8 @@ 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) { -- Gitblit v1.8.0