From cdf49871675e42a5576f725a93eec7ca15294c6f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 15 四月 2025 17:22:34 +0800
Subject: [PATCH] Merge branch '1.5.2'
---
app/src/main/java/com/hdl/photovoltaic/ui/me/WebActivity.java | 30 ++++++++++++++++--------------
1 files changed, 16 insertions(+), 14 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 d9f18b4..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
@@ -1,6 +1,7 @@
package com.hdl.photovoltaic.ui.me;
+import android.annotation.SuppressLint;
import android.os.Bundle;
import android.view.View;
@@ -35,8 +36,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomBaseActivity.CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
this.typeIntValue = getIntent().getIntExtra("type", 0);
//鍒濆鍖�
initView();
@@ -45,7 +46,7 @@
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
finish();
@@ -53,33 +54,34 @@
});
}
+ @SuppressLint("SetJavaScriptEnabled")
private void initView() {
+ viewBinding.contentView.getSettings().setJavaScriptEnabled(true);
+ //xml閲岄潰璁剧疆鑳屾櫙鏃犳晥
+ viewBinding.contentView.setBackgroundColor(getColor(R.color.text_FF000000));
if (this.typeIntValue == 0) {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.app_service_agreement);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_service_agreement);
} else {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.app_privacy_policy);
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.app_privacy_policy);
}
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
-
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
if (UserConfigManage.getInstance().getCurrentAppLanguage().equals(LocalManageUtil.zh)) {
//涓枃
if (this.typeIntValue == 0) {
- //鐢ㄦ埛鍗忚
- viewBinding.contentView.loadUrl("https://developer.hdlcontrol.com/GreenSmartEnergy__UserAgreement.html");
+ //鐢ㄦ埛鍗忚 https://nearest.hdlcontrol.com
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreement");
} else {
//闅愮鍗忚
- viewBinding.contentView.loadUrl("https://developer.hdlcontrol.com/GreenSmartEnergy__PrivacyPolicy.html");
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreement");
}
} else {
//鑻辨枃
if (this.typeIntValue == 0) {
//鐢ㄦ埛鍗忚
- viewBinding.contentView.loadUrl("https://developer.hdlcontrol.com/GreenSmartEnergy__UserAgreement-En.html");
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/userAgreementEn");
} else {
//闅愮鍗忚
- viewBinding.contentView.loadUrl("https://developer.hdlcontrol.com/GreenSmartEnergy_PrivacyPolicy-En.html");
+ viewBinding.contentView.loadUrl("https://common.hdlcontrol.com/common-h5/#/pages/greenEnergyAgreement/privacyAgreementEn");
}
}
--
Gitblit v1.8.0