From 11409771024381e06173490d846bf121e6a19552 Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期四, 15 一月 2026 21:29:05 +0800
Subject: [PATCH] 2026年01月15日21:29:00
---
app/src/main/res/layout/activity_change_password.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java | 4 +
app/src/main/java/com/hdl/photovoltaic/ui/account/ChangePassword.java | 66 ++++++++++++----
app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java | 9 ++
app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java | 4 +
app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java | 3
app/src/main/res/layout/activity_register_account.xml | 2
app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/me/BindPhoneActivity.java | 4 +
app/src/main/java/com/hdl/photovoltaic/ui/me/UnregisterActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/me/NotificationSettingsActivity.java | 4
app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java | 9 ++
app/src/main/java/com/hdl/photovoltaic/ui/me/HelpWebActivity.java | 3
app/src/main/java/com/hdl/photovoltaic/ui/account/RegisterAccountActivity.java | 54 +++++++++----
app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java | 8 +
app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java | 3
18 files changed, 148 insertions(+), 39 deletions(-)
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 44f6d18..c86a48e 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
@@ -81,25 +81,57 @@
viewBinding.regionAccountNumberTv.setText("+964");
}
switchPhoneOrMailView();
- try {
- Country.load(this);
- Country country = null;
- if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
- //鍐嶆牴鎹郴缁熻瑷�
- country = Country.getCountryInfo();
- } else {
- //鍏堟牴鎹畾浣�
- country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
- }
- if (country != null) {
- viewBinding.regionAccountTv.setText(country.translate);
- viewBinding.regionAccountNumberTv.setText("+" + country.code);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+// try {
+// Country.load(this);
+// Country country = null;
+// if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
+// //鍐嶆牴鎹郴缁熻瑷�
+// country = Country.getCountryInfo();
+// } else {
+// //鍏堟牴鎹畾浣�
+// country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
+// }
+// if (country != null) {
+// viewBinding.regionAccountTv.setText(country.translate);
+// viewBinding.regionAccountNumberTv.setText("+" + country.code);
+// }
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+ new Thread(
+ new Runnable() {
+ @Override
+ public void run() {
+ try {
+ final Country[] country = new Country[1];
+ Country.load(_mActivity);
+ if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(_mActivity))) {
+ //鍐嶆牴鎹郴缁熻瑷�
+ country[0] = Country.getCountryInfo();
+ } else {
+ //鍏堟牴鎹畾浣�
+ country[0] = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(_mActivity));
+ }
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (country != null) {
+ viewBinding.regionAccountTv.setText(country[0].translate);
+ viewBinding.regionAccountNumberTv.setText("+" + country[0].code);
+ }
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ ).start();
HdlCommonLogic.getInstance().setSpan(viewBinding.changePhoneVerificationTv, viewBinding.changePhoneVerificationTv.getText().toString(), true, null);
HdlCommonLogic.getInstance().setSpan(viewBinding.changeMailVerificationTv, viewBinding.changeMailVerificationTv.getText().toString(), true, null);
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.changeBackTv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
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 dd7cbb6..ad3ec6a 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
@@ -111,26 +111,44 @@
viewBinding.regionAccountNumberTv.setText("+964");
}
switchPhoneOrEmailStyleView();
- try {
- Country.load(this);
- Country country = null;
- if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(this))) {
- //鍐嶆牴鎹郴缁熻瑷�
- country = Country.getCountryInfo();
- } else {
- //鍏堟牴鎹畾浣�
- country = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(this));
- }
- if (country != null) {
- viewBinding.regionAccountTv.setText(country.translate);
- viewBinding.regionAccountNumberTv.setText("+" + country.code);
- }
- } catch (Exception e) {
- e.printStackTrace();
- }
+
+
+ new Thread(
+ new Runnable() {
+ @Override
+ public void run() {
+ try {
+ final Country[] country = new Country[1];
+ Country.load(RegisterAccountActivity.this);
+ if (TextUtils.isEmpty(GPSManagerUtils.getInstance().getCountryCode(RegisterAccountActivity.this))) {
+ //鍐嶆牴鎹郴缁熻瑷�
+ country[0] = Country.getCountryInfo();
+ } else {
+ //鍏堟牴鎹畾浣�
+ country[0] = Country.getLocationCountryInfo(GPSManagerUtils.getInstance().getCountryCode(RegisterAccountActivity.this));
+ }
+ runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ if (country != null) {
+ viewBinding.regionAccountTv.setText(country[0].translate);
+ viewBinding.regionAccountNumberTv.setText("+" + country[0].code);
+ }
+ }
+ });
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
+ }
+ ).start();
+
+
HdlCommonLogic.getInstance().setSpan(viewBinding.registerPhoneVerificationTv, viewBinding.registerPhoneVerificationTv.getText().toString(), true, null);
HdlCommonLogic.getInstance().setSpan(viewBinding.registerMailVerificationTv, viewBinding.registerMailVerificationTv.getText().toString(), true, null);
-
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.registerBackTv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
index 7b0f20b..241fa66 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AccountAndSecurityActivity.java
@@ -106,7 +106,13 @@
viewBinding.setChangePswIl.sllLlRlNameTv.setText(R.string.home_login_change_password);
updateStyle();
-
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setAccountPhoneIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setAccountMailIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setChangePswIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setAccountCloseIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
index 0adf4c8..23f0a15 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BPersonalDataActivity.java
@@ -98,6 +98,15 @@
viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setText(bingPhone);
viewBinding.personalDataPhoneIl.sllLlRlRightContentTv.setTextColor(getColor(R.color.text_FFACACAC));
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
+
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataUserPortraitIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataUserNameIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataMailIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataQrCodeIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
index 428d112..eac1e7f 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/BindMailActivity.java
@@ -102,6 +102,9 @@
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
checkClearIconShowOrNot(viewBinding.bindMailEt.getText().toString());
HdlCommonLogic.getInstance().setSpan(viewBinding.bindMailVerificationTv, viewBinding.bindMailVerificationTv.getText().toString(), true, null);
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
/**
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 f3e739e..2434257 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
@@ -138,6 +138,10 @@
e.printStackTrace();
}
HdlCommonLogic.getInstance().setSpan(viewBinding.bindPhoneVerificationTv, viewBinding.bindPhoneVerificationTv.getText().toString(), true, null);
+
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
index 638eab9..206e088 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/CPersonalDataActivity.java
@@ -200,6 +200,15 @@
viewBinding.personalDataQrCodeIl.sllLlRlRightContentIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.qr_code));
setMemberHeadIcon();
updateStyle();
+
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataUserPortraitIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataUserNameIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataMailIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataPhoneIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.personalDataQrCodeIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/HelpWebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/HelpWebActivity.java
index a007d61..26e8097 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/HelpWebActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/HelpWebActivity.java
@@ -50,6 +50,9 @@
} else {
viewBinding.contentView.loadUrl("https://site-3q43pvne.trial.baklib.site");
}
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
index fa765ae..1f074bf 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/MeChangePasswordActivity.java
@@ -180,7 +180,10 @@
viewBinding.meChangePasswordAffirmIc.mePswEt.setHint(R.string.home_login_input_affirm_psw);
viewBinding.meChangePasswordAffirmIc.lineV.setVisibility(View.GONE);
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/NotificationSettingsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/NotificationSettingsActivity.java
index e30b911..0516fe2 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/NotificationSettingsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/NotificationSettingsActivity.java
@@ -147,7 +147,9 @@
viewBinding.lineV1.setVisibility(View.VISIBLE);
}
checkAndRequestNotificationPermission();
-
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
index bab8420..09e8672 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -114,5 +114,9 @@
Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
viewBinding.qrCodeIv.setImageBitmap(bitmap);
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
+
}
}
\ No newline at end of file
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
index df00087..6525f06 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/SetActivity.java
@@ -166,7 +166,10 @@
if (UserConfigManage.getInstance().isArabicLanguage()) {
viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
viewBinding.setLanguageIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setAccountSecurityIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setNotificationSettingsIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
viewBinding.setTemperatureUnitIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
+ viewBinding.setContextSwitchIl.sllLlRlRightNextIv.setRotation(180); // 鏃嬭浆180搴�
}
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/UnregisterActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/UnregisterActivity.java
index 1ea02b7..478c21b 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/UnregisterActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/UnregisterActivity.java
@@ -98,6 +98,9 @@
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.immediate_cancellation);
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
viewBinding.accEt.setText(UserConfigManage.getInstance().getAccount());
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java
index 3f8f9b2..75ee31e 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/MessageCenterListActivity.java
@@ -324,6 +324,9 @@
messageCenterListAdapter.setList(mList);
// this.nullDataUpdateUi();
pullToRefresh();
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopMessageCenterListRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
index 1c91f88..d145228 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsListActivity.java
@@ -216,6 +216,9 @@
houseListAdapter.setList(this.houseListBeanIDList);
this.nullDataUpdateUi(houseListBeanIDList);
pullToRefresh();
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
/**
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
index ee1fdab..3d59fc4 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/newC/PowerStationsMoveActivity.java
@@ -13,6 +13,7 @@
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.ConstantManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityPowerStationsMoveBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.internet.HttpClient;
@@ -176,6 +177,9 @@
houseMoveAdapter.setList(this.houseListBeanIDList);
this.nullDataUpdateUi(houseListBeanIDList);
pullToRefresh();
+ if (UserConfigManage.getInstance().isArabicLanguage()) {
+ viewBinding.toolbarTopRl.topLeftIv.setRotation(180); // 鏃嬭浆180搴�
+ }
}
/**
diff --git a/app/src/main/res/layout/activity_change_password.xml b/app/src/main/res/layout/activity_change_password.xml
index f0aa632..bacf5b9 100644
--- a/app/src/main/res/layout/activity_change_password.xml
+++ b/app/src/main/res/layout/activity_change_password.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
- <TextView
+ <ImageView
android:id="@+id/change_back_tv"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
diff --git a/app/src/main/res/layout/activity_register_account.xml b/app/src/main/res/layout/activity_register_account.xml
index 57bafe9..dcd5243 100644
--- a/app/src/main/res/layout/activity_register_account.xml
+++ b/app/src/main/res/layout/activity_register_account.xml
@@ -29,7 +29,7 @@
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent" />-->
- <TextView
+ <ImageView
android:id="@+id/register_back_tv"
android:layout_width="@dimen/dp_30"
android:layout_height="@dimen/dp_30"
--
Gitblit v1.8.0