From ba84a556dc93fcf75e6ec76f999344d3f96ad788 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 02 二月 2024 18:05:24 +0800
Subject: [PATCH] 2024年02月02日18:04:36
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 156 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 149 insertions(+), 7 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 6dd0118..304fac9 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;
@@ -16,6 +18,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 +58,7 @@
}
/**
- * 鑾峰彇浣忓畢鍒楄〃
+ * 鑾峰彇缂撳瓨浣忓畢鍒楄〃
*
* @return 浣忓畢鍒楄〃
*/
@@ -71,7 +74,7 @@
}
/**
- * 鑾峰彇浣忓畢ID鍒楄〃
+ * 鑾峰彇缂撳瓨浣忓畢ID鍒楄〃
*
* @return 浣忓畢ID鍒楄〃
*/
@@ -93,7 +96,7 @@
/**
- * 鑾峰彇浣忓畢鍒楄〃
+ * 鑾峰彇浣忓畢鍒楄〃锛屽寘鎷幏鍙栦綇瀹卛d鍒楄〃锛屼綇瀹呰鎯呭垪琛紱
*
* @param cloudCallBeak -
*/
@@ -447,6 +450,67 @@
}
+
+ /**
+ * 鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣�
+ *
+ * @param tempType 娓╁害鍗曚綅绫诲瀷 (C 锛氭憚姘忓害锛� F 锛氬崕姘忓害)
+ * @param cloudCallBeak -
+ */
+ public void setResidenceTemperatureUnit(String tempType, CloudCallBeak<Boolean> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_C_F_CustomConfig;
+ JsonObject json = new JsonObject();
+ 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 cloudCallBeak -
+ */
+ public void getResidenceTemperatureUnit(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);
+ }
+ }
+ });
+
+
+ }
+
/**
* 娣诲姞銆愪綇瀹呰鎯呫�戝埌鏈湴缂撳瓨
*
@@ -509,14 +573,29 @@
}
/**
+ * 鑾峰彇浣忓畢Id瀵硅薄
+ *
+ * @param homeId 浣忓畢id
+ * @return 鍒楄〃绱㈠紩
+ */
+ public HouseIdBean getHouseId(String homeId) {
+ for (int i = 0; i < houseIdList.size(); i++) {
+ if (houseIdList.get(i).getHomeId().equals(homeId)) {
+ return houseIdList.get(i);
+ }
+ }
+ return null;
+ }
+
+ /**
* 鍒囨崲浣忓畢
*
* @param houseIdBean 浣忓畢Id瀵硅薄
*/
public void switchHouse(HouseIdBean houseIdBean) {
- String oidHomeId = UserConfigManage.getInstance().getHomeId();
- if (houseIdBean.getHomeId().equals(oidHomeId)) {
- HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�");
+ String homeId = UserConfigManage.getInstance().getHomeId();
+ if (houseIdBean.getHomeId().equals(homeId)) {
+ HdlLogLogic.print("鐐瑰嚮鍚屼竴涓綇瀹�--->" + homeId);
return;
}
//璁㈤槄瑕佸叏閮ㄥ彇娑�
@@ -538,7 +617,70 @@
//閲嶆柊鍒涘缓浣忓畢鏂囦欢澶�
HdlFileLogic.getInstance().createDirectory();
//杩涘幓浣忓畢璇︽儏鎼滅储涓�涓嬮�嗗彉鍣ㄥ垪琛�,鐩殑鏄缓绔嬮�氳閫氶亾;
- HdlDeviceLogic.getInstance().searchGateway(null);
+ HdlDeviceLogic.getInstance().searchCurrentHomeGateway(null);
+ }
+
+
+ /**
+ * 鐢电珯鏁版嵁(缁熻)
+ *
+ * @param homeId 浣忓畢id
+ */
+ public void getResidenceInverterAllInfo(String homeId, CloudCallBeak<Bitmap> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_inverter_allInfo;
+ JsonObject json = new JsonObject();
+ json.addProperty("homeId", homeId);
+ 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 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