From a77dcb0250488ca6567490ed9fb5ce969bf41db7 Mon Sep 17 00:00:00 2001
From: mac <user@users-MacBook-Pro.local>
Date: 星期三, 29 五月 2024 14:55:03 +0800
Subject: [PATCH] Merge branch 'wjc_new' into feature/hxb
---
third-zxing/src/main/java/com/zxing/qrcode/CaptureActivity.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/third-zxing/src/main/java/com/zxing/qrcode/CaptureActivity.java b/third-zxing/src/main/java/com/zxing/qrcode/CaptureActivity.java
index 8e15982..51ddfa1 100644
--- a/third-zxing/src/main/java/com/zxing/qrcode/CaptureActivity.java
+++ b/third-zxing/src/main/java/com/zxing/qrcode/CaptureActivity.java
@@ -100,7 +100,7 @@
public void afterViewBind(View rootView, Bundle savedInstanceState) {
light_iv = findViewById(R.id.light_iv);
- backll = findViewById(R.id.top_back_btn);
+ backll = findViewById(R.id.top_back_ll);
backll.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
--
Gitblit v1.8.0