From ecaff4ffd05c630ac32e49daf3b9b8904052b0fe Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期五, 29 十二月 2023 15:16:07 +0800 Subject: [PATCH] 备份一下 --- app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 109 +++++++++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 90 insertions(+), 19 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 5ebc5e1..ce90d7d 100644 --- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java +++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java @@ -2,26 +2,29 @@ import androidx.annotation.NonNull; import androidx.appcompat.content.res.AppCompatResources; +import androidx.core.app.ActivityCompat; import android.Manifest; -import android.content.ComponentName; -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.view.View; import com.google.gson.Gson; +import com.google.gson.reflect.TypeToken; import com.hdl.linkpm.sdk.core.exception.HDLException; import com.hdl.linkpm.sdk.home.type.HomeType; 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; @@ -31,6 +34,7 @@ import com.hdl.photovoltaic.other.HdlThreadLogic; import com.hdl.photovoltaic.other.HdlUniLogic; import com.hdl.photovoltaic.ui.bean.DeviceRemoteInfo; +import com.hdl.photovoltaic.ui.bean.OidBean; import com.hdl.photovoltaic.uni.HDLUniMP; import com.hdl.photovoltaic.utils.AppManagerUtils; import com.hdl.photovoltaic.utils.PermissionUtils; @@ -47,6 +51,7 @@ import org.greenrobot.eventbus.Subscribe; import org.greenrobot.eventbus.ThreadMode; +import java.lang.reflect.Type; import java.util.List; @@ -62,6 +67,8 @@ private int backPressTimes; + private NetworkChangeReceiver networkChangeReceiver; + @Override public Object getContentView() { @@ -73,13 +80,15 @@ 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 @@ -95,13 +104,23 @@ } + /** + * 鐩戝惉缃戠粶鐘舵�佸彉鍖� + */ + private void networkMonitoring() { + IntentFilter intentFilter = new IntentFilter(); + intentFilter.addAction("android.net.conn.CONNECTIVITY_CHANGE"); + networkChangeReceiver = new NetworkChangeReceiver(); + registerReceiver(networkChangeReceiver, intentFilter); + } + private void initEvent() { viewBinding.myPowerStationBottomIl1.clickTv.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { currentFragmentIndex = 1; bottomViewChangeOfStyle(); - postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.powerstation); + postEventBus(HomepageTitleTabSwitch.powerstation); } }); viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() { @@ -109,7 +128,8 @@ public void onClick(View v) { currentFragmentIndex = 2; bottomViewChangeOfStyle(); - postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.message); + postEventBus(HomepageTitleTabSwitch.message); + } }); viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() { @@ -117,7 +137,7 @@ public void onClick(View v) { currentFragmentIndex = 3; bottomViewChangeOfStyle(); - postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.me); + postEventBus(HomepageTitleTabSwitch.me); } }); @@ -130,11 +150,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(); @@ -180,10 +202,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); } @@ -246,7 +268,7 @@ if (response.getTopic() == null) { return; } - HdlLogLogic.print("鐩戝惉鍒扮殑鏁版嵁===" + new Gson().toJson(response), false); + HdlLogLogic.print("鐩戝惉鍒癕odbus鏁版嵁--->" + new Gson().toJson(response), false); // if (response.getTopic().endsWith("custom/native/inverter/up")) { HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean(); uniCallBackBaseBean.setType(response.getTopic()); @@ -265,11 +287,33 @@ uniCallBackBaseBean.setData(linkResponse.getData()); HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean); HdlLogLogic.print(linkResponse.getTopic() + new Gson().toJson(linkResponse.getData()), true); + } else if (linkResponse.getTopic().endsWith("/custom/device/list/upload")) { + //閫嗗彉鍣ㄦ湁鏂皁id閫氱煡涓婚 + if (linkResponse.getData() == null) { + HdlLogLogic.print("閫嗗彉鍣ㄦ湁鏂皁id閫氱煡--->鏁版嵁涓虹┖", false); + return; + } + try { + Gson gson = new Gson(); + Type typeOfT = new TypeToken<List<OidBean>>() { + }.getType(); + String json = gson.toJson(linkResponse.getData()); + List<OidBean> oidList = gson.fromJson(json, typeOfT); + //澧為噺澧炲姞add + HdlDeviceLogic.getInstance().updateOidAdd(UserConfigManage.getInstance().getHomeId(), oidList, null); + } catch (Exception ignored) { + } + + } } } - }; - HDLLinkLocalSdk.getInstance().registerAllTopicsListener(allTopicsListener); + } + + ; + HDLLinkLocalSdk.getInstance(). + + registerAllTopicsListener(allTopicsListener); } /** @@ -286,7 +330,7 @@ @Override public void onFailure(HDLException e) { - HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触===" + e.getMessage(), e.getCode(), true); + HdlLogLogic.print("璇诲彇mqtt杩滅▼淇℃伅澶辫触--->" + e.getMessage(), e.getCode(), true); } }); } @@ -308,7 +352,7 @@ return; } int index = -1; - List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(); + List<GatewayBean> list = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList(UserConfigManage.getInstance().getHomeId()); for (int i = 0; i < list.size(); i++) { GatewayBean gatewayBean = list.get(i); if (gatewayBean.getGatewayId().equals(topics[2])) { @@ -342,12 +386,39 @@ uniCallBackBaseBean.setData(event.getData()); HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_REPLY_OTA_MODEL, uniCallBackBaseBean); 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() { -- Gitblit v1.8.0