From 4db3692de0001eea35f938c1224181746e72933a Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 27 十一月 2025 21:30:07 +0800
Subject: [PATCH] 支持创建阿拉伯语言的脚本文件夹
---
app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java | 4
app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java | 45 ++++++++---
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java | 6
app/src/main/res/values/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java | 3
app/src/main/java/com/hdl/photovoltaic/HDLApp.java | 2
app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java | 6
app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java | 117 ++++++++--------------------
app/src/main/res/values-zh/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java | 3
app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java | 9 --
app/src/main/res/values-en/strings.xml | 1
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 3
app/src/main/res/values-ar/strings.xml | 1
16 files changed, 91 insertions(+), 117 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
index 0b240f2..0619ba1 100644
--- a/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
+++ b/app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -116,7 +116,7 @@
SharedPreUtils.init(this);
getAppLanguage();
//棰勫垱寤鸿剼鏈琷son鏂囦欢澶�
- HdlFileLogic.getInstance().createHdlESLocalJsonDirectory();
+ HdlFileLogic.getInstance().createHdlDeviceModelLocalJsonDirectory();
init();
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 c8709c2..60c6bcc 100644
--- a/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
+++ b/app/src/main/java/com/hdl/photovoltaic/config/UserConfigManage.java
@@ -429,14 +429,7 @@
// SharedPreUtils.saveMyDataInfo("UserConfigManage.json", json, HDLApp.getInstance());
}
- /**
- * true琛ㄧず鏄腑鏂�
- *
- * @return true琛ㄧず鏄腑鏂�
- */
- public boolean isZh() {
- return currentAppLanguage.equals(Languages.zh);
- }
+
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
index 8ec6c1f..9049626 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlESLocalJsonLogic.java
@@ -137,12 +137,8 @@
if (TextUtils.isEmpty(json)) {
return;
}
- //鑻辨枃鏂囦欢璺緞
- String fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonEnFilePath(deviceModel, fileName);
- if (UserConfigManage.getInstance().isZh()) {
- //涓枃鏂囦欢璺緞
- fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonZhFilePath(deviceModel, fileName);
- }
+ //鏂囦欢璺緞
+ String fullPath = HdlFileLogic.getInstance().getHdlESLocalLanguageJsonFilePath(UserConfigManage.getInstance().getCurrentAppLanguage(), deviceModel, fileName);
if (isDelPath) {
HdlFileLogic.getInstance().deleteFile(fullPath);
}
@@ -162,12 +158,8 @@
if (TextUtils.isEmpty(fileName)) {
return "";
}
- //鑻辨枃鏂囦欢璺緞
- String fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonEnFilePath(deviceModel, fileName);
- if (UserConfigManage.getInstance().isZh()) {
- //涓枃鏂囦欢璺緞
- fullPath = HdlFileLogic.getInstance().getHdlESLocalJsonZhFilePath(deviceModel, fileName);
- }
+ //鏂囦欢璺緞
+ String fullPath = HdlFileLogic.getInstance().getHdlESLocalLanguageJsonFilePath(UserConfigManage.getInstance().getCurrentAppLanguage(), deviceModel, fileName);
return HdlFileLogic.getInstance().readFile(fullPath);
} catch (Exception ignored) {
return "";
@@ -209,6 +201,7 @@
return address + "/" + UserConfigManage.getInstance().getCurrentAppLanguage() + "/" + deviceType + "/" + deviceModel + "/" + fileName + this.getVersion(joinFileName) + ".json";
}
//region ---------鏀逛竴鍔ㄤ簲锛堟敞鎰忥細濡傛灉鏄鍔犺澶囧瀷鍙枫�愯鍒癏dlFileLogic.createHdlESLocalJsonDirectory()鏂规硶閲岄潰鍒涘缓鏂囦欢澶广�戯級-----------
+
/**
* 鏂囦欢瀵瑰簲鐗堟湰鍙�
@@ -273,6 +266,34 @@
}
/**
+ * 鑾峰彇璁惧鍨嬪彿鍒楄〃
+ *
+ * @return 璁惧鍨嬪彿鍒楄〃
+ */
+ public List<String> getModelList() {
+ ArrayList<String> list = new ArrayList<>();
+ list.add(DeviceModel.INV);//骞剁綉-閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.LC);//璐熻浇涓績
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_BMS);//BMS
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY);//鐢垫睜鍖�
+ //绂荤嚎-閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV);//绂荤嚎-閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS);//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY);//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�
+ //绂荤嚎-3.6kw閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3);//绂荤嚎-閫嗗彉鍣�3.6kw
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3);//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
+ //鐢垫睜鍖呰浆鎹㈠櫒
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY);//鐢垫睜鍖呰浆鎹㈠櫒
+ //绂荤嚎-7.6kw閫嗗彉鍣�
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7);//绂荤嚎-閫嗗彉鍣�7.6kw
+ list.add(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7);//绂荤綉-閫嗗彉鍣�-BMS
+ list.add(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY);//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�15k
+ return list;
+
+ }
+
+ /**
* Json鏁版嵁閰嶇疆鏂囦欢鍚�
*/
public @interface FileName {
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
index e2d525d..4f91804 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlFileLogic.java
@@ -11,6 +11,7 @@
import com.hdl.photovoltaic.config.ConstantManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.enums.Languages;
+import com.hdl.photovoltaic.ui.adapter.LanguageAdapter;
import com.hdl.photovoltaic.utils.LocalManageUtil;
import org.apache.commons.io.FileUtils;
@@ -24,6 +25,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.List;
import java.util.Objects;
/**
@@ -88,7 +90,7 @@
}
/**
- * 鑾峰彇瀛樻斁銆愰┍鍔ㄦ枃浠跺す銆戞牴璺緞
+ * 鑾峰彇瀛樻斁椹卞姩銆愭枃浠跺す銆戞牴璺緞
*/
public String getDriveRootPath() {
return getAPPInternalStoreFilesPath() + "/upgrade/drive";
@@ -96,33 +98,26 @@
/**
- * 鑾峰彇瀛樻斁銆愬浐浠舵枃浠跺す銆戞牴璺緞
+ * 鑾峰彇瀛樻斁鍥轰欢銆愭枃浠跺す銆戞牴璺緞
*/
public String getFirmwareRootPath() {
return getAPPInternalStoreFilesPath() + "/upgrade/firmware";
}
- /**
- * 鑾峰彇涓枃銆恓son璧勬簮鏂囦欢澶广�戝叏璺緞
- *
- * @param deviceModel 璁惧鍨嬪彿
- */
- public String getHdlESLocalJsonZhRootPath(String deviceModel) {
- return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + Languages.zh + "/" + deviceModel;
- }
/**
- * 鑾峰彇鑻辨枃銆恓son璧勬簮鏂囦欢澶广�戝叏璺緞
+ * 鑾峰彇json璧勬簮銆愭枃浠跺す銆戝叏璺緞
*
+ * @param language 璇█ 閫氳繃鏋氫妇绫籐anguages.en鑾峰彇
* @param deviceModel 璁惧鍨嬪彿
*/
- public String getHdlESLocalJsonEnRootPath(String deviceModel) {
- return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + Languages.en + "/" + deviceModel;
+ public String getHdlESLocalJsonRootPath(String language, String deviceModel) {
+ return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + language + "/" + deviceModel;
}
/**
- * 鑾峰彇銆愭棩蹇楁枃浠躲�戝叏璺緞
+ * 鑾峰彇鏃ュ織銆愭枃浠躲�戝叏璺緞
*/
public String getLogFileNamePath() {
return getCurrentHomeRootPath() + "/log.txt";
@@ -130,35 +125,28 @@
/**
- * 鑾峰彇銆愮敤鎴锋枃浠躲�戝叏璺緞
+ * 鑾峰彇鐢ㄦ埛銆愭枃浠躲�戝叏璺緞
*/
public String getUserFilePath() {
return getAPPInternalStoreFilesPath() + "/userConfigManage.txt";
}
/**
- * 鑾峰彇涓枃銆恓son璧勬簮鏂囦欢銆戝叏璺緞
+ * 鑾峰彇鏈湴璇█json璧勬簮銆愭枃浠躲�戝叏璺緞
+ *
+ * @param language 璇█ 閫氳繃鏋氫妇绫籐anguages.en鑾峰彇
+ * @param deviceModel 璁惧鍨嬪彿
+ * @param fileName 鏂囦欢鍚�
*/
- public String getHdlESLocalJsonZhFilePath(String deviceModel, String fileName) {
+ public String getHdlESLocalLanguageJsonFilePath(String language, String deviceModel, String fileName) {
if (!fileName.endsWith(".json")) {
fileName += ".json";
}
- return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + Languages.zh + "/" + deviceModel + "/" + fileName;
+ return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + language + "/" + deviceModel + "/" + fileName;
}
/**
- * 鑾峰彇鑻辨枃銆恓son璧勬簮鏂囦欢銆戝叏璺緞
- */
- public String getHdlESLocalJsonEnFilePath(String deviceModel, String fileName) {
- if (!fileName.endsWith(".json")) {
- fileName += ".json";
- }
- return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + Languages.en + "/" + deviceModel + "/" + fileName;
- }
-
-
- /**
- * 鑾峰彇椹卞姩鍗囩骇鏂囦欢鍏ㄨ矾寰�
+ * 鑾峰彇椹卞姩鍗囩骇銆愭枃浠躲�戝叏璺緞
*
* @param driverCode 椹卞姩缂栫爜
* @param version 椹卞姩鐗堟湰
@@ -170,7 +158,7 @@
}
/**
- * 鑾峰彇鍥轰欢鍗囩骇鏂囦欢鍏ㄨ矾寰�
+ * 鑾峰彇鍥轰欢鍗囩骇銆愭枃浠躲�戝叏璺緞
*
* @param imageId 闀滃儚id
* @param version 椹卞姩鐗堟湰
@@ -186,7 +174,7 @@
//region ---------銆愭枃浠跺す銆戞搷浣�-----------
/**
- * 棰勫垱寤烘枃浠跺す
+ * 棰勫垱寤恒�愭枃浠跺す銆�
*/
public void createDirectory() {
//瀛樻斁浣忓畢淇℃伅
@@ -198,58 +186,23 @@
}
/**
- * 棰勫垱寤簀son璧勬簮鏂囦欢澶�
+ * 棰勫垱寤鸿澶噅son璧勬簮銆愭枃浠跺す銆�
*/
- public void createHdlESLocalJsonDirectory() {
- //涓枃鏂囦欢澶�
- //骞剁綉-閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV));//骞剁綉-閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.LC));//璐熻浇涓績
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BMS));//BMS
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY));//鐢垫睜鍖�
- //绂荤嚎-閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV));//绂荤嚎-閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�
+ public void createHdlDeviceModelLocalJsonDirectory() {
+ List<LanguageAdapter.ItemData> languageList = LocalManageUtil.getLanguageList();
+ List<String> deviceModelList = HdlESLocalJsonLogic.getInstance().getModelList();
+ for (int i = 0; i < languageList.size(); i++) {
+ LanguageAdapter.ItemData languageModel = languageList.get(i);
+ for (int j = 0; j < deviceModelList.size(); j++) {
+ String deviceModel = deviceModelList.get(j);
+ this.createFileDir(this.getHdlESLocalJsonRootPath(languageModel.getLanguage(), deviceModel));//骞剁綉-閫嗗彉鍣�
+ }
+ }
- //绂荤嚎-3.6kw閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//绂荤嚎-閫嗗彉鍣�3.6kw
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
- //鐢垫睜鍖呰浆鎹㈠櫒
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//鐢垫睜鍖呰浆鎹㈠櫒
-
- //绂荤嚎-7.6kw閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7));//绂荤嚎-閫嗗彉鍣�7.6kw
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7));//绂荤綉-閫嗗彉鍣�-BMS
- this.createFileDir(this.getHdlESLocalJsonZhRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�15k
-
-
-
- //鑻辨枃鏂囦欢澶�
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV));
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.LC));
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BMS));
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_BATTERY));
- //绂荤嚎閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV));//绂荤嚎-閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�
-
- //绂荤嚎-3.6kw閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_3));//绂荤嚎-閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_3));//绂荤綉-閫嗗彉鍣�-铏氭嫙BMS
-
- //鐢垫睜鍖呰浆鎹㈠櫒
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B5K_BATTERY));//鐢垫睜鍖呰浆鎹㈠櫒
-
- //绂荤嚎-7.6kw閫嗗彉鍣�
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_7));//绂荤嚎-閫嗗彉鍣�7.6kw
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.OFF_INV_BMS_7));//绂荤綉-閫嗗彉鍣�-BMS
- this.createFileDir(this.getHdlESLocalJsonEnRootPath(HdlESLocalJsonLogic.DeviceModel.INV_KE_GLE_B15K_BATTERY));//绂荤綉-閫嗗彉鍣�-鐢垫睜鍖�15k
}
/**
- * 鍒涘缓鏂囦欢澶�
+ * 鍒涘缓銆愭枃浠跺す銆�
*
* @param fullPath fullPath 鍏ㄨ矾寰�
* @return -
@@ -271,7 +224,7 @@
/**
- * 鍒犻櫎鏂囦欢澶�
+ * 鍒犻櫎銆愭枃浠跺す銆�
*
* @param fullPath 鍏ㄨ矾寰�
*/
@@ -305,7 +258,7 @@
//region ---------銆愭枃浠躲�戞搷浣�-----------
/**
- * 鍒涘缓鏂囦欢
+ * 鍒涘缓銆愭枃浠躲��
*
* @param fullPath 鍏ㄨ矾寰�
* @return -
@@ -326,7 +279,7 @@
}
/**
- * 鍒犻櫎鏂囦欢
+ * 鍒犻櫎銆愭枃浠躲��
*
* @param fullPath 鍏ㄨ矾寰�
* @return -
diff --git a/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java b/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
index afa02c2..295ae25 100644
--- a/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
+++ b/app/src/main/java/com/hdl/photovoltaic/other/HdlPowerStationDataStatisticsLogic.java
@@ -7,6 +7,7 @@
import com.google.gson.reflect.TypeToken;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.photovoltaic.config.UserConfigManage;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.TimeType;
import com.hdl.photovoltaic.internet.HttpClient;
import com.hdl.photovoltaic.internet.api.HttpApi;
@@ -100,7 +101,7 @@
}
json.addProperty("type", type);//绫诲瀷
if (!TextUtils.isEmpty(time)) {
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
//鑻辨枃鐨勬椂鍊欓渶瑕佹棩鏈熸牸寮�
if (TimeType.day.equals(type)) {
String[] ary = time.split("/");
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 75d3fe3..b1cbd5c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/LoginActivity.java
@@ -633,7 +633,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
@@ -656,7 +656,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(text_color, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
}, startIndex2, endIndex2, 0);
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 770714d..406d6cd 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/StartActivity.java
@@ -208,8 +208,8 @@
super.updateDrawState(ds);
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_38C494, null));
- // 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ // 鍘绘帀涓嬪垝绾�(涓枃淇濈暀涓嬪垝绾�)
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
@@ -232,7 +232,7 @@
//璁剧疆瀛椾綋棰滆壊
ds.setColor(getResources().getColor(R.color.text_38C494, null));
// 鍘绘帀涓嬪垝绾�
- ds.setUnderlineText(!UserConfigManage.getInstance().isZh());
+ ds.setUnderlineText(!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh));
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
index 91c829d..44f6d18 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java
@@ -22,6 +22,7 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityChangePasswordBinding;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.VerifyType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
@@ -72,7 +73,7 @@
* 鍒濆鍖栫晫闈�
*/
private void initView() {
- if (UserConfigManage.getInstance().isZh()) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
viewBinding.regionAccountTv.setText(getText(R.string.home_chinese_mainland));
viewBinding.regionAccountNumberTv.setText("+86");
} else {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
index f54a108..dd7cbb6 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java
@@ -21,6 +21,7 @@
import com.hdl.photovoltaic.config.AppConfigManage;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityRegisterAccountBinding;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.VerifyType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
@@ -98,7 +99,7 @@
private void initView() {
//鏍规嵁app璇█榛樿鏈嶅姟鍣ㄥ湴鍧�
- if (UserConfigManage.getInstance().isZh()) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
mUrl = "https://china-gateway.hdlcontrol.com";
viewBinding.regionTv.setText("HDL China");
viewBinding.regionAccountTv.setText(getText(R.string.home_chinese_mainland));
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
index cb5864d..f3e739e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java
@@ -13,6 +13,7 @@
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityBindPhoneBinding;
+import com.hdl.photovoltaic.enums.Languages;
import com.hdl.photovoltaic.enums.VerifyType;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAccountLogic;
@@ -109,7 +110,7 @@
}
private void initView() {
- if (UserConfigManage.getInstance().isZh()) {
+ if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
viewBinding.bindAreaTv.setText(getText(R.string.home_chinese_mainland));
viewBinding.bindAreaNumberTv.setText("+86");
} else {
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
index 09815a2..834f475 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/powerstation/HouseAndDeviceFragment.java
@@ -354,8 +354,7 @@
delayedConfirmationCancelDialog.dismiss();
if (isWaitDelivered) {
showLoading();
- String flowRecordContent = UserConfigManage.getInstance().isZh() ? "鏂扮壒閿愯兘app鍙戣捣鐢电珯閲嶆柊璋冭瘯" : "The Xenterra app initiates the re-commissioning of the power station";
- HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), flowRecordContent, ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() {
+ HdlResidenceLogic.getInstance().setUpdateProjectDebugStatus(houseIdBean.getHomeId(), houseIdBean.getCommunityId(), getString(R.string.re_commissioning_power_station), ProjectOperation.DEBUGGING_AGAIN.toString(), new CloudCallBeak<Boolean>() {
@Override
public void onSuccess(Boolean list) {
hideLoading();
diff --git a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
index 760184a..25ea163 100644
--- a/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
+++ b/app/src/main/java/com/hdl/photovoltaic/utils/TimeUtils.java
@@ -47,14 +47,14 @@
switch (timeType) {
case TimeType.day: {
timeDateFormat = TimeUtils.zhDateYearMonthDayFormat;
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
timeDateFormat = TimeUtils.enDateYearMonthDayFormat;
}
}
break;
case TimeType.month: {
timeDateFormat = TimeUtils.zhDateYearMonthFormat;
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
timeDateFormat = TimeUtils.enDateYearMonthFormat;
}
}
@@ -62,7 +62,7 @@
case TimeType.year:
case TimeType.all: {
timeDateFormat = TimeUtils.zhDateYearFormat;
- if (!UserConfigManage.getInstance().isZh()) {
+ if (!UserConfigManage.getInstance().getCurrentAppLanguage().equals(Languages.zh)) {
timeDateFormat = TimeUtils.enDateYearFormat;
}
}
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 3baf2ca..b94cee5 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -371,4 +371,5 @@
<string name="ai_butler_message">乇爻丕賱丞 賲爻丕毓丿 丕賱匕賰丕亍 丕賱丕氐胤賳丕毓賷</string>
<string name="app_name_title">賳賵乇賷賳睾 丕賱噩丿賷丿</string>
<string name="or">丕賱丕丨鬲賲丕賱</string>
+ <string name="re_commissioning_power_station">鬲賲 廿毓丕丿丞 鬲卮睾賷賱 賲丨胤丞 丕賱胤丕賯丞 丕賱噩丿賷丿丞 賲賳 胤乇丕夭 APP</string>,
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index c126a24..24b40af 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -373,4 +373,5 @@
<string name="ai_butler_message">AI Butler message</string>
<string name="app_name_title">Xenterra Solar</string>
<string name="or">OR</string>
+ <string name="re_commissioning_power_station">The Xenterra app initiates the re-commissioning of the power station</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index c50331a..c3970a1 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -369,4 +369,5 @@
<string name="ai_butler_message">AI绠″娑堟伅</string>
<string name="app_name_title">鏂扮壒閿愯兘</string>
<string name="or">OR</string>
+ <string name="re_commissioning_power_station">鏂扮壒閿愯兘app鍙戣捣鐢电珯閲嶆柊璋冭瘯</string>
</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1982d98..6eab081 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -374,4 +374,5 @@
<string name="ai_butler_message">AI butler message</string>
<string name="app_name_title">Xenterra Solar</string>
<string name="or">OR</string>
+ <string name="re_commissioning_power_station">The Xenterra app initiates the re-commissioning of the power station</string>
</resources>
\ No newline at end of file
--
Gitblit v1.8.0