app/src/main/java/com/hdl/photovoltaic/HDLApp.java
@@ -116,7 +116,7 @@ SharedPreUtils.init(this); getAppLanguage(); //预创建脚本json文件夹 HdlFileLogic.getInstance().createHdlESLocalJsonDirectory(); HdlFileLogic.getInstance().createHdlDeviceModelLocalJsonDirectory(); init();
@@ -429,14 +429,7 @@ // SharedPreUtils.saveMyDataInfo("UserConfigManage.json", json, HDLApp.getInstance()); } /** * true表示是中文 * * @return true表示是中文 */ public boolean isZh() { return currentAppLanguage.equals(Languages.zh); } } 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 ---------改一动五（注意：如果是增加设备型号【要到HdlFileLogic.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 { 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"; } /** * 获取中文【json资源文件夹】全路径 * * @param deviceModel 设备型号 */ public String getHdlESLocalJsonZhRootPath(String deviceModel) { return getAPPInternalStoreFilesPath() + "/hdlESLocalJson/" + Languages.zh + "/" + deviceModel; } /** * 获取英文【json资源文件夹】全路径 * 获取json资源【文件夹】全路径 * * @param language 语言 通过枚举类Languages.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"; } /** * 获取中文【json资源文件】全路径 * 获取本地语言json资源【文件】全路径 * * @param language 语言 通过枚举类Languages.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; } /** * 获取英文【json资源文件】全路径 */ 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 @@ } /** * 预创建json资源文件夹 * 预创建设备json资源【文件夹】 */ 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 - 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("/"); 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); 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)); }
@@ -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 { 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)); 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 { 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(); 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; } } 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> 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> 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> 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>
