From 5df76d441a853b1a5d2dff018c01327eb3a717b3 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 27 十二月 2023 19:25:57 +0800
Subject: [PATCH] 2023年12月27日19:25:46
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 95 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 16 deletions(-)
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 634d792..e02daf2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -2,8 +2,10 @@
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.app.ActivityCompat;
import android.Manifest;
+import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.os.Bundle;
import android.os.Process;
@@ -16,9 +18,12 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.bean.MqttInfo;
+import com.hdl.photovoltaic.broadcast.NetworkChangeReceiver;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityMyPowerStationBinding;
+import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
+import com.hdl.photovoltaic.enums.NetworkType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
@@ -47,7 +52,6 @@
import java.util.List;
-
/**
* 鎴戠殑鐢电珯鐣岄潰
*/
@@ -60,6 +64,8 @@
private int backPressTimes;
+ private NetworkChangeReceiver networkChangeReceiver;
+
@Override
public Object getContentView() {
@@ -71,14 +77,38 @@
public void onBindView(Bundle savedInstanceState) {
setNotificationBarBackgroundColor(CustomColor.blue);
//鍒濆鍖�
- initView();
+ this.initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
- initEvent();
+ this.initEvent();
//娉ㄥ唽鐩戝惉
- registerAllTopicsListener();
+ this.registerAllTopicsListener();
//鍒濆鍖杕qtt瀹㈡埛绔�
- initMqttClient();
+ this.initMqttClient();
+ //鐩戝惉缃戠粶鐘舵�佸彉鍖�
+ this.networkMonitoring();
+// HdlOtaLogic.getInstance().startLocalService(new ServiceConnection() {
+// @Override
+// public void onServiceConnected(ComponentName name, IBinder service) {
+//
+// }
+//
+// @Override
+// public void onServiceDisconnected(ComponentName name) {
+//
+// }
+// });
+
+ }
+
+ /**
+ * 鐩戝惉缃戠粶鐘舵�佸彉鍖�
+ */
+ private void networkMonitoring() {
+ IntentFilter intentFilter = new IntentFilter();
+ intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE");
+ networkChangeReceiver = new NetworkChangeReceiver();
+ registerReceiver(networkChangeReceiver, intentFilter);
}
private void initEvent() {
@@ -87,7 +117,7 @@
public void onClick(View v) {
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
- postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.powerstation);
+ postEventBus(HomepageTitleTabSwitch.powerstation);
}
});
viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -95,7 +125,8 @@
public void onClick(View v) {
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
- postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.message);
+ postEventBus(HomepageTitleTabSwitch.message);
+
}
});
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -103,7 +134,7 @@
public void onClick(View v) {
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
- postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.me);
+ postEventBus(HomepageTitleTabSwitch.me);
}
});
@@ -116,11 +147,13 @@
HdlUniLogic.getInstance().checkRemoveOtherUniMPEventCallBack();
//绉婚櫎鐩戝惉
HDLLinkLocalSdk.getInstance().removeAllTopicsListener(allTopicsListener);
+ //绉婚櫎鐩戝惉缃戠粶鐘舵�佸彉鍖�
+ unregisterReceiver(networkChangeReceiver);
}
private void initView() {
- viewBinding.myPowerStationBottomIl1.titleTv.setText(R.string.power_station);
+ viewBinding.myPowerStationBottomIl1.titleTv.setText("棣栭〉");//
viewBinding.myMessageBottomIl2.titleTv.setText(R.string.message);
viewBinding.myMeBottomIl3.titleTv.setText(R.string.power_station_me);
this.bottomViewChangeOfStyle();
@@ -166,10 +199,10 @@
*
* @param tabSwitch -
*/
- private void postEventBus(HdlCommonLogic.HomepageTitleTabSwitch tabSwitch) {
+ private void postEventBus(HomepageTitleTabSwitch tabSwitch) {
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(ConstantManage.homepage_title_tab_switch);
- baseEventBus.setType(tabSwitch + "");
+ baseEventBus.setType(tabSwitch.toString());
EventBus.getDefault().post(baseEventBus);
}
@@ -232,7 +265,7 @@
if (response.getTopic() == null) {
return;
}
- HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁===" + new Gson().toJson(response), false);
+ HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁--->" + new Gson().toJson(response), false);
// if (response.getTopic().endsWith("custom/native/inverter/up")) {
HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
uniCallBackBaseBean.setType(response.getTopic());
@@ -250,7 +283,7 @@
uniCallBackBaseBean.setType(linkResponse.getTopic());
uniCallBackBaseBean.setData(linkResponse.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
- HdlLogLogic.print( linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
+ HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true);
}
}
}
@@ -272,7 +305,7 @@
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触===" + e.getMessage(), e.getCode(), true);
+ HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true);
}
});
}
@@ -327,13 +360,40 @@
uniCallBackBaseBean.setType(event.getType());
uniCallBackBaseBean.setData(event.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
- HdlLogLogic.print( event.getTopic() + new Gson().toJson(event.getData()), true);
+ HdlLogLogic.print(event.getTopic() + new Gson().toJson(event.getData()), true);
+ } else if (event.getTopic().contains(ConstantManage.network_change_post)) {
+// String wifi_ssid = WifiUtils.getInstance().getCurrentConnectWifiSsid();//鑾峰彇WiFi鐨剆sid闇�瑕佷綅缃潈闄愮殑
+ HdlLogLogic.print("鐩戝惉缃戠粶鐘舵��--->" + event.getData().toString() + "(" + event.getType() + ")", true);
+ //绗竴娆″惎鍔ˋpp,浠ュ強鍒囨崲缃戠粶鐨勬椂鍊欐洿鏂�
+ if (TextUtils.isEmpty(UserConfigManage.getInstance().getHomeId())) {
+ return;
+ }
+ if (!event.getType().equals(NetworkType.no_network.toString())) {
+// AppManagerUtils.getAppManager().showLoading();
+ HdlThreadLogic.runSubThread(new Runnable() {
+ @Override
+ public void run() {
+ HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
+ @Override
+ public void onSuccess(List<GatewayBean> obj) {
+// AppManagerUtils.getAppManager().hideLoading();
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+// AppManagerUtils.getAppManager().hideLoading();
+ }
+ });
+ }
+ });
+ }
}
}
/**
- * 鐐瑰嚮杩斿洖閿殑浜嬩欢
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
*/
@Override
public void onBackPressed() {
@@ -363,4 +423,7 @@
}
+
+
+
}
\ No newline at end of file
--
Gitblit v1.8.0