From 4e4630ca78f00daf431088fbdc7e2ecc5b724369 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期五, 08 三月 2024 12:16:54 +0800
Subject: [PATCH] 2024年03月08日12:16:03

---
 app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java |   89 +++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 83 insertions(+), 6 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 3f2256a..e3ca3cd 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鍒楄〃
@@ -452,14 +497,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 +526,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>() {
@@ -649,6 +691,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