From 162ca0f6633f3aa246a40e8ba3d3e9a54f3a4cb5 Mon Sep 17 00:00:00 2001
From: hxb <hxb@hdlchina.com.cn>
Date: 星期六, 11 五月 2024 14:45:21 +0800
Subject: [PATCH] 依赖1.0.21 sdk，解决数据乱的问题
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 114 insertions(+), 0 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 5c91849..a21d962 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -2,12 +2,14 @@
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
+import android.os.Build;
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.bean.HttpResponsePack;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
@@ -26,6 +28,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
@@ -85,6 +88,48 @@
houseIdList = new ArrayList<>();
}
this.houseIdList = houseIdList;
+ }
+
+ /**
+ * 鍒犻櫎鐢电珯
+ *
+ * @param houseId 鐢电珯id
+ */
+ public void delHouseId(String houseId) {
+ if (TextUtils.isEmpty(houseId)) {
+ return;
+ }
+ for (int i = 0; i < houseIdList.size(); i++) {
+ if (houseIdList.get(i).getHomeId().equals(houseId)) {
+ houseIdList.remove(i);
+ break;
+ }
+ }
+ }
+
+ /**
+ * 绉诲姩鐢电珯浣嶇疆
+ *
+ * @param houseId 鐢电珯id
+ */
+ public void moveHouseId(String houseId) {
+ if (TextUtils.isEmpty(houseId)) {
+ return;
+ }
+ int index = -1;
+ for (int i = 0; i < houseIdList.size(); i++) {
+ if (houseIdList.get(i).getHomeId().equals(houseId)) {
+ index = i;
+ break;
+ }
+ }
+ if (index == -1) {
+ return;
+ }
+ //index==0琛ㄧず鍙湁涓�涓厓绱犳垨鑰呭湪棣栦綅,涓嶉渶瑕佺Щ鍔ㄤ綅缃�
+ if (index > 0) {
+ Collections.swap(houseIdList, index - 1, index);
+ }
}
//浣忓畢ID鍒楄〃
@@ -317,6 +362,39 @@
json.addProperty("electrovalence", houseInfoBean.getElectrovalence());
json.addProperty("totalCost", houseInfoBean.getTotalCost());
json.addProperty("zoneType", houseInfoBean.getZoneType());
+ 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 frontHomeId 鍓嶉潰鐨勭數绔檌d锛屽鏋滀笉浼犺〃绀烘帓鍒扮涓�浣�
+ * @param cloudCallBeak -
+ */
+ public void moveResidence(String homeId, String frontHomeId, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_PowerStation_UserSort;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ if (!TextUtils.isEmpty(frontHomeId)) {
+ json.addProperty("frontHomeId", frontHomeId);
+ }
+// json.addProperty("zoneType", "zoneType");
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
public void onSuccess(String str) {
@@ -609,6 +687,7 @@
UserConfigManage.getInstance().setHomeName(houseIdBean.getHomeName());
//閲嶆柊璁剧疆鏈湴閫氳绉橀挜
UserConfigManage.getInstance().setLocalSecret(houseIdBean.getLocalSecret());
+ UserConfigManage.getInstance().Save();
//閰嶇疆鏈湴閫氫俊鐨勪俊鎭�
HDLLinkConfig.getInstance().setHomeId(UserConfigManage.getInstance().getHomeId());
HDLLinkConfig.getInstance().setLocalSecret(UserConfigManage.getInstance().getLocalSecret());
@@ -646,6 +725,41 @@
});
}
+
+ /**
+ * 娣诲姞鎺ㄩ�乀oken
+ *
+ * @param cloudCallBeak -
+ */
+ public void pushAdd(CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_push_add;
+ JsonObject json = new JsonObject();
+ json.addProperty("deviceName", Build.MODEL);//璁惧鍚嶇О
+ json.addProperty("deviceType", "Android");//璁惧绫诲瀷
+ 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);
+ }
+ }
+ });
+
+
+ }
+
static class HouseBeanClass {
//鎬绘潯鏁�
--
Gitblit v1.8.0