From cf761dbce02ea1da7682265853354ca74dc2c31f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期二, 26 八月 2025 17:30:42 +0800
Subject: [PATCH] 2025年08月26日17:30:41
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 52 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 37 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
index 60c784d..2c5588c 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java
@@ -2,6 +2,8 @@
import android.content.Intent;
+import android.graphics.Bitmap;
+import android.graphics.Color;
import android.os.Bundle;
import android.view.View;
@@ -14,13 +16,15 @@
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
import com.hdl.photovoltaic.other.HdlAppUpdateLogic;
+import com.hdl.photovoltaic.other.HdlCommonLogic;
import com.hdl.photovoltaic.other.HdlThreadLogic;
+import com.hdl.photovoltaic.widget.FlashingBoxDialog;
import com.hdl.photovoltaic.widget.apkwgtupload.ApkDownLoadService;
import com.hdl.photovoltaic.widget.ConfirmationCancelDialog;
import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;
/**
- * 鍏充簬鐣岄潰
+ * 鍏充簬鐣岄潰锛坅pp鏇存柊锛�
*/
public class AsRegardsActivity extends CustomBaseActivity {
@@ -39,8 +43,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -57,6 +61,8 @@
mNewVersionBean = newVersionBean;
if (newVersionBean != null) {
//todo 鍙戠幇鏂扮増鏈�,鏀瑰彉UI鏍峰紡
+ viewBinding.asRegardsRlRightContentTv.setText(R.string.app_discover_new_version);
+ viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
}
}
@@ -65,12 +71,20 @@
}
});
+ //姝ｅ紡鐜
+ String content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDownload.html";
+ if (!AppConfigManage.getOnlineServer()) {
+ //娴嬭瘯鐜
+ content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDebugDownload.html";
+ }
+ Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "0", getColor(R.color.text_00000000), Color.WHITE);
+ viewBinding.asRegardsQrCodeIv.setImageBitmap(bitmap);
}
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -88,7 +102,7 @@
@Override
public void onClick(View v) {
Intent intent = new Intent();
- intent.putExtra("type", 0);
+ intent.putExtra("type", WebActivity.ServiceAgreement);
intent.setClass(_mActivity, WebActivity.class);
startActivity(intent);
}
@@ -98,8 +112,17 @@
@Override
public void onClick(View v) {
Intent intent = new Intent();
- intent.putExtra("type", 1);
+ intent.putExtra("type", WebActivity.PrivacyAgreement);
intent.setClass(_mActivity, WebActivity.class);
+ startActivity(intent);
+
+ }
+ });
+ viewBinding.contactUsRl.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Intent intent = new Intent();
+ intent.setClass(_mActivity, ContactUsActivity.class);
startActivity(intent);
}
@@ -108,13 +131,10 @@
}
private void initView() {
- setNotificationBarBackgroundColor(CustomColor.white);
- getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_regard);
- 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));
- String versionsStr = "v" + AppConfigManage.getVersionName();
+ viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getColor(R.color.text_00000000));
+ viewBinding.toolbarTopRl.topTitleTv.setText(R.string.me_regard);
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
viewBinding.asRegardsIconVersionsTv.setText(versionsStr);
}
@@ -127,7 +147,9 @@
@Override
public void run() {
if (mNewVersionBean == null) {
- HdlThreadLogic.toast(_mActivity, R.string.app_new_version);
+ FlashingBoxDialog flashingBoxDialog = new FlashingBoxDialog(_mActivity, 1500);
+ flashingBoxDialog.setContent(getString(R.string.app_new_version));
+ flashingBoxDialog.show();
return;
}
String app_version = getString(R.string.app_version) + ":" + mNewVersionBean.getVersion();
@@ -145,7 +167,7 @@
public void Confirm() {
Intent intent = new Intent(_mActivity, ApkDownLoadService.class);
intent.putExtra("updateUrl", mNewVersionBean.getPackageUrl());
- intent.putExtra("downLoadName", HdlAppUpdateLogic.ApkFileName);
+ intent.putExtra("downLoadName", HdlAppUpdateLogic.getInstance().getApkFileName());
intent.putExtra("downLoadType", "0");
_mActivity.startService(intent);
updateConfirmationCancelDialog.dismiss();
--
Gitblit v1.8.0