From a1e987b677b51e66f81d9f12081f526ac36628ad Mon Sep 17 00:00:00 2001
From: hwf453 <hwf453@163.com>
Date: Mon, 1 Apr 2024 09:42:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=AB=E6=8F=8F=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E9=97=AA=E5=85=89=E7=81=AF=E6=97=A0=E6=B3=95=E6=89=93?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 YFDXJ/app/src/main/AndroidManifest.xml                        | 1 +
 .../src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java  | 4 ++--
 .../src/main/java/com/bjzc/yfdxj/activity/MainFragment.java   | 3 ---
 .../main/java/com/bjzc/yfdxj/base/MipcaActivityCapture.java   | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/YFDXJ/app/src/main/AndroidManifest.xml b/YFDXJ/app/src/main/AndroidManifest.xml
index 35a0cbb..21f4ed4 100755
--- a/YFDXJ/app/src/main/AndroidManifest.xml
+++ b/YFDXJ/app/src/main/AndroidManifest.xml
@@ -18,6 +18,7 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <!--Android 12 中的新蓝牙权限结束-->
 
+    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java
index 8c6221c..f64f82f 100755
--- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java
+++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/LoginActivity.java
@@ -182,8 +182,8 @@ public class LoginActivity extends BaseActivity {
         }
 
         if (BuildConfig.LOG_ERROR) {
-//            etUse.setText("161619");
-//            etPwd.setText("lgy12345");
+            etUse.setText("161619");
+            etPwd.setText("lgy12345");
 
 //            etUse.setText("161619");
 //            etPwd.setText("161619");
diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainFragment.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainFragment.java
index 8705be0..fe13277 100755
--- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainFragment.java
+++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/activity/MainFragment.java
@@ -6,9 +6,6 @@ import android.content.Intent;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
 import android.widget.GridView;
 import com.bjzc.yfdxj.R;
 import com.bjzc.yfdxj.activity.sbxdj.MainSbxdjglActivity;
diff --git a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/base/MipcaActivityCapture.java b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/base/MipcaActivityCapture.java
index f3b225e..0a19934 100755
--- a/YFDXJ/app/src/main/java/com/bjzc/yfdxj/base/MipcaActivityCapture.java
+++ b/YFDXJ/app/src/main/java/com/bjzc/yfdxj/base/MipcaActivityCapture.java
@@ -89,8 +89,8 @@ public class MipcaActivityCapture extends BaseActivity implements Callback {
         public void onClick(View v) {
             //获取到ZXing相机管理器创建的camera
             camera = CameraManager.getCamera();
+            params = camera.getParameters();
             if (params != null) {
-                params = camera.getParameters();
                 if (isOpen) {
                     flashlightButton.setText("关闭闪光灯");
                     params.setFlashMode(Camera.Parameters.FLASH_MODE_TORCH);