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/AsRegardsActivity.java | 30 ++++++++++++++++++------------
1 files changed, 18 insertions(+), 12 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 3dbdeaf..faf6411 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
@@ -18,6 +18,7 @@
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;
@@ -42,8 +43,8 @@
@Override
public void onBindView(Bundle savedInstanceState) {
- setNotificationBarBackgroundColor(CustomColor.white);
- setStatusBarTextColor();
+ setStatusBarTranslucent();
+ getWindow().setNavigationBarColor(getColor(R.color.text_FF000000));
//鍒濆鍖�
initView();
//鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -61,7 +62,7 @@
if (newVersionBean != null) {
//todo 鍙戠幇鏂扮増鏈�,鏀瑰彉UI鏍峰紡
viewBinding.asRegardsRlRightContentTv.setText(R.string.app_discover_new_version);
- viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_245EC3, null));
+ viewBinding.asRegardsRlRightContentTv.setTextColor(getResources().getColor(R.color.text_FFACACAC, null));
}
}
@@ -70,16 +71,20 @@
}
});
- //todo 绛夋帴鍙�
- String content = "https://developer.hdlcontrol.com/AppDownload/HDLDebugerDownload.html";
- Bitmap bitmap = HdlCommonLogic.getInstance().createQRCodeBitmap(content, 168, 168, "UTF-8", "H", "1", Color.BLACK, Color.WHITE);
+ //姝ｅ紡鐜
+ String content = "https://developer.hdlcontrol.com/AppDownload/HDLPhotovoltaicDownload.html";
+ if (!AppConfigManage.getOnlineServer()) {
+ //娴嬭瘯鐜
+ content = "https://developer.hdlcontrol.com/AppDownload/HDLDebugerDownload.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.topBackLl.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -126,10 +131,9 @@
}
private void initView() {
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setText(R.string.me_regard);
- viewBinding.toolbarTopFragmentHouseListRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
- viewBinding.toolbarTopFragmentHouseListRl.topBackLl.setVisibility(View.VISIBLE);
- viewBinding.toolbarTopFragmentHouseListRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFFFFFFF, null));
+ 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);
@@ -143,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();
--
Gitblit v1.8.0