From 2b624347a56d7f50ce0be4aa085454a9f6a0dac6 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期一, 25 十二月 2023 10:12:00 +0800
Subject: [PATCH] 2023年12月25日10:11:49
---
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 82 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 17 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 dcf4b23..46cba3f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -1,36 +1,30 @@
package com.hdl.photovoltaic.ui;
import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
import androidx.appcompat.content.res.AppCompatResources;
import android.Manifest;
-import android.content.ComponentName;
-import android.content.Intent;
-import android.content.ServiceConnection;
+import android.content.IntentFilter;
import android.content.pm.PackageManager;
import android.os.Bundle;
-import android.os.IBinder;
import android.os.Process;
import android.text.TextUtils;
-import android.util.Log;
import android.view.View;
import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.home.type.HomeType;
-import com.hdl.linkpm.sdk.ota.bean.CloudGatewayDriversBean;
-import com.hdl.linkpm.sdk.utils.HDLMD5Utils;
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.NetworkType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlDeviceLogic;
-import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlMqttLogic;
import com.hdl.photovoltaic.other.HdlOtaLogic;
@@ -55,8 +49,6 @@
import java.util.List;
-import okhttp3.ResponseBody;
-
/**
* 鎴戠殑鐢电珯鐣岄潰
@@ -70,6 +62,8 @@
private int backPressTimes;
+ private NetworkChangeReceiver networkChangeReceiver;
+
@Override
public Object getContentView() {
@@ -81,14 +75,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() {
@@ -126,11 +144,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();
@@ -260,6 +280,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);
}
}
}
@@ -336,7 +357,34 @@
uniCallBackBaseBean.setType(event.getType());
uniCallBackBaseBean.setData(event.getData());
HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean);
- HdlLogLogic.print("杩涘害:" + ((HdlOtaLogic.Progress) event.getData()).step + "", false);
+ 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();
+ }
+ });
+ }
+ });
+ }
}
}
--
Gitblit v1.8.0