From 8b43d4e1190fc9e2261be0579e53cc6c2987f946 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 27 十一月 2025 19:37:56 +0800
Subject: [PATCH] 2025年11月27日19:37:50 备份代码
---
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 17 +++++++++++------
1 files changed, 11 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 e816a8f..15111de 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -253,7 +253,7 @@
houseInfoBean.setInstalledCapacity(houseIdBean.getInstalledCapacity());//瑁呮満瀹归噺
houseInfoBean.setPower(houseIdBean.getPower());//鍙戠數鍔熺巼
houseInfoBean.setTodayElectricity(houseIdBean.getTodayElectricity());//浠婂ぉ鍙戠數閲�
- houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
+ houseInfoBean.setPowerStationStatus(houseIdBean.getPowerStationStatus());//鐢电珯鐘舵��(鐢电珯鐘舵�� 1:姝ｅ父(杩愯),2:绂荤嚎,3:杩炴帴涓�,4:鏁呴殰)
//娣诲姞鍒版湰鍦扮紦瀛�
addHouseToLocalMemory(houseInfoBean);
}
@@ -1151,14 +1151,19 @@
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("pushToken", UserConfigManage.getInstance().getPushToken());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
json.addProperty("software", "PHOTOVOLTAIC");//杞欢鏉ユ簮
+ json.addProperty("language", UserConfigManage.getInstance().getCurrentAppLanguage());//2.0杩藉姞鐨勫瓧娈�
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
- public void onSuccess(String jsonStr) {
+ public void onSuccess(String pushId) {
+ if (!TextUtils.isEmpty(pushId)) {
+ UserConfigManage.getInstance().setPushId(pushId);
+ UserConfigManage.getInstance().Save();
+ }
if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(jsonStr);
+ cloudCallBeak.onSuccess(pushId);
}
}
@@ -1183,7 +1188,7 @@
String requestUrl = HttpApi.POST_push_del;
JsonObject json = new JsonObject();
json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
- json.addProperty("pushToken", UserConfigManage.getInstance().getRegistrationID());
+ json.addProperty("pushToken", UserConfigManage.getInstance().getPushToken());
HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
@Override
@@ -1259,4 +1264,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.8.0