From c870de9e4207c7af37229cb24b9ca0e2d1e1215f Mon Sep 17 00:00:00 2001
From: wjc <1243177876@qq.com>
Date: 星期一, 09 十二月 2024 15:09:00 +0800
Subject: [PATCH] Merge branch '1.5.0' of http://59.41.255.150:6688/r/~wjc/HDLPhotovoltaicDebugAPP into 1.5.0

---
 app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
index 25c6f4e..d2afc38 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/me/QrCodeMainActivity.java
@@ -35,6 +35,7 @@
     @Override
     public void onBindView(Bundle savedInstanceState) {
         setStatusBarTranslucent();
+        getWindow().setNavigationBarColor(getColor(R.color.text_00000000));
         //鍒濆鍖�
         initView();
         //鍒濆鍖栫晫闈㈢洃鍚櫒
@@ -48,7 +49,7 @@
 
 
     private void initEvent() {
-        viewBinding.topBackLl.setOnClickListener(new View.OnClickListener() {
+        viewBinding.toolbarTopRl.topBackLl.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 finish();
@@ -88,8 +89,9 @@
     }
 
     private void initView() {
-        viewBinding.topTitleTv.setText(R.string.qr_code_business_card);
-        viewBinding.topBackLl.setVisibility(View.VISIBLE);
+        viewBinding.toolbarTopRl.topBarView.setBackgroundColor(getColor(R.color.text_00000000));
+        viewBinding.toolbarTopRl.topTitleTv.setText(R.string.qr_code_business_card);
+        viewBinding.toolbarTopRl.topBackLl.setVisibility(View.VISIBLE);
 //        viewBinding.toolbarTopQrCodeRl.topMoreBtn.setVisibility(View.VISIBLE);
 //        viewBinding.toolbarTopQrCodeRl.topMoreIv.setImageDrawable(AppCompatResources.getDrawable(_mActivity, R.drawable.save_image));
         if (!TextUtils.isEmpty(UserConfigManage.getInstance().getUserName())) {

--
Gitblit v1.8.0