From 63b0ee228bf52e8e9c4d7fc51a1117543c9a67af Mon Sep 17 00:00:00 2001
From: 刘卫锦 <lwj@hdlchina.com.cn>
Date: 星期一, 03 七月 2023 19:02:40 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.23:6688/r/~wjc/HDLPhotovoltaicDebugAPP
---
app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java b/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java
index 93ddc2f..ba49e66 100644
--- a/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java
+++ b/app/src/main/java/com/hdl/photovoltaic/ui/device/FastScanActivity.java
@@ -1,8 +1,12 @@
package com.hdl.photovoltaic.ui.device;
import androidx.appcompat.content.res.AppCompatResources;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import android.Manifest;
import android.content.Intent;
+import android.content.pm.PackageManager;
import android.database.Cursor;
import android.graphics.Rect;
import android.hardware.Camera;
@@ -46,7 +50,7 @@
import java.util.Hashtable;
public class FastScanActivity extends CustomBaseActivity implements IZxingActivity, SurfaceHolder.Callback {
- private static final String TAG = com.zxing.qrcode.CaptureActivity.class.getSimpleName();
+ private static final String TAG = "FastScanActivity";
private final int REQUEST_CODE = 33;
private CameraManager cameraManager;
private CaptureActivityHandler handler;
--
Gitblit v1.8.0