diff --git a/build.gradle b/build.gradle index 3c517a0..e8b84e8 100644 --- a/build.gradle +++ b/build.gradle @@ -9,8 +9,8 @@ buildscript { min_sdk_version = 16 target_sdk_version = 27 constraint_version = '1.1.0' - version_code = 221 - version_name = '2.2.1' + version_code = 224 + version_name = '2.2.4' /*support*/ android_support = '28.0.0' diff --git a/zxinglibrary/build.gradle b/zxinglibrary/build.gradle index 1259f6d..ac48fcb 100644 --- a/zxinglibrary/build.gradle +++ b/zxinglibrary/build.gradle @@ -24,6 +24,6 @@ dependencies { compileOnly "com.android.support:design:$android_support" compileOnly "com.android.support:support-v4:$android_support" compileOnly "com.android.support:support-vector-drawable:$android_support" - // implementation 'com.google.zxing:core:3.3.2' + // implementation 'com.google.zxing:core:3.3.2' } diff --git a/zxinglibrary/proguard-rules.pro b/zxinglibrary/proguard-rules.pro index f1b4245..e69de29 100644 --- a/zxinglibrary/proguard-rules.pro +++ b/zxinglibrary/proguard-rules.pro @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/zxinglibrary/src/main/AndroidManifest.xml b/zxinglibrary/src/main/AndroidManifest.xml index 4354213..a7834a6 100644 --- a/zxinglibrary/src/main/AndroidManifest.xml +++ b/zxinglibrary/src/main/AndroidManifest.xml @@ -20,6 +20,7 @@ android:name=".android.CaptureActivity" android:configChanges="orientation|screenSize" android:screenOrientation="portrait" + android:theme="@style/Theme.AppCompat.NoActionBar" android:windowSoftInputMode="adjustPan|stateHidden" /> \ No newline at end of file diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java index 1b8ff55..508a6a7 100644 --- a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java +++ b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java @@ -274,6 +274,8 @@ private void displayFrameworkBugMessageAndExit() { @Override protected void onPause() { + + Log.i("CaptureActivity","onPause"); if (handler != null) { handler.quitSynchronously(); handler = null; diff --git a/zxinglibrary/src/main/res/layout/activity_capture.xml b/zxinglibrary/src/main/res/layout/activity_capture.xml index 25f5a7a..0485bf2 100644 --- a/zxinglibrary/src/main/res/layout/activity_capture.xml +++ b/zxinglibrary/src/main/res/layout/activity_capture.xml @@ -23,6 +23,7 @@ android:orientation="vertical">