diff --git a/app/build.gradle b/app/build.gradle index 4d76191..bf82a4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -92,11 +92,12 @@ implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' + def vm_version = '2.5.1' //Kotlin协程 - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' diff --git a/app/build.gradle b/app/build.gradle index 4d76191..bf82a4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -92,11 +92,12 @@ implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' + def vm_version = '2.5.1' //Kotlin协程 - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' diff --git a/app/src/main/java/com/casic/detector/view/BigImageActivity.kt b/app/src/main/java/com/casic/detector/view/BigImageActivity.kt index ca6c7d7..0fe6a65 100644 --- a/app/src/main/java/com/casic/detector/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/detector/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -25,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/build.gradle b/app/build.gradle index 4d76191..bf82a4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -92,11 +92,12 @@ implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' + def vm_version = '2.5.1' //Kotlin协程 - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' diff --git a/app/src/main/java/com/casic/detector/view/BigImageActivity.kt b/app/src/main/java/com/casic/detector/view/BigImageActivity.kt index ca6c7d7..0fe6a65 100644 --- a/app/src/main/java/com/casic/detector/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/detector/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -25,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index ae56b26..5869ca2 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.detector.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -21,7 +22,7 @@ private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { gpioManager.setGpioLow("18") //先把导航隐私政策声明,后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/build.gradle b/app/build.gradle index 4d76191..bf82a4c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,7 +78,7 @@ dependencies { //基础依赖库 - implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.5' + implementation 'com.github.AndroidCoderPeng:Kotlin-lite-lib:1.0.4.9' implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.core:core-ktx:1.9.0' //Google官方授权框架 @@ -92,11 +92,12 @@ implementation 'com.gyf.immersionbar:immersionbar-components:3.0.0' //官方Json解析库 implementation 'com.google.code.gson:gson:2.10.1' + def vm_version = '2.5.1' //Kotlin协程 - implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1' + implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}" //MVVM+LiveData - implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1" - implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1" + implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}" + implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}" implementation "androidx.lifecycle:lifecycle-extensions:2.2.0" //返回值转换器 implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2' diff --git a/app/src/main/java/com/casic/detector/view/BigImageActivity.kt b/app/src/main/java/com/casic/detector/view/BigImageActivity.kt index ca6c7d7..0fe6a65 100644 --- a/app/src/main/java/com/casic/detector/view/BigImageActivity.kt +++ b/app/src/main/java/com/casic/detector/view/BigImageActivity.kt @@ -2,6 +2,7 @@ import android.content.Context import android.graphics.Color +import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup @@ -25,7 +26,7 @@ leftBackView.setOnClickListener { finish() } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { } diff --git a/app/src/main/java/com/casic/detector/view/LoginActivity.kt b/app/src/main/java/com/casic/detector/view/LoginActivity.kt index ae56b26..5869ca2 100644 --- a/app/src/main/java/com/casic/detector/view/LoginActivity.kt +++ b/app/src/main/java/com/casic/detector/view/LoginActivity.kt @@ -1,5 +1,6 @@ package com.casic.detector.view +import android.os.Bundle import androidx.lifecycle.ViewModelProvider import com.amap.api.navi.NaviSetting import com.casic.detector.R @@ -21,7 +22,7 @@ private lateinit var userViewModel: UserViewModel private val gpioManager by lazy { GpioManager() } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { gpioManager.setGpioLow("18") //先把导航隐私政策声明,后面导航会用到 NaviSetting.updatePrivacyShow(this, true, true) diff --git a/app/src/main/java/com/casic/detector/view/PermissionActivity.kt b/app/src/main/java/com/casic/detector/view/PermissionActivity.kt index eaa8930..b25fb19 100644 --- a/app/src/main/java/com/casic/detector/view/PermissionActivity.kt +++ b/app/src/main/java/com/casic/detector/view/PermissionActivity.kt @@ -1,5 +1,6 @@ package com.casic.detector.view +import android.os.Bundle import android.os.CountDownTimer import com.casic.detector.R import com.casic.detector.utils.LocaleConstant @@ -23,7 +24,7 @@ } } - override fun initData() { + override fun initData(savedInstanceState: Bundle?) { EasyPermissions.requestPermissions( this, "${resources.getString(R.string.app_name)}需要获取必要权限", LocaleConstant.PERMISSIONS_CODE, *LocaleConstant.USER_PERMISSIONS