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 | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 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 4cf0947..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;
@@ -452,14 +454,12 @@
/**
* 鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣�
*
- * @param homeId 浣忓畢id
* @param tempType 娓╁害鍗曚綅绫诲瀷 (C 锛氭憚姘忓害锛� F 锛氬崕姘忓害)
* @param cloudCallBeak -
*/
- public void setResidenceTemperatureUnit(String homeId, String tempType, CloudCallBeak<Boolean> cloudCallBeak) {
+ public void setResidenceTemperatureUnit(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
@@ -483,13 +483,12 @@
/**
* 鑾峰彇鐢ㄦ埛鑷畾涔夐厤缃俯搴﹀崟浣嶈鎯�
*
- * @param homeId 浣忓畢id
* @param cloudCallBeak -
*/
- public void getResidenceTemperatureUnit(String homeId, CloudCallBeak<String> cloudCallBeak) {
+ public void getResidenceTemperatureUnit(CloudCallBeak<String> cloudCallBeak) {
String requestUrl = HttpApi.POST_C_F_CustomConfigInfo;
JsonObject json = new JsonObject();
- json.addProperty("homeId", homeId);
+// json.addProperty("homeId", homeId);
List<MessageBean> list = new ArrayList<>();
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@@ -594,9 +593,9 @@
* @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;
}
//璁㈤槄瑕佸叏閮ㄥ彇娑�
@@ -649,6 +648,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