update version

MirkoWu · Sep 17, 2022 · 76ce444 · 76ce444
1 parent dbf7b3d
commit 76ce444
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 12 deletions.
diff --git a/app/src/main/java/com/mirkowu/mvm/ble/BleActivity.kt b/app/src/main/java/com/mirkowu/mvm/ble/BleActivity.kt
@@ -210,12 +210,12 @@ class BleActivity : BaseActivity<EmptyMediator>() {
 //            bleManager.disconnect()
 //        }
 //        if (bleManager.isSupportBLE(context)) {
-//            PermissionsUtil.getInstance()
+//            PermissionsUtils.getInstance()
 //                .requestPermissions(this, arrayOf(
 //                    Manifest.permission.ACCESS_COARSE_LOCATION,
 //                    Manifest.permission.BLUETOOTH
 //                ),
-//                    object : PermissionsUtil.OnPermissionsListener {
+//                    object : PermissionsUtils.OnPermissionsListener {
 //                        override fun onPermissionGranted(requestCode: Int) {
 //                            if (bleManager.isEnable()) {
 //                                val scanning = bleManager.startLeScan { device, rssi, scanRecord ->

diff --git a/app/src/main/java/com/mirkowu/mvm/ble/SearchBleActivity.kt b/app/src/main/java/com/mirkowu/mvm/ble/SearchBleActivity.kt
@@ -11,7 +11,7 @@ import com.mirkowu.lib_ble.service.BLEClient
 import com.mirkowu.lib_ble.service.BLEService
 import com.mirkowu.lib_ble.service.OnServiceConnectListener
 import com.mirkowu.lib_util.LogUtil
-import com.mirkowu.lib_util.PermissionsUtil
+import com.mirkowu.lib_util.PermissionsUtils
 import com.mirkowu.lib_util.utilcode.util.ConvertUtils
 import com.mirkowu.lib_util.utilcode.util.ToastUtils
 import com.mirkowu.mvm.R
@@ -74,9 +74,9 @@ class SearchBleActivity : BaseActivity<EmptyMediator>() {
 
     private fun startLeScan() {
         if (client.isSupportBLE(context)) {
-            PermissionsUtil.getInstance()
-                .requestPermissions(this, PermissionsUtil.GROUP_BLUETOOTH,
-                    object : PermissionsUtil.OnPermissionsListener {
+            PermissionsUtils.getInstance()
+                .requestPermissions(this, PermissionsUtils.GROUP_BLUETOOTH,
+                    object : PermissionsUtils.OnPermissionsListener {
                         override fun onPermissionGranted(requestCode: Int) {
                             if (client.isEnable()) {
                                 client.bindService(context, object :

diff --git a/build.gradle b/build.gradle
@@ -43,24 +43,35 @@ task clean(type: Delete) {
 
 ext {
     //编译版本不能大于30 否则要Java8以上才能支持，导致jitpack打包失败
-    minSdkVersion = 21
-    targetSdkVersion = 29
     compileSdkVersion = 30
+    targetSdkVersion = 29
+    minSdkVersion = 21
+
+    mvm_version = 'latest.release'
+    mvm_thirdparty_version = 'latest.release'
 
-    mvm_version = '1.1.0+'
-    mvm_kit_version = '1.0.0+'
+    //google
     core_ktx_version = '1.6.0'
     appcompat_version = '1.3.1'
     material_version = '1.4.0'
     lifecycle_version = '2.3.1'
+    recyclerview_version = '1.2.1'
+    constraintlayout_version = '2.1.3'
+    coordinatorlayout_version = '1.2.0'
+
+    camerax_version = '1.0.2'
+    camerax_view_version = '1.0.0-alpha28' //大于alpha28则要求编译版本>=31且有bug，需谨慎
+
+    //other
     okio_version = '2.2.2'
     okhttp_version = '3.14.9'
     retrofit_version = '2.9.0'
     rxjava3_version = '3.1.3'
     rxandroid3_version = '3.0.0'
     autodispose_version = '2.0.0'
+
     refresh_version = '2.0.5'
     glide_version = '4.13.0'
-    camerax_version = '1.0.2'
-    camerax_view_version = '1.0.0-alpha28' //大于alpha28则要求编译版本>=31且有bug，需谨慎
+    gson_version = '2.8.8'
+    logger_version = '2.2.0'
 }