From ba268001154415f804a5401c9124333077d13af2 Mon Sep 17 00:00:00 2001
From: maning <154292322@qq.com>
Date: Tue, 10 May 2022 22:04:42 +0800
Subject: [PATCH] =?UTF-8?q?camera=E5=BC=95=E7=94=A8=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E5=A4=96=E5=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml             |  7 +++++++
 app/build.gradle           |  7 +++++++
 config.gradle              |  4 ++--
 mlkit-scanner/build.gradle | 19 ++++++-------------
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 39776a1..3d66c33 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="mlkit-scanner/src/main/res/layout/mn_scan_activity_scan_preview.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
   <component name="MarkdownProjectSettings" wasCopied="true">
     <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true" openRemoteLinks="true" replaceUnicodeEmoji="false" lastLayoutSetsDefault="false">
       <PanelProvider>
diff --git a/app/build.gradle b/app/build.gradle
index 92ccfa8..42951d7 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,4 +41,11 @@ dependencies {
     implementation project(path: ':mlkit-scanner')
 //    implementation 'com.github.maning0303:MNMLKitScanner:V1.0.0'
 
+    implementation 'com.google.mlkit:barcode-scanning:17.0.0'
+    implementation "androidx.camera:camera-core:1.0.2"
+    implementation "androidx.camera:camera-camera2:1.0.2"
+    implementation "androidx.camera:camera-lifecycle:1.0.2"
+    implementation "androidx.camera:camera-view:1.0.0-alpha25"
+
+
 }
\ No newline at end of file
diff --git a/config.gradle b/config.gradle
index ef9bda9..366d189 100644
--- a/config.gradle
+++ b/config.gradle
@@ -7,8 +7,8 @@ ext {
      * 版本统一管理
      */
     versions = [
-            versionCode      : 100,                    //版本号
-            versionName      : "1.0.0",              //版本名称
+            versionCode      : 101,                    //版本号
+            versionName      : "1.0.1",              //版本名称
 
             compileSdkVersion: 29,
             minSdkVersion    : 21,
diff --git a/mlkit-scanner/build.gradle b/mlkit-scanner/build.gradle
index 2374698..299e72b 100644
--- a/mlkit-scanner/build.gradle
+++ b/mlkit-scanner/build.gradle
@@ -1,9 +1,6 @@
 apply plugin: 'com.android.library'
 
 def versions = rootProject.ext.versions
-def appId = rootProject.ext.appId
-def dependenciesGoogle = rootProject.ext.dependenciesGoogle
-def dependenciesOther = rootProject.ext.dependenciesOther
 
 android {
     compileSdkVersion versions.compileSdkVersion
@@ -29,16 +26,12 @@ android {
 
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    compileOnly 'androidx.appcompat:appcompat:1.1.0'
 
-    implementation 'com.google.mlkit:barcode-scanning:16.2.0'
-    def camerax_version = '1.0.1';
-    // The following line is optional, as the core library is included indirectly by camera-camera2
-    implementation "androidx.camera:camera-core:${camerax_version}"
-    implementation "androidx.camera:camera-camera2:${camerax_version}"
-    // If you want to additionally use the CameraX Lifecycle library
-    implementation "androidx.camera:camera-lifecycle:${camerax_version}"
-    // If you want to additionally use the CameraX View class
-    implementation "androidx.camera:camera-view:1.0.0-alpha25"
+    compileOnly 'com.google.mlkit:barcode-scanning:17.0.0'
+    compileOnly "androidx.camera:camera-core:1.0.2"
+    compileOnly "androidx.camera:camera-camera2:1.0.2"
+    compileOnly "androidx.camera:camera-lifecycle:1.0.2"
+    compileOnly "androidx.camera:camera-view:1.0.0-alpha25"
 
 }
\ No newline at end of file