发布v3.1.0
This commit is contained in:
@@ -1,12 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="com.king.zxing.app">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
|
||||
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
<uses-feature
|
||||
android:name="android.hardware.camera"
|
||||
android:required="false" />
|
||||
|
||||
<uses-permission android:name="android.permission.CAMERA" />
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
<uses-permission android:name="android.permission.VIBRATE" />
|
||||
<uses-permission android:name="android.permission.FLASHLIGHT" />
|
||||
|
||||
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
|
||||
<uses-permission
|
||||
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||
android:maxSdkVersion="32" />
|
||||
|
||||
<application
|
||||
android:allowBackup="true"
|
||||
|
||||
@@ -18,6 +18,9 @@ package com.king.zxing.app;
|
||||
import android.Manifest;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.graphics.ImageDecoder;
|
||||
import android.net.Uri;
|
||||
import android.os.Build;
|
||||
import android.provider.MediaStore;
|
||||
import android.os.Bundle;
|
||||
import android.view.View;
|
||||
@@ -29,6 +32,7 @@ import com.king.camera.scan.util.LogUtils;
|
||||
import com.king.camera.scan.util.PermissionUtils;
|
||||
import com.king.zxing.util.CodeUtils;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
|
||||
@@ -78,11 +82,10 @@ public class MainActivity extends AppCompatActivity {
|
||||
}
|
||||
|
||||
private void showToast(String text) {
|
||||
if (toast == null) {
|
||||
toast = Toast.makeText(this, text, Toast.LENGTH_SHORT);
|
||||
}else {
|
||||
toast.setText(text);
|
||||
if(toast != null) {
|
||||
toast.cancel();
|
||||
}
|
||||
toast = Toast.makeText(this, text, Toast.LENGTH_SHORT);
|
||||
toast.show();
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ import com.king.zxing.analyze.MultiFormatAnalyzer
|
||||
*/
|
||||
class MultiFormatScanActivity : BarcodeCameraScanActivity() {
|
||||
|
||||
var toast: Toast? = null
|
||||
private var toast: Toast? = null
|
||||
|
||||
override fun initCameraScan(cameraScan: CameraScan<Result>) {
|
||||
super.initCameraScan(cameraScan)
|
||||
@@ -54,11 +54,8 @@ class MultiFormatScanActivity : BarcodeCameraScanActivity() {
|
||||
}
|
||||
|
||||
private fun showToast(text: String) {
|
||||
if(toast == null) {
|
||||
toast = Toast.makeText(this, text, Toast.LENGTH_SHORT)
|
||||
} else {
|
||||
toast?.setText(text)
|
||||
}
|
||||
toast?.cancel()
|
||||
toast = Toast.makeText(this, text, Toast.LENGTH_SHORT)
|
||||
toast?.show()
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user