From f151e203da870dbe281defcb1daf84a1a38ecac1 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 29 十二月 2025 09:59:57 +0800
Subject: [PATCH] Merge branch 'master' into google
---
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
index 8ddb2c1..7cefa3a 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -5,6 +5,7 @@
import com.google.gson.Gson;
import com.hdl.photovoltaic.HDLApp;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.other.HdlFileLogic;
import com.hdl.photovoltaic.other.HdlLogLogic;
import com.hdl.photovoltaic.other.HdlResidenceLogic;
@@ -62,7 +63,7 @@
//鏄惁鏄疊绔处鍙风櫥褰�(true=B绔�)
private boolean isB_account;
//鏄惁姝ｅ紡鏈嶅姟鍣�(true锛氭寮忥紝false锛氭祴璇�)
- private boolean isOnlineServer = false;
+ private boolean isOnlineServer = true;
public boolean isOnlineServer() {
return isOnlineServer;
@@ -109,11 +110,11 @@
/// <summary>
- /// 娉ㄥ唽鏋佸厜ID
+ /// 娉ㄥ唽鏋佸厜ID锛岃胺姝孎CM鐨勪护鐗�
/// </summary>
- private String registrationID;
+ private String pushToken;
/// <summary>
- /// 娣诲姞鏋佸厜ID鍒颁簯绔垚鍔熸椂杩斿洖鐨�
+ /// 娣诲姞浠ょ墝鍒颁簯绔垚鍔熸椂杩斿洖鐨�
/// </summary>
private String pushId;
@@ -177,12 +178,12 @@
this.userImageUrl = userImageUrl;
}
- public String getRegistrationID() {
- return registrationID == null ? "" : registrationID;
+ public String getPushToken() {
+ return pushToken == null ? "" : pushToken;
}
- public void setRegistrationID(String registrationID) {
- this.registrationID = registrationID;
+ public void setPushToken(String pushToken) {
+ this.pushToken = pushToken;
}
public String getPushId() {
@@ -428,14 +429,7 @@
// SharedPreUtils.saveMyDataInfo("UserConfigManage.json", json, HDLApp.getInstance());
}
- /**
- * true琛ㄧず鏄腑鏂�
- *
- * @return true琛ㄧず鏄腑鏂�
- */
- public boolean isZh() {
- return currentAppLanguage.equals(LocalManageUtil.zh);
- }
+
}
--
Gitblit v1.8.0