From f3c2e501e1d2924f3a6cc0a99f12fc1267603058 Mon Sep 17 00:00:00 2001 From: mac <user@users-MacBook-Pro.local> Date: 星期四, 07 三月 2024 21:31:15 +0800 Subject: [PATCH] 2024年03月07日21:31:08 --- app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 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 2985755..e3ca3cd 100644 --- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java +++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java @@ -28,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; @@ -87,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鍒楄〃 @@ -659,7 +702,7 @@ JsonObject json = new JsonObject(); json.addProperty("deviceName", Build.MODEL);//璁惧鍚嶇О json.addProperty("deviceType", "Android");//璁惧绫诲瀷 - json.addProperty("produce", AppConfigManage.isIsOnlineServer());//鏄惁鏄敓鎴愮増鏈� + json.addProperty("produce", AppConfigManage.isIsOnlineServer());//琛ㄧず鏄惁鏄寮忔湇鍔″櫒 json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId json.addProperty("software", "PHOTOVOLTAIC");//杞欢鏉ユ簮 -- Gitblit v1.8.0