From db937c029a3f9dbaec86cbbc944ebbee3ece13be Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 31 七月 2025 14:49:17 +0800
Subject: [PATCH] Merge branch '1.4.4' into dev
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 140 ++++++++++++++++++++++++++++++++++++++++------
1 files changed, 121 insertions(+), 19 deletions(-)
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 4080f22..d2dca00 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -4,12 +4,14 @@
import android.graphics.BitmapFactory;
import android.os.Build;
import android.text.TextUtils;
+import android.util.Log;
import com.google.gson.Gson;
import com.google.gson.JsonObject;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.ProjectOperation;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -86,6 +88,33 @@
return mHouseIdList;
}
+ /**
+ * 璁剧疆鍒楄〃鏁版嵁
+ *
+ * @param list 鏂板垪琛�
+ * @param isClear 鏄惁娓呴櫎鏃ф暟鎹�,true琛ㄧず娓呴櫎,鍚﹀垯涓嶆竻闄�;
+ */
+ public void setHouseIdList(List<HouseIdBean> list, boolean isClear) {
+ if (list == null || list.size() == 0) {
+ return;
+ }
+ if (isClear) {
+ this.clearHouseList();
+ }
+ if (this.mHouseIdList.size() == 0) {
+ this.mHouseIdList.addAll(list);
+ return;
+ }
+ for (int i = 0; i < list.size(); i++) {
+ this.setSingleHouseId(list.get(i));
+ }
+ }
+
+ /**
+ * 璁剧疆鍒楄〃鏁版嵁
+ *
+ * @param list 鏂板垪琛ㄦ暟鎹�
+ */
public void setHouseIdList(List<HouseIdBean> list) {
if (list == null || list.size() == 0) {
return;
@@ -142,6 +171,25 @@
for (int i = 0; i < mHouseIdList.size(); i++) {
if (mHouseIdList.get(i).getHomeId().equals(houseId)) {
mHouseIdList.remove(i);
+ break;
+ }
+ }
+ }
+
+ /**
+ * 鐢电珯Id瀵硅薄鏇存柊
+ *
+ * @param houseIdBean 鐢电珯id瀵硅薄
+ */
+ public void updateHouseIdBean(HouseIdBean houseIdBean) {
+ if (houseIdBean == null) {
+ return;
+ }
+ for (int i = 0; i < mHouseIdList.size(); i++) {
+ HouseIdBean h = mHouseIdList.get(i);
+ if (h.getHomeId().equals(houseIdBean.getHomeId())) {
+ h.setDebugStatus(houseIdBean.getDebugStatus());
+ //mHouseIdList.set(i,houseIdBean);鏁翠釜瀵硅薄鏇挎崲
break;
}
}
@@ -205,7 +253,7 @@
houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//瑁呮満瀹归噺
houseInfoBean.setPower(houseIdBean.getPower());//鍙戠數鍔熺巼
houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//浠婂ぉ鍙戠數閲�
- houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
+ houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
//娣诲姞鍒版湰鍦扮紦瀛�
addHouseToLocalMemory(houseInfoBean);
}
@@ -258,7 +306,6 @@
* ascending:鍗囧簭),
*/
public void getResidenceIdList(String key, String keyValue, CloudCallBeak<List<HouseIdBean>> cloudCallBeak) {
-
String requestUrl = HttpApi.POST_PowerStation_List;
JsonObject json = new JsonObject();
if (!TextUtils.isEmpty(key) && !TextUtils.isEmpty(keyValue)) {
@@ -319,7 +366,6 @@
}
});
}
-
}
@Override
@@ -348,14 +394,7 @@
* @param pageNo 椤电爜
* @param pageSize 椤垫暟锛堜竴椤靛灏戞暟鎹級
*/
- public void getResidenceIdList(
- String key,
- String keyValue,
- String installedCapacityMin,
- String installedCapacityMax,
- String debugStatus,
- String powerStationStatus,
- long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {
+ public void getResidenceIdList(String key, String keyValue, String installedCapacityMin, String installedCapacityMax, String debugStatus, String powerStationStatus, long pageNo, long pageSize, CloudCallBeak<HouseBeanClass> cloudCallBeak) {
String requestUrl = HttpApi.POST_PowerStation_List;
JsonObject json = new JsonObject();
@@ -585,7 +624,7 @@
json.addProperty("installedCapacityMin", installedCapacityMin);
}
if (!TextUtils.isEmpty(installedCapacityMax)) {
- json.addProperty("installedCapacityMin", installedCapacityMax);
+ json.addProperty("installedCapacityMax", installedCapacityMax);
}
if (!TextUtils.isEmpty(debugStatus)) {
json.addProperty("debugStatus", debugStatus);
@@ -914,8 +953,7 @@
*
* @param homeId 浣忓畢id
*/
- public void getResidenceInverterAllInfo(String
- homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
+ public void getResidenceInverterAllInfo(String homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
String requestUrl = HttpApi.POST_inverter_allInfo;
JsonObject json = new JsonObject();
json.addProperty("homeId", homeId);
@@ -945,8 +983,7 @@
* @param debugPerm 鎺堟潈鐘舵�侊紙true鍙互缁х画璋冭瘯锛�
* @param cloudCallBeak -
*/
- public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<
- Boolean> cloudCallBeak) {
+ public void homeUpdateDebugPerm(String homeId, boolean debugPerm, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.C_POST_HOME_UPDATEDEBUGPERM;
JsonObject json = new JsonObject();
json.addProperty("homeId", homeId);
@@ -1043,13 +1080,47 @@
* @param account C绔处鍙�
* @param cloudCallBeak -
*/
- public void getDeliverToAccount(String homeId, String
- account, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void getDeliverToAccount(String homeId, String account, CloudCallBeak<Boolean> cloudCallBeak) {
String requestUrl = HttpApi.POST_deliverToAccount;
JsonObject json = new JsonObject();
json.addProperty("homeId", homeId);
json.addProperty("account", account);//C绔处鍙�
// json.addProperty("zoneType", memberBean.getId());//鍖哄煙
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String jsonStr) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(true);
+ }
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+ }
+
+ /**
+ * 鏇存柊椤圭洰鐘舵�� 锛堜氦浠樸�侀獙鏀躲�佹挙閿�浜や粯銆侀獙鏀舵湭閫氳繃銆侀噸鏂拌皟璇曘�佷氦浠樺洖婊氱瓑鎿嶄綔锛夛紙https://hdl-gz.yuque.com/wnkbmh/diiq35/kegldc#gWveC锛�
+ *
+ * @param homeId 鐢电珯id
+ * @param communityId 绀惧尯id
+ * @param flowRecordContent 娴佽浆璁板綍鍐呭
+ * @param projectOperation 椤圭洰鐘舵��
+ * @param cloudCallBeak -
+ */
+ public void setUpdateProjectDebugStatus(String homeId, String communityId, String flowRecordContent, String projectOperation, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_UpdateProjectDebugStatus;
+ JsonObject json = new JsonObject();
+ json.addProperty("houseId", homeId);
+ json.addProperty("communityId", communityId);
+ json.addProperty("flowRecordContent", flowRecordContent);//娴佽浆璁板綍鍐呭
+ json.addProperty("projectFlowRecordActionEnum", projectOperation);
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
@@ -1082,6 +1153,37 @@
json.addProperty("produce", AppConfigManage.isIsOnlineServer());//琛ㄧず鏄惁鏄寮忔湇鍔″櫒
json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
json.addProperty("software", "PHOTOVOLTAIC");//杞欢鏉ユ簮
+
+ 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);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 鍒犻櫎鎺ㄩ�乀oken
+ *
+ * @param cloudCallBeak -
+ */
+ public void pushDel(CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_push_del;
+ JsonObject json = new JsonObject();
+ json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
+ json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
@@ -1157,4 +1259,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0