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 @@ + 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);