Merge branch 'dev'

mac

2024-06-12 12d6db5780d8a2121a3bef2d58bf897b24ff552a

 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) {