From 99cd5725280d66550aaaaedf8440389fd0d3a60b Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期四, 14 十二月 2023 14:24:08 +0800
Subject: [PATCH] 备份一下代码
---
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageFragment.java | 77 +++---
app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java | 18 +
app/src/main/java/com/hdl/photovoltaic/ui/message/NascentMessageFragment.java | 1
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 71 ++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java | 6
app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java | 140 +++++++++++-
app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java | 275 +++++++++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 12
app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java | 3
9 files changed, 541 insertions(+), 62 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
index 3e7b715..487d6cf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
+++ b/app/src/main/java/com/hdl/photovoltaic/internet/api/HttpApi.java
@@ -5,6 +5,24 @@
//region **********銆怋绔�戝拰銆怌绔�戝叡鐢ㄦ帴鍙�**********
//mqtt杩炴帴闇�瑕侊紙璇泙鎺ュ彛鍦板潃:https://hdl-gz.yuque.com/wnkbmh/cdrglh/totdnt#40b28997锛�
public static final String POST_Mqtt_GetRemoteInfo = "/home-wisdom/app/mqtt/getRemoteInfo";
+ //region -----璀︽姤娑堟伅涓績(浣忓畢)---------
+ //鑾峰彇鏈鐞嗘秷鎭暟閲�
+ public static final String POST_Message_UntreatedCount = "/home-wisdom/app/powerStation/message/untreatedCount";
+ //娑堟伅鍒楄〃
+ public static final String POST_Message_List = "/home-wisdom/app/powerStation/message/listByPage";
+ //鑾峰彇娑堟伅璇︽儏
+ public static final String POST_Message_Info = "/home-wisdom/app/powerStation/message/info";
+ //娑堟伅鏍囪宸茶(宸茶В闄�)
+ public static final String POST_Message_Solve = "/home-wisdom/app/powerStation/message/solve";
+ //endregion
+
+ //region -----C鎽勬皬搴�,F鍗庢皬搴�(浣忓畢)---------
+ //鐢ㄦ埛鑷畾涔夐厤缃�
+ public static final String POST_C_F_CustomConfig = "/home-wisdom/app/powerStation/user/customConfig";
+ //鐢ㄦ埛鑷畾涔夐厤缃鎯�
+ public static final String POST_C_F_CustomConfigInfo = "/home-wisdom/app/powerStation/user/customConfigInfo";
+ //endregion
+
//region -----鐢电珯绠＄悊(浣忓畢)---------
//鐢电珯鍒楄〃
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
index 92eac82..9d91ba7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlCommonLogic.java
@@ -4,6 +4,7 @@
import android.text.TextUtils;
import com.dcloud.zxing2.WriterException;
+import com.google.gson.Gson;
import com.google.zxing.BarcodeFormat;
import com.google.zxing.EncodeHintType;
import com.google.zxing.common.BitMatrix;
@@ -17,6 +18,7 @@
public class HdlCommonLogic {
private static volatile HdlCommonLogic sHdlCommonLogic;
+
/**
* 鑾峰彇褰撳墠瀵硅薄
@@ -36,6 +38,10 @@
}
+
+
+
+
/**
* 鐢熸垚浜岀淮鐮�
*
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
index f18db41..0a579ad 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlDeviceLogic.java
@@ -939,6 +939,9 @@
}
+
+
+
/**
* 鑾峰彇缃戝叧鏀寔spk鍒楄〃
*
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
new file mode 100644
index 0000000..d6f9bd3
--- /dev/null
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlMessageLogic.java
@@ -0,0 +1,275 @@
+package com.hdl.photovoltaic.other;
+
+import android.text.TextUtils;
+
+import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.internet.HttpClient;
+import com.hdl.photovoltaic.internet.api.HttpApi;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
+import com.hdl.photovoltaic.ui.bean.MessageBean;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * 璀︽姤娑堟伅涓績閫昏緫
+ */
+public class HdlMessageLogic {
+ private static volatile HdlMessageLogic sHdlMessageLogic;
+
+ /**
+ * 鑾峰彇褰撳墠瀵硅薄
+ *
+ * @return HdlAccountLogic
+ */
+ public static synchronized HdlMessageLogic getInstance() {
+ if (sHdlMessageLogic == null) {
+ synchronized (HdlMessageLogic.class) {
+ if (sHdlMessageLogic == null) {
+ sHdlMessageLogic = new HdlMessageLogic();
+ }
+ }
+
+ }
+ return sHdlMessageLogic;
+ }
+
+
+ /**
+ * 鑾峰彇鏈鐞嗘秷鎭暟閲�
+ *
+ * @param cloudCallBeak -
+ */
+ public void getMessageUntreatedCount(CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Message_UntreatedCount;
+ JsonObject json = new JsonObject();
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(str);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 鑾峰彇娑堟伅鍒楄〃
+ *
+ * @param messageStatus all:鍏ㄩ儴,untreated:鏈鐞�,processed:宸插鐞�;
+ * @param cloudCallBeak -
+ */
+ public void getMessageList(MessageStatus messageStatus, CloudCallBeak<List<MessageBean>> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Message_List;
+ JsonObject json = new JsonObject();
+
+ if (messageStatus == MessageStatus.untreated) {
+ json.addProperty("status", "UNTREATED");//鏈鐞�
+ } else if (messageStatus == MessageStatus.processed) {
+ json.addProperty("status", "PROCESSED");//宸插鐞�
+ }
+ json.addProperty("pageNo", 1);//椤电爜
+ json.addProperty("pageSize", 50);//椤垫暟
+
+ List<MessageBean> list = new ArrayList<>();
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(new ArrayList<>());
+ }
+ Gson gson = new Gson();
+ MessageListClass messageListClass = gson.fromJson(jsonStr, MessageListClass.class);
+ list.addAll(messageListClass.getList());
+ //鎬诲叡鏈夊灏戦〉
+ long totalPage = messageListClass.totalPage;
+ if (totalPage < 2) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ return;
+ }
+ //璁板綍璇锋眰鏉℃暟
+ AtomicInteger atomicInteger = new AtomicInteger(0);
+ //浠庣浜岄〉鑾峰彇鏁版嵁
+ for (int i = 2; i <= totalPage; i++) {
+ json.addProperty("pageNo", i);//鏇存柊椤电爜
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ MessageListClass messageListClass1 = gson.fromJson(jsonStr, MessageListClass.class);
+ list.addAll(messageListClass1.getList());
+ if (atomicInteger.get() == totalPage - 1) {
+ //鏈�鍚庝竴鏉￠��鍑�
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ atomicInteger.set(atomicInteger.get() + 1);
+ if (atomicInteger.get() == totalPage - 1) {
+ //鏈�鍚庝竴鏉￠��鍑�
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(list);
+ }
+ }
+ }
+ });
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+
+ /**
+ * 鑾峰彇娑堟伅璇︽儏
+ *
+ * @param cloudCallBeak -
+ */
+ public void getMessageInfo(CloudCallBeak<MessageBean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Message_Info;
+ JsonObject json = new JsonObject();
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (TextUtils.isEmpty(jsonStr)) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(null);
+ }
+ }
+ Gson gson = new Gson();
+ MessageBean messageBean = gson.fromJson(jsonStr, MessageBean.class);
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(messageBean);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 娑堟伅鏍囪宸茶(宸茶В闄�)
+ *
+ * @param msgId 娑堟伅id
+ * @param cloudCallBeak -
+ */
+ public void getMessageUntreatedCount(String msgId, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_Message_Solve;
+ JsonObject json = new JsonObject();
+ json.addProperty("msgId", msgId);
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+
+ public enum MessageStatus {
+ all,//鍏ㄩ儴
+ untreated,//鏈鐞�
+ processed,//宸插鐞�
+
+
+ }
+
+ static class MessageListClass {
+
+ //鎬绘潯鏁�
+ private long totalCount;
+ //鎬婚〉鏁�
+ private long totalPage;
+ //褰撳墠椤�
+ private long pageNo;
+ //椤垫暟
+ private long pageSize;
+ //娑堟伅鍒楄〃
+ private List<MessageBean> list;
+
+ public long getTotalCount() {
+ return totalCount;
+ }
+
+ public void setTotalCount(long totalCount) {
+ this.totalCount = totalCount;
+ }
+
+ public long getTotalPage() {
+ return totalPage;
+ }
+
+ public void setTotalPage(long totalPage) {
+ this.totalPage = totalPage;
+ }
+
+ public long getPageNo() {
+ return pageNo;
+ }
+
+ public void setPageNo(long pageNo) {
+ this.pageNo = pageNo;
+ }
+
+ public long getPageSize() {
+ return pageSize;
+ }
+
+ public void setPageSize(long pageSize) {
+ this.pageSize = pageSize;
+ }
+
+ public List<MessageBean> getList() {
+ return list == null ? new ArrayList<>() : list;
+ }
+
+ public void setList(List<MessageBean> list) {
+ this.list = list;
+ }
+ }
+
+}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
index 3ad3359..3ea8461 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -16,6 +16,7 @@
import com.hdl.photovoltaic.ui.bean.CloudInverterDeviceBean;
import com.hdl.photovoltaic.ui.bean.HouseInfoBean;
import com.hdl.photovoltaic.ui.bean.HouseIdBean;
+import com.hdl.photovoltaic.ui.bean.MessageBean;
import com.hdl.sdk.link.common.exception.HDLLinkException;
import com.hdl.sdk.link.core.bean.gateway.GatewayBean;
import com.hdl.sdk.link.core.callback.GatewayCallBack;
@@ -55,7 +56,7 @@
}
/**
- * 鑾峰彇浣忓畢鍒楄〃
+ * 鑾峰彇缂撳瓨浣忓畢鍒楄〃
*
* @return 浣忓畢鍒楄〃
*/
@@ -71,7 +72,7 @@
}
/**
- * 鑾峰彇浣忓畢ID鍒楄〃
+ * 鑾峰彇缂撳瓨浣忓畢ID鍒楄〃
*
* @return 浣忓畢ID鍒楄〃
*/
@@ -93,7 +94,7 @@
/**
- * 鑾峰彇浣忓畢鍒楄〃
+ * 鑾峰彇浣忓畢鍒楄〃锛屽寘鎷幏鍙栦綇瀹卛d鍒楄〃锛屼綇瀹呰鎯呭垪琛紱
*
* @param cloudCallBeak -
*/
@@ -447,6 +448,70 @@
}
+
+ /**
+ * 鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣�
+ *
+ * @param homeId 浣忓畢id
+ * @param tempType 娓╁害鍗曚綅绫诲瀷 (C 锛氭憚姘忓害锛� F 锛氬崕姘忓害)
+ * @param cloudCallBeak -
+ */
+ public void setResidenceTemperatureUnit(String homeId, String tempType, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_C_F_CustomConfig;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ json.addProperty("tempType", tempType);
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String str) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�
+ *
+ * @param homeId 浣忓畢id
+ * @param cloudCallBeak -
+ */
+ public void getResidenceTemperatureUnit(String homeId, CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_C_F_CustomConfigInfo;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+
+ List<MessageBean> list = new ArrayList<>();
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(jsonStr);
+ }
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
/**
* 娣诲姞銆愪綇瀹呰鎯呫�戝埌鏈湴缂撳瓨
*
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 a7504fb..715aaa7 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -460,12 +460,12 @@
} else {
HdlFileLogic.getInstance().deleteFile(firmwarePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣鍥轰欢鏂囦欢;
}
- HdlLogLogic.print("鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.", false);
+ HdlLogLogic.print("鍐欏叆鏂板浐浠舵枃浠跺埌鍐呭瓨鎴愬姛.", true);
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("涓嬭浇鍥轰欢鏂囦欢鍒板唴瀛樺け璐�.", false);
+ HdlLogLogic.print("涓嬭浇鍥轰欢鏂囦欢鍒板唴瀛樺け璐�.", true);
uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
@@ -507,12 +507,12 @@
HdlOtaLogic.getInstance().pushUpgradePacketInfo(deviceMac, oid, hardwareModel, version, data.length() + "", upgradeFileLocalPathUrl, md5, new LinkCallBack<String>() {
@Override
public void onSuccess(String obj) {
- HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�鎴愬姛.", false);
+ HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�鎴愬姛.", true);
}
@Override
public void onError(HDLLinkException e) {
- HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.", false);
+ HdlLogLogic.print("閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇.", true);
uniCallbackData(null, -2, "閫氱煡缁欑綉鍏冲崌绾у浐浠舵枃浠跺湴鍧�澶辫触,鏃犳硶鍗囩骇,", callback);
}
});
@@ -657,12 +657,12 @@
} else {
HdlFileLogic.getInstance().deleteFile(drivePathFileName);//涓嬭浇澶辫触锛屽垹闄や笉瀹屾暣椹卞姩鏂囦欢;
}
- HdlLogLogic.print("鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.", false);
+ HdlLogLogic.print("鍐欏叆鏂伴┍鍔ㄦ枃浠跺埌鍐呭瓨鎴愬姛.", true);
}
@Override
public void onFailure(HDLException e) {
- HdlLogLogic.print("涓嬭浇椹卞姩鏂囦欢鍒板唴瀛樺け璐�.", false);
+ HdlLogLogic.print("涓嬭浇椹卞姩鏂囦欢鍒板唴瀛樺け璐�.", true);
uniCallbackData(null, e.getCode(), e.getMsg(), callback);
}
});
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
index 64acebf..0be3817 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/bean/MessageBean.java
@@ -2,21 +2,129 @@
import java.io.Serializable;
+/**
+ * 璀﹀憡娑堟伅瀹炰綋
+ */
public class MessageBean implements Serializable {
+ private Long msgId;//娑堟伅id
+ private String type;//FAULT:鏁呴殰,WARN:鍛婅,EVENT:浜嬩欢
+ private String title;//鏍囬
+ private String homeId;//鐢电珯id
+ private String homeName;//鐢电珯鍚嶇О
+ private String status;//UNTREATED:鏈鐞嗭紝PROCESSED:宸插鐞�
+ private Long createTime;//娑堟伅鏃堕棿(鎶ヨ鏃堕棿)
- private String content;//鍐呭
- private String homeName;//浣忓畢鍚嶇О
- private String time;//鏃堕棿
- private int grade;//绛夌骇
+ private String deviceOidId;//璁惧oid id
+ private String deviceOid;//璁惧oid
+ private String deviceDesc;//璁惧澶囨敞
+
+ private String typeDesc;//绫诲瀷鎻忚堪
+ private String effectScope;//褰卞搷鑼冨洿 NO_EFFECT : 鏃犲奖鍝嶈寖鍥存姤璀�
+ private String effectScopeDesc;//褰卞搷鑼冨洿鎻忚堪
+
+ private String address;//璇︾粏鍦板潃
+
+
private boolean isRead;//鏄惁宸茬粡璇诲彇
- public String getContent() {
- return content == null ? "" : content;
+ private HouseInfoBean.Location location = new HouseInfoBean.Location();//鐢电珯鍦板潃
+
+ public String getDeviceOidId() {
+ return deviceOidId == null ? "" : deviceOidId;
}
- public void setContent(String content) {
- this.content = content;
+ public void setDeviceOidId(String deviceOidId) {
+ this.deviceOidId = deviceOidId;
+ }
+
+ public String getDeviceOid() {
+ return deviceOid == null ? "" : deviceOid;
+ }
+
+ public void setDeviceOid(String deviceOid) {
+ this.deviceOid = deviceOid;
+ }
+
+ public String getDeviceDesc() {
+ return deviceDesc == null ? "" : deviceDesc;
+ }
+
+ public void setDeviceDesc(String deviceDesc) {
+ this.deviceDesc = deviceDesc;
+ }
+
+ public String getTypeDesc() {
+ return typeDesc == null ? "" : typeDesc;
+ }
+
+ public void setTypeDesc(String typeDesc) {
+ this.typeDesc = typeDesc;
+ }
+
+ public String getEffectScope() {
+ return effectScope == null ? "" : effectScope;
+ }
+
+ public void setEffectScope(String effectScope) {
+ this.effectScope = effectScope;
+ }
+
+ public String getEffectScopeDesc() {
+ return effectScopeDesc == null ? "" : effectScopeDesc;
+ }
+
+ public void setEffectScopeDesc(String effectScopeDesc) {
+ this.effectScopeDesc = effectScopeDesc;
+ }
+
+ public String getAddress() {
+ return address == null ? "" : address;
+ }
+
+ public void setAddress(String address) {
+ this.address = address;
+ }
+
+ public HouseInfoBean.Location getLocation() {
+ return location;
+ }
+
+ public void setLocation(HouseInfoBean.Location location) {
+ this.location = location;
+ }
+
+
+ public Long getMsgId() {
+ return msgId;
+ }
+
+ public void setMsgId(Long msgId) {
+ this.msgId = msgId;
+ }
+
+ public String getType() {
+ return type == null ? "" : type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getTitle() {
+ return title == null ? "" : title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getHomeId() {
+ return homeId == null ? "" : homeId;
+ }
+
+ public void setHomeId(String homeId) {
+ this.homeId = homeId;
}
public String getHomeName() {
@@ -27,20 +135,20 @@
this.homeName = homeName;
}
- public String getTime() {
- return time == null ? "" : time;
+ public String getStatus() {
+ return status == null ? "" : status;
}
- public void setTime(String time) {
- this.time = time;
+ public void setStatus(String status) {
+ this.status = status;
}
- public int getGrade() {
- return grade;
+ public Long getCreateTime() {
+ return createTime;
}
- public void setGrade(int grade) {
- this.grade = grade;
+ public void setCreateTime(Long createTime) {
+ this.createTime = createTime;
}
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 cf8f595..40e921a 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
@@ -59,6 +59,36 @@
}
private void initEvent() {
+
+ //鍙戠敓涓�
+ viewBinding.messageTabNascentCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.messageTabAllTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabNascentTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.messageTabRecoverTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.line1V.setVisibility(View.GONE);
+ viewBinding.line2V.setVisibility(View.VISIBLE);
+ viewBinding.line3V.setVisibility(View.GONE);
+ showFragment(0);
+ postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.nascent);
+ }
+ });
+ //宸叉仮澶�
+ viewBinding.messageTabRecoverCl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ viewBinding.messageTabAllTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabNascentTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabRecoverTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ viewBinding.line1V.setVisibility(View.GONE);
+ viewBinding.line2V.setVisibility(View.GONE);
+ viewBinding.line3V.setVisibility(View.VISIBLE);
+ showFragment(1);
+ postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.recover);
+ }
+ });
+
//鍏ㄩ儴
viewBinding.messageTabAllCl.setOnClickListener(new View.OnClickListener() {
@Override
@@ -69,55 +99,27 @@
viewBinding.line1V.setVisibility(View.VISIBLE);
viewBinding.line2V.setVisibility(View.GONE);
viewBinding.line3V.setVisibility(View.GONE);
- showFragment(0);
+ showFragment(2);
postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.all);
- }
- });
-
- viewBinding.messageTabNascentCl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- viewBinding.messageTabAllTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
- viewBinding.messageTabNascentTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.messageTabRecoverTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
- viewBinding.line1V.setVisibility(View.GONE);
- viewBinding.line2V.setVisibility(View.VISIBLE);
- viewBinding.line3V.setVisibility(View.GONE);
- showFragment(1);
- postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.nascent);
- }
- });
-
- viewBinding.messageTabRecoverCl.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- viewBinding.messageTabAllTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
- viewBinding.messageTabNascentTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
- viewBinding.messageTabRecoverTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.line1V.setVisibility(View.GONE);
- viewBinding.line2V.setVisibility(View.GONE);
- viewBinding.line3V.setVisibility(View.VISIBLE);
- showFragment(2);
- postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.recover);
}
});
}
private void initView() {
- viewBinding.messageTabAllTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
- viewBinding.messageTabNascentTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabAllTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
+ viewBinding.messageTabNascentTitleTv.setTextColor(getResources().getColor(R.color.text_FFFFFFFF, null));
viewBinding.messageTabRecoverTitleTv.setTextColor(getResources().getColor(R.color.text80_FFFFFF, null));
- viewBinding.line1V.setVisibility(View.VISIBLE);
- viewBinding.line2V.setVisibility(View.GONE);
+ viewBinding.line1V.setVisibility(View.GONE);
+ viewBinding.line2V.setVisibility(View.VISIBLE);
viewBinding.line3V.setVisibility(View.GONE);
if (this.currentIndex == 0) {
- postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.all);
- } else if (this.currentIndex == 1) {
postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.nascent);
- } else if (this.currentIndex == 2) {
+ } else if (this.currentIndex == 1) {
postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.recover);
+ } else if (this.currentIndex == 2) {
+ postEventBus(HdlCommonLogic.MessageFunctionTabSwitch.all);
}
}
@@ -145,9 +147,10 @@
private void initFragment(Bundle savedInstanceState) {
mFragmentManager = _mActivity.getSupportFragmentManager();
//纰庣墖鍐呴渶瑕佷娇鐢ㄦ潈闄愬拰forresult
- mAllMessageFragment = new AllMessageFragment();
+
mNascentMessageFragment = new NascentMessageFragment();
mRecoverMessageFragment = new RecoverMessageFragment();
+ mAllMessageFragment = new AllMessageFragment();
if (savedInstanceState != null) {
//鈥滃唴瀛橀噸鍚�濇椂璋冪敤 鑾峰彇鈥滃唴瀛橀噸鍚�濇椂淇濆瓨鐨勭储寮曚笅鏍�
currentIndex = savedInstanceState.getInt(CURRENT_FRAGMENT, 0);
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 5d19b61..725e233 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
@@ -83,6 +83,7 @@
if (eventBus.getTopic().equals(ConstantManage.message_function_tab_switch)) {
if (eventBus.getType().equals(HdlCommonLogic.MessageFunctionTabSwitch.nascent.toString())) {
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愯繘琛屼腑銆�");
+ updateListData();
}
}
}
--
Gitblit v1.8.0