1.统一support版本号

2.更新apk
yuzhiqiang1993 · Mar 6, 2018 · 6560ca9 · 6560ca9
1 parent 512392a
commit 6560ca9
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 24 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.yzq.zxing"
@@ -21,11 +21,10 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:support-vector-drawable:26.1.0'
-    implementation 'com.yanzhenjie:permission:1.1.0'
-   // implementation 'com.github.yuzhiqiang1993:zxing:2.1.2'
+    implementation "com.android.support:appcompat-v7:$support_version"
+    implementation "com.android.support:design:$support_version"
+    implementation "com.android.support:support-vector-drawable:$support_version"
+    implementation "com.yanzhenjie:permission:1.1.0"
     implementation project(':zxinglibrary')
 
 

diff --git a/app/release/output.json b/app/release/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":1},"path":"app-release.apk","properties":{"packageId":"com.yzq.zxing","split":"","minSdkVersion":"16"}}]
diff --git a/app/release/zxing.apk b/app/release/zxing.apk
diff --git a/build.gradle b/build.gradle
@@ -1,7 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-
+
+
+    ext{
+        support_version='27.0.2'
+    }
     repositories {
         google()
         jcenter()

diff --git a/zxinglibrary/build.gradle b/zxinglibrary/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'com.github.dcendents.android-maven'
 group = 'com.github.yuzhiqiang1993'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     buildToolsVersion '27.0.3'
 
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         vectorDrawables.useSupportLibrary = true
@@ -23,8 +23,9 @@ android {
 dependencies {
     api fileTree(include: ['*.jar'], dir: 'libs')
     api files('libs/core-3.3.0.jar')
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.android.support:support-vector-drawable:26.1.0'
+    implementation "com.android.support:appcompat-v7:$support_version"
+    implementation "com.android.support:design:$support_version"
+    implementation "com.android.support:support-v4:$support_version"
+    implementation "com.android.support:support-vector-drawable:$support_version"
+
 }
diff --git a/zxinglibrary/src/main/AndroidManifest.xml b/zxinglibrary/src/main/AndroidManifest.xml
@@ -16,7 +16,6 @@
 
     <application>
         <activity
-
             android:name=".android.CaptureActivity"
             android:configChanges="orientation|screenSize"
             android:screenOrientation="portrait"

diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/android/CaptureActivity.java
@@ -1,6 +1,5 @@
 package com.yzq.zxinglibrary.android;
 
-import android.app.Activity;
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.pm.FeatureInfo;
@@ -17,8 +16,6 @@
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 

diff --git a/zxinglibrary/src/main/res/layout/activity_capture.xml b/zxinglibrary/src/main/res/layout/activity_capture.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context="com.yzq.zxinglibrary.android.CaptureActivity">
     <!-- 整体透明画布 -->
 
@@ -95,12 +95,8 @@
                     android:id="@+id/albumIv"
                     android:layout_width="36dp"
                     android:layout_height="36dp"
-
                     android:tint="#ffffffff"
-                    app:srcCompat="@drawable/ic_photo"
-
-
-                    />
+                    app:srcCompat="@drawable/ic_photo" />
 
                 <TextView
                     android:layout_width="match_parent"