From 87cd5df70918e6ba1af849c5f026d3719bfdb1ac Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期三, 09 四月 2025 09:06:29 +0800
Subject: [PATCH] Merge branch '1.5.2' into dev
---
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
index 6188e99..406f571 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java
@@ -37,6 +37,7 @@
@Override
public void onBindView(Bundle savedInstanceState) {
setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
this.typeIntValue = getIntent().getIntExtra("type", 0);
//鍒濆鍖�
initView();
@@ -57,31 +58,30 @@
private void initView() {
viewBinding.contentView.getSettings().setJavaScriptEnabled(true);
//xml閲岄潰璁剧疆鑳屾櫙鏃犳晥
- viewBinding.contentView.setBackgroundColor(getColor(R.color.text_FF161616));
+ viewBinding.contentView.setBackgroundColor(getColor(R.color.text_FF000000));
if (this.typeIntValue == 0) {
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_service_agreement);
} else {
viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_privacy_policy);
}
viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
-
if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
//涓枃
if (this.typeIntValue == 0) {
- //鐢ㄦ埛鍗忚
- viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreement");
+ //鐢ㄦ埛鍗忚 https://nearest.hdlcontrol.com
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreement");
} else {
//闅愮鍗忚
- viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreement");
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreement");
}
} else {
//鑻辨枃
if (this.typeIntValue == 0) {
//鐢ㄦ埛鍗忚
- viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreementEn");
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreementEn");
} else {
//闅愮鍗忚
- viewBinding.contentView.loadUrl("https://nearest.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreementEn");
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreementEn");
}
}
--
Gitblit v1.8.0