android studio upgrade to 2024.3.1

BHZHGD/app/build.gradle

@@ -1,13 +1,16 @@
-apply plugin: 'com.android.application'
-apply plugin: 'org.jetbrains.kotlin.android'
+plugins {
+    alias(libs.plugins.android.application)
+    alias(libs.plugins.kotlin.android)
+}
+
 
 android {
     namespace 'com.bjzc.bhzhgd'
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         applicationId "com.bjzc.bhzhgd"
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         versionCode 1
         versionName "1.0.0"
         multiDexEnabled true
@@ -58,23 +61,22 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_17
-        targetCompatibility JavaVersion.VERSION_17
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
     }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 
-//    implementation 'com.zhy:autolayout:1.4.5'
-//    implementation 'com.yolanda.nohttp:nohttp:1.0.5'
-//    implementation 'org.litepal.android:core:1.5.1'
-//    implementation 'com.zhihu.android:matisse:0.5.3-beta3'
-    //图片压缩
-//    implementation 'top.zibin:Luban:1.1.8'
-//    implementation 'id.zelory:compressor:1.0.3'
+    implementation libs.androidx.core.ktx
+    implementation libs.androidx.appcompat
+    implementation libs.material
+    implementation libs.androidx.activity
+    implementation libs.androidx.constraintlayout
+    testImplementation libs.junit
+    androidTestImplementation libs.androidx.junit
+    androidTestImplementation libs.androidx.espresso.core
 
 
 
@@ -90,40 +92,46 @@ dependencies {
     implementation project(':luban')
 
 
-    implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.9.0'
-    implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
+    //网络请求
+    implementation libs.logging.interceptor
+    implementation libs.com.squareup.retrofit2.retrofit3
+    implementation libs.com.squareup.retrofit2.converter.gson
+    implementation libs.okhttp
+    implementation libs.cn.hutool.hutool.all
 
-    implementation 'com.github.huangyanbin:SmartTable:2.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'com.github.LuckSiege.PictureSelector:picture_library:v2.5.9'
-    implementation 'com.github.wanglu1209:PhotoViewer:0.50'
-    implementation 'io.github.azhon:appupdate:4.2.6'
-    implementation 'com.tencent.bugly:crashreport:3.2.1'
-    implementation 'com.github.xuexiangjys:XUI:1.1.4'
-    implementation 'org.greenrobot:eventbus:3.0.0'
-    implementation 'com.github.bumptech.glide:glide:4.11.0'
 
+    implementation libs.com.github.philjay.mpandroidchart6
+    implementation libs.circleimageview
+    implementation libs.com.github.chrisbanes.photoview.library6
+    implementation libs.me.leolin.shortcutbadger
+    implementation libs.cn.jzvd.jiaozivideoplayer6
+    implementation libs.com.github.chrisbanes.photoview6
+    implementation libs.com.davemorrissey.labs.subsampling.scale.image.view6
+    implementation libs.com.github.huangyanbin.smarttable6
+    implementation libs.androidx.multidex
+    implementation libs.recyclerview.v140
+    implementation libs.xuexiangjys.xui
+    implementation libs.baoyachi.stepview
+    implementation libs.appupdate
+    implementation libs.com.tencent.bugly.crashreport
 
-    //第三方工具类
-    implementation 'cn.hutool:hutool-all:5.8.5'
+    implementation libs.picture.library
+    implementation libs.photoviewer
+    implementation libs.eventbus
+    //第三方库图片异步加载
+    implementation libs.com.github.bumptech.glide.glide
+    annotationProcessor libs.compiler
     //mqtt
-    implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.4'
-    implementation 'org.eclipse.paho:org.eclipse.paho.android.service:1.1.1'
-    implementation 'org.bouncycastle:bcpkix-jdk15on:1.56'
-    implementation 'commons-codec:commons-codec:1.15'
+    implementation libs.eclipse.org.eclipse.paho.client.mqttv3
+    implementation libs.eclipse.org.eclipse.paho.android.service
+    implementation libs.org.bouncycastle.bcpkix.jdk15on
+    implementation libs.commons.codec
     //本地广播
-    implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'androidx.activity:activity:1.8.0'
+    implementation libs.androidx.localbroadcastmanager
     //第三方浏览器
-    implementation 'io.github.justson:agentweb-core:v5.1.1-androidx'
+    implementation libs.io.github.justson.agentweb.core3
+    implementation libs.cymchad.baserecyclerviewadapterhelper
 
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
     configurations {
         all*.exclude group: 'com.google.code.gson'
     }

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/activity/LoginActivity.java

@@ -19,7 +19,6 @@ import android.widget.TextView;
 import com.azhon.appupdate.listener.OnButtonClickListener;
 import com.azhon.appupdate.listener.OnDownloadListener;
 import com.azhon.appupdate.manager.DownloadManager;
-;
 import com.bjzc.bhzhgd.activity.zhgd.DeviceListActivity;
 import com.bjzc.bhzhgd.base.BaseCallBackNoProgress;
 import com.bjzc.bhzhgd.R;

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/activity/zhgd/DeviceListActivity.kt

@@ -56,7 +56,8 @@ class DeviceListActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceListBi
     var nfcValue: String? = null
     private lateinit var type: String
     private lateinit var username: String
-    private lateinit var launcherResult: ActivityResultLauncher<Intent?>
+    //private lateinit var launcherResult: ActivityResultLauncher<Intent?>
+    private lateinit var launcherResult: ActivityResultLauncher<Intent>
 
     private lateinit var adapter: DeviceTwoLevelAdapter
     private var datas: MutableList<DeviceZhgdBean.DeviceBean> = mutableListOf()
@@ -77,36 +78,13 @@ class DeviceListActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceListBi
 
     override fun initView() {
         initToolbar("二级电箱", "扫码") {
-            //动态权限申请
-            //动态权限申请
-            if (ContextCompat.checkSelfPermission(
-                    this,
-                    Manifest.permission.CAMERA
-                ) != PackageManager.PERMISSION_GRANTED
-            ) {
-                ActivityCompat.requestPermissions(
-                    this,
-                    arrayOf(Manifest.permission.CAMERA),
-                    CAMERA_REQUEST_CODE
-                )
-            } else {
-                //扫码
-                goScan()
-            }
+            //扫码
+            goScan()
         }
 
 //        binding.toolbarView.toolbar.ivLeft.visibility=View.GONE
 
-        launcherResult =
-            registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-                if (it.resultCode == RESULT_OK) {
-                    val bundle: Bundle? = it.data?.extras
-                    val ewm = bundle?.getString("result")
-                    if (ewm != null) {
-                        handleTwoCodeCheck(ewm)
-                    }
-                }
-            }
+        launcherResult = createActivityResultLauncher()
 
 
         username = SPUtils.get(context, Contans.USERID, "") as String
@@ -136,24 +114,23 @@ class DeviceListActivity : BaseActivityOaToolbarViewBinding<ActivityDeviceListBi
 
     }
 
-
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String?>,
-        grantResults: IntArray
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (CAMERA_REQUEST_CODE == requestCode) {
-            if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
-                //扫码
-                goScan()
-            } else {
-                //权限拒绝
-                Toast.makeText(this, "你拒绝了权限申请，无法打开相机扫码哟！", Toast.LENGTH_SHORT).show()
+    //创建一个ActivityResultLauncher
+    private fun createActivityResultLauncher(): ActivityResultLauncher<Intent> {
+        //kotlin写法
+        return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+            val data = it.data
+            val resultCode = it.resultCode
+            if (resultCode == RESULT_OK) {
+                val bundle: Bundle? = it.data?.extras
+                val ewm = bundle?.getString("result")
+                if (ewm != null) {
+                    handleTwoCodeCheck(ewm)
+                }
             }
         }
     }
 
+
     private fun goScan() {
         val intent = Intent(this, MipcaActivityCapture::class.java)
         launcherResult.launch(intent)

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/base/BaseActivity.java

@@ -24,7 +24,7 @@ import android.view.WindowManager;
 import android.widget.TextView;
 import android.widget.Toast;
 
-;
+
 import com.bjzc.bhzhgd.R;
 import com.bjzc.bhzhgd.utils.ControllerActivity;
 import com.zhy.autolayout.AutoLayoutActivity;

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/base/BaseActivity3.java

@@ -25,7 +25,7 @@ import android.view.View;
 import android.widget.EditText;
 import android.widget.Toast;
 
-;
+
 import com.bjzc.bhzhgd.R;
 import com.bjzc.bhzhgd.utils.AppManager;
 import com.bjzc.bhzhgd.utils.OAToolbar;

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/contans/Contans.java

@@ -11,15 +11,12 @@ public class Contans {
     public static String network_type_Intranet = "http://10.46.101.241:8100/";
     public static String network_type_extranet = "http://10.46.101.241:8100/";
 
-<<<<<<< Upstream, based on branch 'master' of git@192.168.1.24:hwf453/BHZHGD.git
 //    public static String IP = "http://10.46.101.241:8012/";
 //    public static String network_type_Intranet = "http://10.46.101.241:8012/";
 //    public static String network_type_extranet = "http://10.46.101.241:8012/";
-=======
-    public static String IP = "http://10.46.101.241:8100/";
-    public static String network_type_Intranet = "http://10.46.101.241:8100/";
-    public static String network_type_extranet = "http://10.46.101.241:8100/";
->>>>>>> 00efd0c 配置调整
+//    public static String IP = "http://10.46.101.241:8100/";
+//    public static String network_type_Intranet = "http://10.46.101.241:8100/";
+//    public static String network_type_extranet = "http://10.46.101.241:8100/";
 
 //    public static String IP = "http://113.107.214.27:8092/";
 //    public static String network_type_Intranet = "http://192.168.254.1:8092/";

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/utils/HttpUtils.java

@@ -7,7 +7,7 @@ import android.util.Log;
 
 import androidx.annotation.NonNull;
 
-;
+
 import com.bjzc.bhzhgd.contans.Contans;
 
 import java.io.IOException;

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/utils/NoProgresshttpUtils.java

@@ -8,7 +8,7 @@ import android.content.pm.ApplicationInfo;
 import android.text.TextUtils;
 import android.util.Log;
 
-;
+
 import com.bjzc.bhzhgd.R;
 import com.bjzc.bhzhgd.contans.Contans;
 import com.yolanda.nohttp.NoHttp;

BHZHGD/app/src/main/java/com/bjzc/bhzhgd/utils/NohttpUtils.java

@@ -5,19 +5,15 @@ import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.text.TextUtils;
 import android.util.Log;
-
-;
 import com.bjzc.bhzhgd.R;
 import com.bjzc.bhzhgd.contans.Contans;
 import com.yolanda.nohttp.NoHttp;
 import com.yolanda.nohttp.download.DownloadQueue;
 import com.yolanda.nohttp.rest.Request;
 import com.yolanda.nohttp.rest.RequestQueue;
-
 import java.security.KeyStore;
 import java.security.SecureRandom;
 import java.security.cert.CertificateFactory;
-
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.SSLSocketFactory;
 import javax.net.ssl.TrustManagerFactory;

BHZHGD/autolayout/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.zhy.autolayout'
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.7.0'
+    implementation libs.androidx.appcompat.v120
 }

BHZHGD/autolayout/src/main/java/com/zhy/autolayout/AutoLayoutActivity.java

@@ -3,7 +3,7 @@ package com.zhy.autolayout;
 import android.content.Context;
 import android.util.AttributeSet;
 import android.view.View;
-;import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatActivity;
 
 /**
  * Created by zhy on 15/11/19.

BHZHGD/build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 plugins {
-    id 'com.android.application' version '8.9.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.0' apply false
-}
+    alias(libs.plugins.android.application) apply false
+    alias(libs.plugins.kotlin.android) apply false
+}

BHZHGD/litepal/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'org.litepal'

BHZHGD/luban/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'top.zibin.luban'

BHZHGD/matisse/build.gradle

@@ -2,22 +2,22 @@ apply plugin: 'com.android.library'
 
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.zhihu.matisse'
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:1.1.0"
-    implementation "androidx.annotation:annotation:1.1.0"
-    implementation "androidx.recyclerview:recyclerview:1.0.0"
-    implementation 'it.sephiroth.android.library.imagezoom:library:1.0.4'
-    compileOnly 'com.github.bumptech.glide:glide:4.9.0'
-    compileOnly 'com.squareup.picasso:picasso:2.5.2'
+    implementation libs.androidx.appcompat.v110
+    implementation libs.androidx.annotation
+    implementation libs.androidx.recyclerview.v100
+    implementation libs.library
+    compileOnly libs.glide.v490
+    compileOnly libs.picasso
 }
 
 

BHZHGD/nohttp/build.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdk 34
+    compileSdk 35
     defaultConfig {
         minSdk 24
-        targetSdk 34
+        targetSdk 35
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     namespace 'com.yolanda.nohttp'

BHZHGD/settings.gradle

@@ -7,10 +7,8 @@ pluginManagement {
                 includeGroupByRegex("androidx.*")
             }
         }
-        //google()
         mavenCentral()
         gradlePluginPortal()
-        jcenter()
     }
 }
 dependencyResolutionManagement {
@@ -18,9 +16,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        jcenter()
         maven {url "https://jitpack.io"}
-        //maven {url 'https://maven.google.com'}
     }
 }