1.修改密码后不再退出登录，而是直接提示

2.退出登录接口添加参数，
3.进入应用默认先从本地读取壁纸

app/src/main/java/com/xhly/manageapp/ui/login/activity/LoginActivity.kt

@@ -14,7 +14,9 @@ import android.widget.TextView
 import androidx.activity.addCallback
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
+import com.kongzue.dialogx.DialogX
 import com.kongzue.dialogx.dialogs.CustomDialog
+import com.kongzue.dialogx.dialogs.WaitDialog
 import com.kongzue.dialogx.interfaces.OnBindView
 import com.tbruyelle.rxpermissions2.RxPermissions
 import com.xhkjedu.manageapp.R
@@ -48,10 +50,12 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
     private var regioncode = ""
     //如果次数大于10则可以打开设置页面
     private var showSettingNum=0
+
     override fun getBinding() = ActivityLoginBinding.inflate(layoutInflater)
 
     override fun initData() {
        viewModel.loginData.observe(this){
+           WaitDialog.dismiss()
            if (it.xhlyLoginSucess){
                loginSucess(it)
            }else{
@@ -206,6 +210,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         ManageApplication.getDeviceInfo()?.let {
             loginBean.sn=it
         }
+        WaitDialog.setMessage("正在登陆").show()
         viewModel.login(loginBean)
     }
 

app/src/main/java/com/xhly/manageapp/ui/main/activity/MainActivity.kt

@@ -10,6 +10,7 @@ import android.content.IntentFilter
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager
 import android.graphics.Color
+import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import android.os.Build
 import android.provider.Settings
@@ -20,6 +21,7 @@ import android.widget.LinearLayout
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
+import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.viewModelScope
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.work.PeriodicWorkRequest
@@ -69,7 +71,9 @@ import com.xhly.manageapp.utils.CustomAppUtils
 import com.xhly.manageapp.utils.PadInfoUtils
 import com.xhly.manageapp.utils.StrategyUtils
 import com.xhly.manageapp.workmanager.TimingWorker
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.io.File
 import java.util.Calendar
 import java.util.Timer
@@ -99,34 +103,24 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         } else {
             userBean = json as UserBean
         }
-        try {
-            val file = File(filesDir, "wallpaper.png")
-            if (file.exists()){
-                Glide.with(this).load(file).placeholder(R.drawable.main_bg)
-                    .error(R.drawable.main_bg)
-                    .into(object : CustomViewTarget<LinearLayout, Drawable>(mBinding.root) {
-                        override fun onLoadFailed(errorDrawable: Drawable?) {
-                            errorDrawable?.let { drawble ->
-                                mBinding.root.background = drawble
-                            }
-                        }
-
-                        override fun onResourceCleared(placeholder: Drawable?) {
-                            placeholder?.let { drawble ->
-                                mBinding.root.background = drawble
+        lifecycleScope.launch {
+            withContext(Dispatchers.IO){
+                val file = File(filesDir, "wallpaper.png")
+                if (file.exists()){
+                    try {
+                        val bitmap = ImageUtils().getBitmapFromFile(file.toString())
+                        withContext(Dispatchers.Main){
+                            try {
+                                mBinding.root.background=BitmapDrawable(resources,bitmap)
+                            }catch (e:Exception){
+                                LogShow("图片设置失败")
                             }
                         }
-
-                        override fun onResourceReady(
-                            resource: Drawable,
-                            transition: Transition<in Drawable>?
-                        ) {
-                            mBinding.root.background = resource
-                        }
-                    })
+                    }catch (e:Exception){
+                        LogShow("图片不存在")
+                    }
+                }
             }
-        }catch (e:Exception){
-
         }
         adapter = AppAdapter(this, dataList)
         mBinding.rv.layoutManager = GridLayoutManager(this, 6, GridLayoutManager.VERTICAL, false)
@@ -216,7 +210,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             updateStrategyFlag=true
             if (updateTimeFlag){
                 showSucessToast()
-                updateStrategyFlag=false
             }
         }
         viewModel.appStrategyData.observe(this) {
@@ -225,7 +218,6 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             updateTimeFlag=true
             if (updateStrategyFlag){
                 showSucessToast()
-                updateTimeFlag=false
             }
         }
         viewModel.padInfoData.observe(this) {
@@ -275,7 +267,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                         ) {
                             mBinding.root.background = resource
                             val imageUtil=ImageUtils()
-                            imageUtil.saveBitmapToFile(this@MainActivity,imageUtil.drawableToBitmap(resource), File(filesDir,"wallpaper.png"))
+                            imageUtil.saveBitmapToFile(imageUtil.drawableToBitmap(resource), File(filesDir,"wallpaper.png"))
                         }
                     })
             }
@@ -342,6 +334,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
 
     private fun showSucessToast() {
         Toaster.show(R.string.updatetips)
+        updateStrategyFlag=false
+        updateTimeFlag=false
     }
 
 

app/src/main/java/com/xhly/manageapp/ui/main/viewmodel/MainViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import com.xhly.corelib.Const
 import com.xhly.corelib.eventbus.UIEvent
 import com.xhly.corelib.network.RetrofitService
+import com.xhly.manageapp.ManageApplication
 import com.xhly.manageapp.bean.app.AppModel
 import com.xhly.manageapp.bean.app.ListAppBean
 import com.xhly.manageapp.bean.log.UpdateBean
@@ -148,6 +149,9 @@ class MainViewModel : BaseViewModel() {
             val map = HashMap<String, Any>()
             map["userid"] = userid
             map["loginpwd"] = loginpwd
+            ManageApplication.getDeviceInfo()?.let {sn->
+                map["sn"]=sn
+            }
             val postLoginOut = loginService.postLoginOut(map)
             if (postLoginOut.code == 0) {
                 loginOut.value = true
@@ -220,7 +224,11 @@ class MainViewModel : BaseViewModel() {
             map["oldpwd"] = oldpwd
             val postEditPwd = loginService.postEditPwd(map)
             if (postEditPwd.code==0){
-              UIEvent(Const.ACCOUNTLOGINOUT).post()
+                netMessage.value ="修改成功"
+            //修改完密码不退出登录
+            //UIEvent(Const.ACCOUNTLOGINOUT).post()
+            }else{
+                netMessage.value ="修改失败"
             }
         }
     }

corelib/src/main/java/com/xhly/corelib/utils/ImageUtils.kt

@@ -1,11 +1,10 @@
 package com.xhly.corelib.utils
 
-import android.content.Context
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
-import android.os.Environment
 import java.io.File
 import java.io.FileOutputStream
 import java.io.IOException
@@ -27,7 +26,7 @@ class ImageUtils {
         return bitmap
     }
 
-    fun saveBitmapToFile(context: Context, bitmap: Bitmap, file: File): Boolean {
+    fun saveBitmapToFile(bitmap: Bitmap, file: File): Boolean {
         try {
             val stream = FileOutputStream(file)
             bitmap.compress(Bitmap.CompressFormat.PNG, 100, stream)
@@ -39,4 +38,25 @@ class ImageUtils {
             return false
         }
     }
+
+    /**
+     * 从文件获取 bitmap ，并根据给定的显示宽高对 bitmap 进行缩放
+     *
+     * @param filePath 文件路径
+     * @param height   需要显示的高度
+     * @param width    需要显示的宽度
+     * @return 缩放后的 bitmap，若获取失败，返回 null
+     */
+    fun getBitmapFromFile(filePath: String): Bitmap? {
+        val options = BitmapFactory.Options()
+        options.inJustDecodeBounds = true
+        BitmapFactory.decodeFile(filePath, options)
+        val srcWidth = options.outWidth.toFloat()
+        val srcHeight = options.outHeight.toFloat()
+        if (srcWidth == -1f || srcHeight == -1f) return null
+        var inSampleSize = 1
+        options.inJustDecodeBounds = false
+        options.inSampleSize = inSampleSize
+        return BitmapFactory.decodeFile(filePath, options)
+    }
 }