From 4bc924d0ce29560a5e1ad1adf1042de032d954a1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 04 十二月 2025 14:50:56 +0800
Subject: [PATCH] 2025年12月04日14:50:54
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 12 --
app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 2
app/src/main/AndroidManifest.xml | 2
app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java | 79 +++++++++++++++++++
app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java | 11 +-
app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java | 70 -----------------
app/src/main/java/com/hdl/photovoltaic/ui/message/MessageHouseFragment.java | 13 +-
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 5 +
app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java | 1
app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java | 29 +++---
app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java | 2
app/build.gradle | 4
13 files changed, 122 insertions(+), 111 deletions(-)
diff --git a/app/build.gradle b/app/build.gradle
index 98eade4..36bd89c 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -237,8 +237,8 @@
// implementation 'com.aliyun.ams:alicloud-android-third-push-huawei:3.10.1'
//灏忕背鍥藉唴閫氶亾渚濊禆
implementation 'com.aliyun.ams:alicloud-android-third-push-xiaomi:3.9.2'
-////OPPO渚濊禆
-// implementation 'com.aliyun.ams:alicloud-android-third-push-oppo:3.10.1'
+//OPPO渚濊禆
+ implementation 'com.aliyun.ams:alicloud-android-third-push-oppo:3.9.2'
////vivo渚濊禆
// implementation 'com.aliyun.ams:alicloud-android-third-push-vivo:3.10.1'
////榄呮棌渚濊禆
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 971e36b..048e4a9 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -198,6 +198,7 @@
android:exported="false" />
<activity
android:name=".ui.CPowerStationActivity"
+ android:launchMode="singleTask"
android:exported="false" />
<activity
android:name=".ui.message.MessageInfoActivity"
@@ -254,6 +255,7 @@
android:exported="false" />
<activity
android:name=".ui.BPowerStationActivity"
+ android:launchMode="singleTask"
android:exported="false" />
<activity
android:name=".ui.LoginActivity"
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index bb99acf..92eb85a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -24,6 +24,7 @@
import com.alibaba.sdk.android.push.noonesdk.PushInitConfig;
import com.alibaba.sdk.android.push.noonesdk.PushServiceFactory;
import com.alibaba.sdk.android.push.register.MiPushRegister;
+import com.alibaba.sdk.android.push.register.OppoRegister;
import com.google.android.gms.common.ConnectionResult;
import com.google.android.gms.common.GoogleApiAvailability;
import com.google.firebase.messaging.FirebaseMessaging;
@@ -252,7 +253,11 @@
pushService.setLogLevel(CloudPushService.LOG_DEBUG);
}
//灏忕背
+ //appKey/appSecret鍦ㄥ皬绫冲紑鍙戣�呭钩鍙拌幏鍙�
MiPushRegister.register(this, "2882303761520382032", "5612038223032");
+ // OPPO閫氶亾娉ㄥ唽
+ //appKey/appSecret鍦∣PPO寮�鍙戣�呭钩鍙拌幏鍙�
+ OppoRegister.register(this, "d80747c83e38442aaa2e5183c310bae0", "86afce21417b49a4984816024b15d4b9");
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
index 2d9a54f..b84e291 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlAccountLogic.java
@@ -820,7 +820,7 @@
* 閫�鍑虹櫥褰�
*/
public void logout(LogoutType logoutType) {
- HdlResidenceLogic.getInstance().pushDel(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushDel(new CloudCallBeak<String>() {
@Override
public void onSuccess(String obj) {
// SharedPreUtils.putBoolean("pushAddCache", true);
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
index 8f5a6d8..0643bf0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPushLogic.java
@@ -2,14 +2,21 @@
import android.content.Context;
import android.content.Intent;
+import android.os.Build;
import android.text.TextUtils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
+import com.google.gson.JsonObject;
+import com.hdl.linkpm.sdk.core.exception.HDLException;
+import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.MessageStateType;
+import com.hdl.photovoltaic.internet.HttpClient;
+import com.hdl.photovoltaic.internet.api.HttpApi;
+import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.push.PushMessageInfoBean;
import com.hdl.photovoltaic.ui.BPowerStationActivity;
import com.hdl.photovoltaic.ui.bean.MessageBean;
@@ -47,6 +54,78 @@
}
/**
+ * 娣诲姞鎺ㄩ�乀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().getPushToken());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
+ json.addProperty("software", "PHOTOVOLTAIC");//杞欢鏉ユ簮鎶奝HOTOVOLTAIC鏀规垚XENTERRA锛屼篃灏变簯绔鐨勯�氶亾鍙凤紙channel)
+ json.addProperty("platform", "ALIYUN_APNS");//闃块噷浜戠殑鐗堟湰鐨刾latform
+// json.addProperty("platform", "FCM");//google鐨勭増鏈殑platform
+ json.addProperty("language", UserConfigManage.getInstance().getCurrentAppLanguage());//2.0杩藉姞鐨勫瓧娈�
+
+ HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
+ @Override
+ public void onSuccess(String pushId) {
+ if (!TextUtils.isEmpty(pushId)) {
+ UserConfigManage.getInstance().setPushId(pushId);
+ UserConfigManage.getInstance().Save();
+ }
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onSuccess(pushId);
+ }
+
+ }
+
+ @Override
+ public void onFailure(HDLException e) {
+ if (cloudCallBeak != null) {
+ cloudCallBeak.onFailure(e);
+ }
+ }
+ });
+
+
+ }
+
+ /**
+ * 鍒犻櫎鎺ㄩ�乀oken
+ *
+ * @param cloudCallBeak -
+ */
+ public void pushDel(CloudCallBeak<String> cloudCallBeak) {
+ String requestUrl = HttpApi.POST_push_del;
+ JsonObject json = new JsonObject();
+ json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
+ json.addProperty("pushToken", UserConfigManage.getInstance().getPushToken());
+
+ 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);
+ }
+ }
+ });
+
+
+ }
+
+ /**
* 鎺ㄩ�佹暟鎹粺涓�澶勭悊鐨勬柟娉�
*
* @param context 涓婁笅鏂�
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 7ccaa94..a620616 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlResidenceLogic.java
@@ -1140,77 +1140,7 @@
}
- /**
- * 娣诲姞鎺ㄩ�乀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().getPushToken());//App鐨勬帹閫乀oken锛屽湪鏋佸厜涓篟egId
- json.addProperty("software", "XENTERRA");//杞欢鏉ユ簮鎶奝HOTOVOLTAIC鏀规垚XENTERRA
- json.addProperty("platform", "ALIYUN_APNS");//闃块噷浜戠殑鐗堟湰鐨刾latform
-// json.addProperty("platform", "FCM");//google鐨勭増鏈殑platform
- json.addProperty("language", UserConfigManage.getInstance().getCurrentAppLanguage());//2.0杩藉姞鐨勫瓧娈�
- HttpClient.getInstance().requestHttp(requestUrl, json.toString(), new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String pushId) {
- if (!TextUtils.isEmpty(pushId)) {
- UserConfigManage.getInstance().setPushId(pushId);
- UserConfigManage.getInstance().Save();
- }
- if (cloudCallBeak != null) {
- cloudCallBeak.onSuccess(pushId);
- }
-
- }
-
- @Override
- public void onFailure(HDLException e) {
- if (cloudCallBeak != null) {
- cloudCallBeak.onFailure(e);
- }
- }
- });
-
-
- }
-
- /**
- * 鍒犻櫎鎺ㄩ�乀oken
- *
- * @param cloudCallBeak -
- */
- public void pushDel(CloudCallBeak<String> cloudCallBeak) {
- String requestUrl = HttpApi.POST_push_del;
- JsonObject json = new JsonObject();
- json.addProperty("pushId", UserConfigManage.getInstance().getPushId());
- json.addProperty("pushToken", UserConfigManage.getInstance().getPushToken());
-
- 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);
- }
- }
- });
-
-
- }
public static class HouseBeanClass {
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
index 55928f7..f4d3c15 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlUniLogic.java
@@ -968,6 +968,7 @@
*/
public void sendUni(String topic, HDLUniMP.UniCallBackBaseBean callBackBaseBean) {
try {
+// HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢---" +topic, false);
HDLUniMPSDKManager.getInstance().sendUniMPEvent(HDLUniMP.UNI_APP_ID, topic, getJSONObject(callBackBaseBean));
} catch (Exception e) {
HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡浜嬩欢---" + e.getMessage(), false);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
index 4265160..e70dad0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/BPowerStationActivity.java
@@ -111,7 +111,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
-// //閫氱煡鏍忕偣鍑昏繘鏉ワ紝闃叉搴旂敤鍦ㄥ悗鍙版椂琚噸澶嶅惎鍔�,闃块噷浜戞帹鍔ㄩ�氱煡鎸囧畾鎵撳紑鏌愪釜Activity锛屾病鏈夎缃瓼lags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);榛樿鍚姩鏂板疄渚嬶紝瀵艰嚧澶氫釜瀹炰緥
+//// //閫氱煡鏍忕偣鍑昏繘鏉ワ紝闃叉搴旂敤鍦ㄥ悗鍙版椂琚噸澶嶅惎鍔�,闃块噷浜戞帹鍔ㄩ�氱煡鎸囧畾鎵撳紑鏌愪釜Activity锛屾病鏈夎缃瓼lags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);榛樿鍚姩鏂板疄渚嬶紝瀵艰嚧澶氫釜瀹炰緥
// if (!isTaskRoot()) {
// finish();
// }
@@ -155,8 +155,8 @@
if (TextUtils.isEmpty(data)) {
return;
}
- PushMessageInfoBean pushMessageInfoBean = new Gson().fromJson(data, PushMessageInfoBean.class);
-// PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
+// PushMessageInfoBean pushMessageInfoBean = new Gson().fromJson(data, PushMessageInfoBean.class);
+ PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId())) {
return;
}
@@ -324,7 +324,7 @@
// UserConfigManage.getInstance().setRegistrationID(registrationID);
// UserConfigManage.getInstance().Save();
String finalRegistrationID = registrationID;
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
@@ -362,7 +362,7 @@
if (TextUtils.isEmpty(token)) {
return;
}
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔� PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
@@ -878,15 +878,16 @@
*/
private void clickNotificationMessageTab() {
//瑙﹀彂娑堟伅鐐瑰嚮浜嬩欢
- viewBinding.myMessageBottomIl2.clickTv.performClick();
-// if (currentFragmentIndex == 2) {
-// return;
-// }
-// currentFragmentIndex = 2;
-// bottomViewChangeOfStyle();
-// showFragment();
-// HdlCommonLogic.lowerTagType = LowerTagType.message;
-// HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.homepage_title_tab_switch, HomepageTitleTabSwitch.message.toString());
+// viewBinding.myMessageBottomIl2.clickTv.performClick();
+ if (currentFragmentIndex == 2) {
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
+ return;
+ }
+ currentFragmentIndex = 2;
+ bottomViewChangeOfStyle();
+ showFragment();
+ HdlCommonLogic.lowerTagType = LowerTagType.message;
+ HdlCommonLogic.getInstance().postEventBusSticky(ConstantManage.refresh_message_house, ConstantManage.refresh_message_house);
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
index e058dac..87fa7d0 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/CPowerStationActivity.java
@@ -152,7 +152,7 @@
return;
}
PushMessageInfoBean pushMessageInfoBean = HdlPushLogic.getInstance().pushDataProcessing("", "", data);
- if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId())) {
+ if (TextUtils.isEmpty(pushMessageInfoBean.getMsgId()) && !pushMessageInfoBean.isAiPrompt()) {
return;
}
HDLUniMPSDKManager.uinEnabled = false;
@@ -208,7 +208,10 @@
@Override
public void run() {
if (pushMessageInfoBean.isAiPrompt()) {
- HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_open_ai_push_message, new HDLUniMP.UniCallBackBaseBean());
+ HDLUniMP.UniCallBackBaseBean uniCallBackBaseBean = new HDLUniMP.UniCallBackBaseBean();
+ uniCallBackBaseBean.setType(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_open_ai_push_message);
+ HdlUniLogic.getInstance().sendUni(HDLUniMP.UNI_EVENT_NOTIFICATION_DEVICE_MODEL, uniCallBackBaseBean);
+// HdlLogLogic.print("uni---鍘熺敓涓诲姩鍚戝皬绋嬪簭鍙戦�侀�氱煡AI浜嬩欢---", false);
} else {
MessageBean messageBean = new MessageBean();
messageBean.setMsgId(Long.valueOf(pushMessageInfoBean.getMsgId()));
@@ -465,7 +468,7 @@
// UserConfigManage.getInstance().setRegistrationID(registrationID);
// UserConfigManage.getInstance().Save();
String finalRegistrationID = registrationID;
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
@@ -502,7 +505,7 @@
if (TextUtils.isEmpty(token)) {
return;
}
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
index b1cbd5c..d53c49e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -33,6 +33,7 @@
import com.hdl.photovoltaic.databinding.ActivityHomeLoginBinding;
import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlUniLogic;
import com.hdl.photovoltaic.ui.account.ChangePassword;
@@ -210,17 +211,6 @@
intent.setClass(HDLApp.getInstance(), StartActivity.class);
startActivity(intent);
viewBinding.homeLoginLanguageTv.setText(itemData.getTitle());
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
- @Override
- public void onSuccess(String pushId) {
- HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔� PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
- }
-
- @Override
- public void onFailure(HDLException e) {
- HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔け璐� PushToken:" + UserConfigManage.getInstance().getPushToken() + " 閿欒锛�" + e.getMessage(), true);
- }
- });
}
});
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
index 649009b..4526576 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -301,7 +301,7 @@
Log.d("鏉ヨ嚜鐐瑰嚮娑堟伅鐨勬暟鎹�===", JSONObject.toJSONString(getIntent().getExtras()));
for (String key : getIntent().getExtras().keySet()) {
Log.d("鏉ヨ嚜鐐瑰嚮娑堟伅鐨勬暟鎹�", "key: " + key + " value: " + getIntent().getExtras().get(key));
- if (key.equals("pushData")) {
+ if (key.equals("pushData") || key.equals("extraMap")) {
return Objects.requireNonNull(getIntent().getExtras().get(key)).toString();
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
index 6d46e04..cb1cf88 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/languageSelectionActivity.java
@@ -17,6 +17,7 @@
import com.hdl.photovoltaic.databinding.ActivityLanguageSelectionBinding;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlLogLogic;
+import com.hdl.photovoltaic.other.HdlPushLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
import com.hdl.photovoltaic.ui.StartActivity;
@@ -143,7 +144,7 @@
Intent intent = new Intent();
intent.setClass(HDLApp.getInstance(), StartActivity.class);
startActivity(intent);
- HdlResidenceLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
+ HdlPushLogic.getInstance().pushAdd(new CloudCallBeak<String>() {
@Override
public void onSuccess(String pushId) {
HdlLogLogic.print("娣诲姞浠ょ墝鍒颁簯绔� PushToken:" + UserConfigManage.getInstance().getPushToken() + " pushId:" + pushId, true);
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageHouseFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageHouseFragment.java
index a280182..2b1671f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageHouseFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/message/MessageHouseFragment.java
@@ -48,7 +48,7 @@
private FragementMessageHouseBinding viewBinding;
private MessageHouseAdapter mMessageHouseAdapter;
- private boolean isFirstLoading = true;
+ private boolean isRead = true;
private final List<MessageBean> mList = new ArrayList<>();
@@ -82,7 +82,7 @@
HdlMessageLogic.getInstance().getMessageHouseList(homeName, new CloudCallBeak<List<MessageBean>>() {
@Override
public void onSuccess(List<MessageBean> list) {
- isFirstLoading = false;
+ isRead = false;
if (isShowLoading) {
hideLoading();
}
@@ -339,18 +339,17 @@
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
HdlLogLogic.print("姝ｅ湪鐐瑰嚮銆愭秷鎭��");
- //绗簩娆¤繘鏉ヤ笉鏄剧ず鍔犺浇妗�
- if (!isFirstLoading) {
+ if (!isRead) {
+ //绗簩娆¤繘鏉ヤ笉鏄剧ず鍔犺浇妗�
initData(false);
}
+
}
} else if (eventBus.getTopic().equals(ConstantManage.refresh_message_house)) {
// 鍙栨秷绮樻�т簨浠�
EventBus.getDefault().removeStickyEvent(eventBus);
//绗簩娆¤繘鏉ヤ笉鏄剧ず鍔犺浇妗�
- if (!isFirstLoading) {
- initData(false);
- }
+ initData(false);
}
}
--
Gitblit v1.8.0