Skip to content

Commit

Permalink
update version code
Browse files Browse the repository at this point in the history
yuzhiqiang1993 committed Dec 25, 2018

Verified

This commit was signed with the committer’s verified signature.
thesamesam Sam James
1 parent 088fe0d commit 74baaf0
Showing 6 changed files with 7 additions and 24 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion zxinglibrary/build.gradle
Original file line number Diff line number Diff line change
@@ -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'

}
21 changes: 0 additions & 21 deletions zxinglibrary/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions zxinglibrary/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -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" />
</application>
</manifest>
Original file line number Diff line number Diff line change
@@ -274,6 +274,8 @@ private void displayFrameworkBugMessageAndExit() {

@Override
protected void onPause() {

Log.i("CaptureActivity","onPause");
if (handler != null) {
handler.quitSynchronously();
handler = null;
1 change: 1 addition & 0 deletions zxinglibrary/src/main/res/layout/activity_capture.xml
Original file line number Diff line number Diff line change
@@ -23,6 +23,7 @@
android:orientation="vertical">

<RelativeLayout
android:id="@+id/headerLayout"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="top"

0 comments on commit 74baaf0

Please sign in to comment.