1.添加退出登录接口。

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

@@ -67,6 +67,7 @@ class LoginActivity : BaseActivity<LoginViewModel, ActivityLoginBinding>() {
         loginBean.loginpwd=code
         loginBean.device= Build.BRAND
         loginBean.deviceModel=Build.MODEL
+        loginBean.regionCode=regioncode
         loginBean.clientVersion=SystemUtil.getAppVersionName(this,packageName)
         ManageApplication.getDeviceInfo()?.let {
             loginBean.sn=it

app/src/main/java/com/xhly/manageapp/ui/login/netservice/LoginService.kt

@@ -14,4 +14,11 @@ interface LoginService {
 
     @POST(UriAdress.ULOGIN_LOGIN)
     suspend fun postLogin(@Body loginBean: LoginBean): ResponseData<UserBean>
+
+    /**
+     * 退出登录接口参数 userid	number 用户id
+     * loginpwd	string 密码
+     */
+    @POST(UriAdress.ULOGIN_LOGIN_OUT)
+    suspend fun postLoginOut(@Body map:HashMap<String,Any>): ResponseData<Any>
 }

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

@@ -16,7 +16,6 @@ import android.widget.EditText
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.addCallback
-import androidx.multidex.BuildConfig
 import androidx.recyclerview.widget.GridLayoutManager
 import androidx.work.PeriodicWorkRequest
 import androidx.work.WorkManager
@@ -104,6 +103,14 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 spUtils.setParam(Const.PADINFOTIMEKEY, System.currentTimeMillis())
             }
         }
+        viewModel.loginOutData.observe(this) {
+            if (it) {
+                loginOut()
+            }
+        }
+        viewModel.updateInfoData.observe(this){
+            //TODO 需要编写更新代码
+        }
         startWorkManager()
     }
 
@@ -151,7 +158,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
         //每天请求一次app更新接口
         try {
             var userBean = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass) as UserBean
-            //获得pad信息提交时间，如果为同一天则不在上传，不然继续上传
+            //存储pad更新请求时间，如果为同一天则不在上传，不然继续上传
             val padTime = spUtils.getParam(Const.PADUPDATETIMEKEY, 0L) as Long
             val instance = Calendar.getInstance()
             val currentYear = instance.get(Calendar.YEAR)
@@ -167,9 +174,9 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 val packageInfo =
                     packageManager.getPackageInfo(packageName, PackageManager.GET_META_DATA)
                 updateBean.cversion = packageInfo.versionName
-                updateBean.schoolid=userBean.schoolid
-                updateBean.userid=userBean.userid
-                updateBean.regionid=userBean.regionid
+                updateBean.schoolid = userBean.schoolid
+                updateBean.userid = userBean.userid
+                updateBean.regionid = userBean.regionid
                 viewModel.updateMcApp(updateBean)
             }
         } catch (e: Exception) {
@@ -433,8 +440,19 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                     editText.hint = getString(R.string.inputcode)
                     titleTv.text = getString(R.string.exit)
                     enterTv.setOnClickListener {
-                        dialog.dismiss()
-                        loginOut()
+                        val code = editText.text
+                        if (!code.isNullOrBlank()) {
+                            dialog.dismiss()
+                            try {
+                                val userBean = spUtils.getFromJson(
+                                    Const.USERINFO,
+                                    UserBean().javaClass
+                                ) as UserBean
+                                viewModel.loginOut(userBean.userid.toString(), code.toString())
+                            } catch (e: Exception) {
+
+                            }
+                        }
                     }
                     cancelTv.setOnClickListener {
                         dialog.dismiss()
@@ -495,8 +513,8 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     private fun startWorkManager() {
         WorkManager.getInstance(this).cancelAllWork()
         // 周期性任务时间最少15分钟 所以除以实际周期的时间  看需要加入几个任务
-        /*val taskList = arrayListOf(5, 10)*/
-        for (taskNo in 1..10) {
+        val taskList = arrayListOf(5, 10)
+        for (taskNo in taskList) {
             val request = PeriodicWorkRequest
                 // 最少15分钟 PeriodicWorkRequest
                 .Builder(TimingWorker::class.java, 15, TimeUnit.MINUTES)

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

@@ -14,9 +14,11 @@ import com.xhly.manageapp.bean.strategy.StrategyBean
 import com.xhly.manageapp.network.app.AppService
 import com.xhly.manageapp.network.log.LogService
 import com.xhly.manageapp.network.strategy.StrategyService
+import com.xhly.manageapp.ui.login.netservice.LoginService
 
 class MainViewModel : CommonBaseViewModel() {
     private val appService by lazy { RetrofitService.create<AppService>() }
+    private val loginService by lazy { RetrofitService.create<LoginService>() }
     private val strategyService by lazy { RetrofitService.create<StrategyService>() }
     private var logService = RetrofitService.create<LogService>()
     private val listData = MutableLiveData<ArrayList<AppModel>>()
@@ -29,6 +31,9 @@ class MainViewModel : CommonBaseViewModel() {
     val padInfoData: LiveData<Boolean> = padInfo
     private val updateInfo = MutableLiveData<Boolean>()
     val updateInfoData: LiveData<Boolean> = updateInfo
+    private val loginOut = MutableLiveData<Boolean>()
+    val loginOutData: LiveData<Boolean> = loginOut
+
     fun getAppList() {
         launchUI {
             val postListApp = appService.postListApp(ListAppBean())
@@ -101,4 +106,20 @@ class MainViewModel : CommonBaseViewModel() {
             }
         }
     }
+
+    fun loginOut(userid: String, loginpwd: String) {
+        launchUI {
+            val map = HashMap<String, Any>()
+            map["userid"] = userid
+            map["loginpwd"] = loginpwd
+            val postLoginOut = loginService.postLoginOut(map)
+            if (postLoginOut.code == 0) {
+                loginOut.value=true
+            } else {
+                if (postLoginOut.msg != null) {
+                    netMessage.value = postLoginOut.msg
+                }
+            }
+        }
+    }
 }

corelib/src/main/java/com/xhly/corelib/Const.kt

@@ -95,7 +95,7 @@ object Const {
     //存储pad信息提交时间，如果为同一天则不在上传，不然继续上传
     const val PADINFOTIMEKEY = "PADINFOTIMEKEY"
 
-    //存储pad更新请求时间，如果为同一天则不在上传，不然继续上传
+    //存储pad更新请求时间，如果为同一天则不在请求更新，不然继续请求更新
     const val PADUPDATETIMEKEY = "PADUPDATETIMEKEY"
 
     //存储用户信息