依赖版本修改

This commit is contained in:
weilu 2019-08-15 16:09:44 +08:00
parent 39ecc57bc0
commit 99718f6af2
3 changed files with 8 additions and 9 deletions

View File

@ -9,7 +9,7 @@ buildscript {
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.3.1' classpath 'com.android.tools.build:gradle:3.3.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.20" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.41"
} }
} }
@ -42,8 +42,7 @@ android {
} }
dependencies { dependencies {
implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.20' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.41'
implementation 'me.dm7.barcodescanner:zxing:1.9.13' implementation 'me.dm7.barcodescanner:zxing:1.9.13'
api 'com.google.android.material:material:1.0.0'
} }

View File

@ -5,10 +5,10 @@ import android.app.Activity
import android.content.Intent import android.content.Intent
import android.content.pm.PackageManager import android.content.pm.PackageManager
import android.os.Bundle import android.os.Bundle
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import com.google.zxing.Result import com.google.zxing.Result
import me.dm7.barcodescanner.zxing.ZXingScannerView import me.dm7.barcodescanner.zxing.ZXingScannerView
@ -36,11 +36,11 @@ class BarcodeScannerActivity : Activity(), ZXingScannerView.ResultHandler {
override fun onCreateOptionsMenu(menu: Menu): Boolean { override fun onCreateOptionsMenu(menu: Menu): Boolean {
if (scannerView.flash) { if (scannerView.flash) {
val item = menu.add(0, val item = menu.add(0,
TOGGLE_FLASH, 0, "Flash Off") TOGGLE_FLASH, 0, "关闭闪光灯")
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
} else { } else {
val item = menu.add(0, val item = menu.add(0,
TOGGLE_FLASH, 0, "Flash On") TOGGLE_FLASH, 0, "开启闪光灯")
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS) item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS)
} }
return super.onCreateOptionsMenu(menu) return super.onCreateOptionsMenu(menu)

View File

@ -17,7 +17,7 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
android { android {
compileSdkVersion 28 compileSdkVersion 28
buildToolsVersion "27.0.3" buildToolsVersion "28.0.3"
sourceSets { sourceSets {
main.java.srcDirs += 'src/main/kotlin' main.java.srcDirs += 'src/main/kotlin'