sdk版本更新至28

wangmingdong102 · Nov 23, 2018 · c8e46c1 · c8e46c1
1 parent dd5e485
commit c8e46c1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 75 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,5 +26,5 @@ dependencies {
     implementation "com.android.support:support-vector-drawable:$android_support"
     implementation 'com.yanzhenjie:permission:2.0.0-rc4'
     implementation project(':zxinglibrary')
-    // implementation 'com.github.yuzhiqiang1993:zxing:2.1.6'
+    //implementation 'com.github.yuzhiqiang1993:zxing:2.2.1'
 }
diff --git a/app/src/main/java/com/yzq/zxing/MainActivity.java b/app/src/main/java/com/yzq/zxing/MainActivity.java
@@ -111,9 +111,9 @@ public void onAction(List<String> permissions) {
                                  * 也可以不传这个参数
                                  * */
 //                                ZxingConfig config = new ZxingConfig();
-//                                config.setPlayBeep(true);//是否播放扫描声音 默认为true
-//                                config.setShake(true);//是否震动  默认为true
-//                                config.setDecodeBarCode(true);//是否扫描条形码 默认为true
+//                                config.setPlayBeep(false);//是否播放扫描声音 默认为true
+//                                config.setShake(false);//是否震动  默认为true
+//                                config.setDecodeBarCode(false);//是否扫描条形码 默认为true
 //                                config.setReactColor(R.color.colorAccent);//设置扫描框四个角的颜色 默认为白色
 //                                config.setFrameLineColor(R.color.colorAccent);//设置扫描框边框颜色 默认无色
 //                                config.setScanLineColor(R.color.colorAccent);//设置扫描线的颜色 默认白色

diff --git a/build.gradle b/build.gradle
@@ -5,16 +5,15 @@ buildscript {
 
     ext {
         /*sdk and version*/
-        compile_sdk_version = 27
-        build_tools_version = '27.1.1'
+        compile_sdk_version = 28
         min_sdk_version = 16
         target_sdk_version = 27
         constraint_version = '1.1.0'
-        version_code = 220
-        version_name = '2.2.0'
+        version_code = 221
+        version_name = '2.2.1'
 
         /*support*/
-        android_support = '27.1.1'
+        android_support = '28.0.0'
 
 
         signConfigs = [

diff --git a/zxinglibrary/build.gradle b/zxinglibrary/build.gradle
@@ -26,33 +26,3 @@ dependencies {
     implementation "com.android.support:support-vector-drawable:$android_support"
 
 }
-
-//// 指定编码
-//tasks.withType(JavaCompile) {
-//    options.encoding = "UTF-8"
-//}
-
-// 打包源码
-task sourcesJar(type: Jar) {
-    from android.sourceSets.main.java.srcDirs
-    classifier = 'sources'
-}
-
-//制作文档
-//task javadoc(type: Javadoc) {
-//    failOnError  false
-//    source = android.sourceSets.main.java.sourceFiles
-//    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-//    classpath += configurations.compile
-//}
-
-// 打包文档
-//task javadocJar(type: Jar, dependsOn: javadoc) {
-//    classifier = 'javadoc'
-//    from javadoc.destinationDir
-//}
-
-artifacts {
-    archives sourcesJar
-//    archives javadocJar
-}
diff --git a/zxinglibrary/src/main/java/com/yzq/zxinglibrary/camera/CameraConfigurationManager.java b/zxinglibrary/src/main/java/com/yzq/zxinglibrary/camera/CameraConfigurationManager.java
@@ -109,6 +109,7 @@ private static Point getCameraResolution(Camera.Parameters parameters, Point scr
             cameraResolution = new Point(
                     (screenResolution.x >> 3) << 3,
                     (screenResolution.y >> 3) << 3);
+
         }
 
         return cameraResolution;