From af262dee3a741902a564ae019ebbf0d47add210c Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 26 十二月 2023 20:24:13 +0800
Subject: [PATCH] 2023年12月26日20:24:04
---
app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 23 +++++++++--
app/src/main/java/com/hdl/photovoltaic/enums/MessageFunctionTabSwitch.java | 2
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java | 13 +++++-
app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java | 10 ----
app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java | 5 +-
app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java | 3 +
app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java | 10 +++-
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 25 ++++++------
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java | 14 +++---
10 files changed, 63 insertions(+), 44 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/enums/MessageFunctionTabSwitch.java b/app/src/main/java/com/hdl/photovoltaic/enums/MessageFunctionTabSwitch.java
index 5563b3c..7c2ef87 100644
--- a/app/src/main/java/com/hdl/photovoltaic/enums/MessageFunctionTabSwitch.java
+++ b/app/src/main/java/com/hdl/photovoltaic/enums/MessageFunctionTabSwitch.java
@@ -5,6 +5,6 @@
*/
public enum MessageFunctionTabSwitch {
all,//鍏ㄩ儴
- nascent,//杩涜涓�
+ nascent,//鍙戠敓涓�
recover,//宸叉仮澶�
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 20bb470..15b7053 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -1164,21 +1164,22 @@
HdlDeviceLogic.getInstance().getCurrentHomeLocalAndCloudGatewayList(UserConfigManage.getInstance().getHomeId(), new CloudCallBeak<List<GatewayBean>>() {
@Override
public void onSuccess(List<GatewayBean> list) {
+ GatewayBean gatewayBean = HdlDeviceLogic.getInstance().queryCurrentHomeMainGateway(list);
+ if (gatewayBean != null) {
+ //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
+ HdlDeviceLogic.getInstance().uploadDataToCloud(gatewayBean.getDevice_mac(), null);
+ }
+ //EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
+ BaseEventBus baseEventBus = new BaseEventBus();
+ baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
+ baseEventBus.setData(list);
+
+ EventBus.getDefault().post(baseEventBus);
if (callback != null) {
uniCallbackData(list, callback);
- //EventBus浜嬩欢鍒嗗彂,杩涘叆浣忓畢寮�濮嬭闃呬富棰�
- BaseEventBus baseEventBus = new BaseEventBus();
- baseEventBus.setType(HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST);
- baseEventBus.setData(list);
- EventBus.getDefault().post(baseEventBus);
- GatewayBean gatewayBean = HdlDeviceLogic.getInstance().queryCurrentHomeMainGateway(list);
- if (gatewayBean != null) {
- //杩涙潵浣忓畢璇︽儏閮借涓婁紶涓�娆id鍒楄〃鍒颁簯绔�;
- HdlDeviceLogic.getInstance().uploadDataToCloud(gatewayBean.getDevice_mac(), null);
- }
-
-
}
+
+
}
@Override
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 cedc399..e02daf2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/MyPowerStationActivity.java
@@ -126,6 +126,7 @@
currentFragmentIndex = 2;
bottomViewChangeOfStyle();
postEventBus(HomepageTitleTabSwitch.message);
+
}
});
viewBinding.myMeBottomIl3.clickTv.setOnClickListener(new View.OnClickListener() {
@@ -201,7 +202,7 @@
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);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
index ce3effe..7822688 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/adapter/HouseInfoAdapter.java
@@ -47,14 +47,18 @@
//瑁呮満瀹归噺
String capacity = mContext.getString(R.string.my_power_station_installed_capacity) + houseIdBean.getInstalledCapacity() + "kW";
holder.capacityTv.setText(capacity);
- String kw = "0.0";
+ String kw = "0";
try {
- double d = Double.parseDouble(houseIdBean.getPower());
- int intValue = (int) d;
+ if (houseIdBean.getPower().contains(".")) {
+ int indexOf = houseIdBean.getPower().indexOf(".");
+ houseIdBean.setPower(houseIdBean.getPower().substring(0, indexOf));
+ }
+ int intValue = Integer.parseInt(houseIdBean.getPower());
int k = intValue / 1000;
int w = intValue % 1000;
kw = k + "." + w;
} catch (Exception ignored) {
+ kw = "0.0";
}
//鍙戠數鍔熺巼
String power = mContext.getString(R.string.power_station_generated_power) + kw + "kW";
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
index 6a1f1af..358c394 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/HouseIdBean.java
@@ -42,7 +42,7 @@
}
public String getInstalledCapacity() {
- return installedCapacity == null ? "" : installedCapacity;
+ return installedCapacity == null ? "0" : installedCapacity;
}
public void setInstalledCapacity(String installedCapacity) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
index 11770e3..0150223 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java
@@ -12,8 +12,10 @@
import com.hdl.photovoltaic.base.CustomBaseFragment;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.databinding.FragmentMessageBinding;
+import com.hdl.photovoltaic.enums.HomepageTitleTabSwitch;
import com.hdl.photovoltaic.enums.MessageFunctionTabSwitch;
import com.hdl.photovoltaic.other.HdlCommonLogic;
+import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.sdk.link.core.bean.eventbus.BaseEventBus;
import org.greenrobot.eventbus.EventBus;
@@ -128,7 +130,7 @@
private void postEventBus(MessageFunctionTabSwitch tabSwitch) {
BaseEventBus baseEventBus = new BaseEventBus();
baseEventBus.setTopic(ConstantManage.message_function_tab_switch);
- baseEventBus.setType(tabSwitch + "");
+ baseEventBus.setType(tabSwitch.toString());
EventBus.getDefault().post(baseEventBus);
}
@@ -175,11 +177,9 @@
//濡傛灉涔嬪墠娌℃湁娣诲姞杩�
if (!fragmentList.get(currentIndex).isAdded()) {
//绗笁涓弬鏁颁负娣诲姞褰撳墠鐨刦ragment鏃剁粦瀹氫竴涓猼ag
- ft.hide(currentFragment)
- .add(R.id.message_fcv, fragmentList.get(currentIndex), currentIndex + "");
+ ft.hide(currentFragment).add(R.id.message_fcv, fragmentList.get(currentIndex), currentIndex + "");
} else {
- ft.hide(currentFragment)
- .show(fragmentList.get(currentIndex));
+ ft.hide(currentFragment).show(fragmentList.get(currentIndex));
}
currentFragment = fragmentList.get(currentIndex);
ft.commit();
@@ -203,4 +203,17 @@
}
+ @Override
+ public void onEventMessage(BaseEventBus eventBus) {
+ super.onEventMessage(eventBus);
+ //鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
+ if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
+ if (eventBus.getType().equals(HomepageTitleTabSwitch.message.toString())) {
+ postEventBus(MessageFunctionTabSwitch.nascent);
+ HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭秷鎭��");
+ }
+ }
+ }
+
+
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
index f2f2690..f3ea5db 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageInfoActivity.java
@@ -4,6 +4,7 @@
import android.os.Bundle;
import android.view.View;
+import com.google.gson.Gson;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.databinding.ActivityMessageInfoBinding;
@@ -16,6 +17,8 @@
ActivityMessageInfoBinding viewBinding;
+ private MessageBean mMessageBean;
+
@Override
public Object getContentView() {
viewBinding = ActivityMessageInfoBinding.inflate(getLayoutInflater());
@@ -26,8 +29,14 @@
public void onBindView(Bundle savedInstanceState) {
setNotificationBarBackgroundColor(CustomColor.white);
setStatusBarTextColor();
- Bundle bundle = getIntent().getBundleExtra("message_info");
-// MessageBean
+ try {
+ String json = getIntent().getStringExtra("message_info");
+ mMessageBean = new Gson().fromJson(json, MessageBean.class);
+ } catch (Exception ignored) {
+ }
+ if (mMessageBean == null) {
+ mMessageBean = new MessageBean();
+ }
//鍒濆鍖�
initView();
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
index 82b33db..03a535d 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java
@@ -49,15 +49,7 @@
}
private void initData() {
-// mList = new ArrayList<>();
-// for (int i = 0; i < 3; i++) {
-// MessageBean messageBean = new MessageBean();
-// messageBean.setTitle("鏉ヤ簡涓�鏉″憡璀︿俊鎭�" + i);
-// messageBean.setHomeName(i + "");
-// messageBean.setCreateTime((long) 1234567777);
-// messageBean.setRead(false);
-// mList.add(messageBean);
-// }
+ getNascentMessageList(true);
}
private void initEvent() {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java
index 4fbc266..5251eca 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/RecoverMessageFragment.java
@@ -6,6 +6,7 @@
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import com.google.gson.Gson;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseFragment;
@@ -77,9 +78,7 @@
@Override
public void onClick(int position, MessageBean item) {
Intent intent = new Intent();
- Bundle bundle = new Bundle();
- bundle.putSerializable("message_info", MessageBean.class);
- intent.putExtras(bundle);
+ intent.putExtra("message_info", new Gson().toJson(item));
intent.setClass(_mActivity, MessageInfoActivity.class);
startActivity(intent);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
index 692627b..b08a1e6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseListFragment.java
@@ -205,13 +205,13 @@
} else if (HDLUniMP.UNI_EVENT_REPLY_DEVICE_LIST.equals(eventBus.getType())) {
//杩涘幓浣忓畢璇︽儏uni璇诲彇閫嗗彉鍣ㄥ垪琛ㄦ垚鍔熷悗閫氱煡
- for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) {
- //String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().get(i).getGatewayId();
- //瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙ｆ瀽瀛楃涓�,鍙嬁getGatewayId()鍊�;
- //String topic = "/user/" + gatewayId+"/1";
- //杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰�
- MqttRecvClient.getInstance().checkAndsubscribeAllTopics("");
- }
+// for (int i = 0; i < HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().size(); i++) {
+ //String gatewayId = HdlDeviceLogic.getInstance().getCurrentHomeGatewayList().get(i).getGatewayId();
+ //瀛楃涓叉槸鑷繁鎸夎鍒欐嫾鎺ョ殑,閲岄潰娉ㄥ唽涓婚鏃朵細瑙ｆ瀽瀛楃涓�,鍙嬁getGatewayId()鍊�;
+ //String topic = "/user/" + gatewayId+"/1";
+ //杩涘幓浣忓畢璇︽儏寮�濮嬭闃呬富棰�
+ MqttRecvClient.getInstance().checkAndsubscribeAllTopics("");
+// }
} else if (eventBus.getTopic().equals(ConstantManage.homepage_title_tab_switch)) {
//鎺ユ敹澶栭儴鐐瑰嚮浜嬩欢
if (eventBus.getType().equals(HomepageTitleTabSwitch.powerstation.toString())) {
--
Gitblit v1.8.0