1.适配android12。

app/src/main/java/com/hdl/xl/activity/MainActivity.kt

@@ -36,19 +36,9 @@ class MainActivity : MBActivity<MainVModel, ActivityMainBinding>(){
         initData()
         //检查更新
 
-//        UpgradeUtil.checkNewVersion(context(),true)
-
         UpdateUtils.checkUpgrade(false,true)
 
 
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
-//            //做一些处理
-//            UpgradeUtil.checkNewVersion(context(),true)
-//
-//        }else{
-//            UpdateUtils.checkUpgrade(false,true)
-//
-//        }
 
 
         vm.getInfo()

update/src/main/java/com/ysnows/update/util/UpgradeUtil.kt

@@ -1,162 +0,0 @@
-import android.annotation.SuppressLint
-import android.app.Dialog
-import android.app.DownloadManager
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.os.Build
-import android.os.Environment
-import android.util.Log
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.ProgressBar
-import android.widget.TextView
-import android.widget.Toast
-import com.qmuiteam.qmui.kotlin.onClick
-import com.tencent.bugly.beta.Beta
-import com.ysnows.update.databinding.DialogUpgradleBinding
-import kotlinx.coroutines.*
-import java.text.DecimalFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-
-class UpgradeUtil {
-
-    companion object {
-        var isIgnoreNewVersion = false
-        private const val mTag = "UpgradeUtil"
-        fun checkNewVersion(context: Context, isManual: Boolean) {
-            if (!isManual && isIgnoreNewVersion) return
-            MainScope().launch(Dispatchers.IO) {
-                Beta.checkUpgrade(isManual, true)
-                delay(2000).run {
-                    var result = Beta.getUpgradeInfo()
-                    if (result == null) {
-                        Log.e("-shy-", "没有新版本 ")
-                    } else {
-                        MainScope().launch {
-                            var dialog = Dialog(context)
-                            val bd = DialogUpgradleBinding.inflate(LayoutInflater.from(context))
-                            bd.tvVersion.text = "版本号：${result.versionName}\n发布时间：${
-                                SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(result.publishTime)
-                            }"
-
-                            val fileSize =result.fileSize
-                            val fill_size: String = getM(fileSize)
-                            bd.tvVersion.text= result.title +"版本上线"
-                            bd.tvFillsieze.text="包大小:"+fill_size+"M"
-                            val sdf = SimpleDateFormat("yyyy-MM-dd HH:mm:ss")
-                            val time = sdf.format(Date(result.publishTime))
-                            bd.tvUpdatetime.text= "更新时间：$time"
-                            bd.tvUpdatecontent.text=result.newFeature
-
-                            bd.tvLeft.onClick {
-                               //取消
-                                dialog.dismiss()
-                            }
-                            //立即升级
-                            bd.tvRight.setOnClickListener {
-                                val downloadManager =
-                                    context.getSystemService(Context.DOWNLOAD_SERVICE) as DownloadManager
-                                val request = DownloadManager.Request(Uri.parse(result.apkUrl))
-                                request.setDestinationInExternalPublicDir(
-                                    Environment.DIRECTORY_DOWNLOADS,
-                                    "labApks"
-                                )
-                                request.setNotificationVisibility(DownloadManager.Request.VISIBILITY_VISIBLE)
-                                request.setMimeType("application/vnd.android.package-archive")
-                                val downloadId = downloadManager.enqueue(request)
-                                bd.llActions.visibility = View.GONE
-                                bd.tvProgress.text = "0%"
-                                bd.progressBar.progress = 0
-                                bd.flProgress.visibility = View.VISIBLE
-                                MainScope().launch(Dispatchers.IO) {
-                                    var success = checkDownloadProgress(
-                                        downloadManager,
-                                        downloadId,
-                                        bd.progressBar,
-                                        bd.tvProgress
-                                    )
-                                    MainScope().launch {
-                                        dialog.dismiss()
-                                        if (success) {
-                                            val uri =
-                                                downloadManager.getUriForDownloadedFile(downloadId)
-                                            installAPK(context, uri)
-                                        } else {
-                                            Toast.makeText(context,"下载失败，请重试",Toast.LENGTH_SHORT).show()
-                                            bd.flProgress.visibility = View.GONE
-                                            bd.llActions.visibility = View.VISIBLE
-                                        }
-                                    }
-                                }
-
-                            }
-                            dialog.setContentView(bd.root)
-                            dialog.show()
-                        }
-                    }
-                }
-            }
-        }
-
-        private  fun getM(k: Long): String {
-            return try {
-                val m = k / 1024.0 / 1024.0
-                val dfs = DecimalFormat("0.0")
-                dfs.format(m)
-            } catch (e: Exception) {
-                ""
-            }
-        }
-
-
-        private fun installAPK(context: Context, apkFile: Uri) {
-            val intent = Intent(Intent.ACTION_VIEW)
-            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                intent.flags = Intent.FLAG_GRANT_READ_URI_PERMISSION
-            } else {
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            }
-            intent.setDataAndType(apkFile, "application/vnd.android.package-archive")
-            context.startActivity(intent)
-        }
-
-
-        @SuppressLint("Range")
-        suspend fun checkDownloadProgress(
-            manager: DownloadManager,
-            downloadId: Long,
-            progressBar: ProgressBar, progressText: TextView
-        ): Boolean {
-            while (true) {
-                val q = DownloadManager.Query()
-                q.setFilterById(downloadId)
-                val cursor = manager.query(q)
-                cursor.moveToFirst()
-                val bytes_downloaded =
-                    cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_BYTES_DOWNLOADED_SO_FAR))
-                val bytes_total =
-                    cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_TOTAL_SIZE_BYTES))
-                val dl_progress = (bytes_downloaded * 100 / bytes_total)
-                progressBar.post {
-                    progressBar.progress = dl_progress
-                    progressText.text = "${dl_progress}%"
-                }
-                when (cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))) {
-                    DownloadManager.STATUS_SUCCESSFUL -> {
-                        return true
-                    }
-                    DownloadManager.STATUS_RUNNING, DownloadManager.STATUS_PENDING -> {
-                        delay(500)
-                    }
-                    else -> {
-                        manager.remove(downloadId)
-                        return false
-                    }
-                }
-            }
-        }
-    }
-}

update/src/main/res/layout/dialog_upgradle.xml

@@ -1,200 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:background="#00000000"
-    android:gravity="center"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="match_parent">
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
-        android:orientation="vertical"
-        android:layout_height="wrap_content">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="148dp"
-            android:background="@drawable/update_top"
-            >
-
-            <TextView
-                android:id="@+id/tv_version"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:paddingLeft="29dp"
-                android:textColor="#FE6776"
-                android:textSize="17sp"
-                tools:text="胎联网2.2.8版本上线"
-                />
-        </FrameLayout >
-
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/update_border"
-            android:orientation="vertical"
-            android:paddingLeft="30dp"
-            android:paddingRight="30dp"
-            >
-
-
-            <TextView
-                android:id="@+id/tv_fillsieze"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="10dp"
-                android:textColor="#6C6C6C"
-                android:textSize="14sp"
-                tools:text="包大小：11.9M"
-                />
-
-            <TextView
-                android:id="@+id/tv_updatetime"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:textColor="#6C6C6C"
-                android:textSize="14sp"
-                tools:text="更新时间：2018-06-11"
-                />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="18dp"
-                android:text="@string/update_description"
-                android:textColor="#303237"
-                android:textSize="14sp"
-                />
-
-            <ScrollView
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_weight="1"
-                >
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_marginTop="5dp"
-                    android:orientation="vertical"
-                    >
-
-                    <TextView
-                        android:id="@+id/tv_updatecontent"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="#ffffff"
-                        android:lineSpacingExtra="5dp"
-                        android:textColor="#303237"
-                        android:textSize="14sp"
-                        tools:text="1.优化界面"
-                        />
-
-                </LinearLayout >
-            </ScrollView >
-
-<!--            进度条-->
-            <LinearLayout
-                android:id="@+id/fl_progress"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:padding="20dp"
-                android:visibility="gone"
-                tools:visibility="visible">
-
-                <ProgressBar
-                    android:id="@+id/progressBar"
-                    style="?android:attr/progressBarStyleHorizontal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:max="100"
-                    android:min="0"
-                    android:padding="10dp"
-                    android:value="0" />
-
-                <TextView
-                    android:id="@+id/tv_progress"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="5dp"
-                    android:text="0%" />
-
-            </LinearLayout>
-
-
-            <!--按钮-->
-
-            <LinearLayout
-                android:id="@+id/ll_actions"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="28dp"
-                android:layout_marginTop="40dp"
-                android:gravity="center"
-                android:orientation="horizontal"
-                >
-
-                <LinearLayout
-                    android:id="@+id/button_left"
-                    android:layout_width="0dp"
-                    android:layout_height="32dp"
-                    android:layout_marginRight="11dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/dialog_border_black"
-                    android:gravity="center"
-                    >
-
-                    <TextView
-                        android:id="@+id/tv_left"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/no_upgrade"
-                        android:textColor="#7A7A7A"
-                        android:textSize="16sp"
-
-                        />
-
-                </LinearLayout >
-
-                <LinearLayout
-                    android:id="@+id/button_right"
-                    android:layout_width="0dp"
-                    android:layout_height="32dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/dialog_border_red"
-                    android:gravity="center"
-                    >
-
-                    <TextView
-                        android:id="@+id/tv_right"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/go_upgrade"
-                        android:textColor="#fff"
-                        android:textSize="16sp"
-                        />
-
-                </LinearLayout >
-
-            </LinearLayout >
-
-        </LinearLayout >
-
-    </LinearLayout>
-
-
-
-</LinearLayout>
-</layout>
-