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 | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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 46cba3f..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,6 +2,7 @@
import androidx.annotation.NonNull;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.app.ActivityCompat;
import android.Manifest;
import android.content.IntentFilter;
@@ -12,6 +13,7 @@
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;
@@ -21,6 +23,7 @@
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;
@@ -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;
@@ -115,7 +120,7 @@
public void onClick(View v) {
currentFragmentIndex = 1;
bottomViewChangeOfStyle();
- postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.powerstation);
+ postEventBus(HomepageTitleTabSwitch.powerstation);
}
});
viewBinding.myMessageBottomIl2.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -123,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() {
@@ -131,7 +137,7 @@
public void onClick(View v) {
currentFragmentIndex = 3;
bottomViewChangeOfStyle();
- postEventBus(HdlCommonLogic.HomepageTitleTabSwitch.me);
+ postEventBus(HomepageTitleTabSwitch.me);
}
});
@@ -196,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);
}
@@ -262,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());
@@ -281,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);
}
/**
@@ -302,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);
}
});
}
@@ -324,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])) {
@@ -390,7 +418,7 @@
/**
- * 鐐瑰嚮杩斿洖閿殑浜嬩欢
+ * 鐗╃悊鎸夐敭杩斿洖浜嬩欢
*/
@Override
public void onBackPressed() {
--
Gitblit v1.8.0