From 7807eab462ad7c008ebe93af151f5520fdb3159a Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期二, 15 十月 2024 10:51:59 +0800
Subject: [PATCH] 2024年10月15日10:51:57
---
app/src/main/java/com/hdl/photovoltaic/ui/me/AsRegardsActivity.java | 45 ++++++++++++++++++++++++++++-----------------
1 files changed, 28 insertions(+), 17 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 0e497c3..e55f75d 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
@@ -7,15 +7,12 @@
import android.os.Bundle;
import android.view.View;
-import com.google.zxing.BarcodeFormat;
-import com.google.zxing.MultiFormatWriter;
-import com.google.zxing.WriterException;
-import com.google.zxing.common.BitMatrix;
import com.hdl.linkpm.sdk.core.exception.HDLException;
import com.hdl.linkpm.sdk.user.bean.NewVersionBean;
import com.hdl.photovoltaic.R;
import com.hdl.photovoltaic.base.CustomBaseActivity;
import com.hdl.photovoltaic.config.AppConfigManage;
+import com.hdl.photovoltaic.config.UserConfigManage;
import com.hdl.photovoltaic.databinding.ActivityAsRegardsBinding;
import com.hdl.photovoltaic.enums.ShowErrorMode;
import com.hdl.photovoltaic.listener.CloudCallBeak;
@@ -27,7 +24,7 @@
import com.hdl.photovoltaic.widget.UpdateConfirmationCancelDialog;
/**
- * 鍏充簬鐣岄潰
+ * 鍏充簬鐣岄潰锛坅pp鏇存柊锛�
*/
public class AsRegardsActivity extends CustomBaseActivity {
@@ -64,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_245EC3, null));
}
}
@@ -72,8 +71,12 @@
}
});
- //todo 绛夋帴鍙�
- String content = "涓嬭浇鍦板潃url";
+ //姝ｅ紡鐜
+ 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", "1", Color.BLACK, Color.WHITE);
viewBinding.asRegardsQrCodeIv.setImageBitmap(bitmap);
@@ -81,7 +84,7 @@
private void initEvent() {
- viewBinding.toolbarTopFragmentHouseListRl.topBackBtn.setOnClickListener(new View.OnClickListener() {
+ viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
@@ -99,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);
}
@@ -109,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);
}
@@ -119,13 +131,12 @@
}
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.topTitleTv.setText(R.string.me_regard);
+ viewBinding.toolbarTopRl.topTitleTv.setTextColor(getResources().getColor(R.color.text_030D1C, null));
+ viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
+ viewBinding.toolbarTopRl.topLeftIv.setImageResource(R.drawable.back_c);
+ viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getResources().getColor(R.color.text_FFECECEC, null));
+ String versionsStr = _mActivity.getResources().getString(R.string.app_version_number) + " " + AppConfigManage.getVersionName();
viewBinding.asRegardsIconVersionsTv.setText(versionsStr);
}
--
Gitblit v1.8.0