1.添加退出登录事件处理，接口成功后再退出

app/src/main/java/com/xhly/manageapp/bean/log/LogEventBean.kt

@@ -0,0 +1,14 @@
+package com.xhly.manageapp.bean.log
+
+/**
+ * 记录事件接口存储是否成功，目前主要用于退出登录
+ */
+class LogEventBean {
+    /**
+     *从EventLog取
+     */
+    var logEventType = 0
+
+    //是否成功
+    var enableFlag = false
+}

app/src/main/java/com/xhly/manageapp/network/log/LogService.kt

@@ -17,7 +17,7 @@ interface LogService {
      * 设备事件日志-添加
      */
     @POST(UriAdress.LOGDOPERATEADD)
-    suspend fun postLogdoperateAdd(@Body logDay: LogdOperateBean)
+    suspend fun postLogdoperateAdd(@Body logDay: LogdOperateBean):ResponseData<Any>
 
     /**
      * 设备启动日志-添加

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

@@ -98,7 +98,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
     override fun initData() {
         val json = spUtils.getFromJson(Const.USERINFO, UserBean().javaClass)
         if (json == null) {
-            loginOut()
+            loginOut(false)
             return
         } else {
             userBean = json as UserBean
@@ -328,6 +328,13 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
                 }
             }
         }
+        viewModel.logEventData.observe(this){
+            when(it.logEventType){
+                EventLog.ACCOUNTQUITEVENT->{
+                    loginOutSucess()
+                }
+            }
+        }
         startWorkManager()
         updateAllStrategy()
     }
@@ -1057,14 +1064,23 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
             .setAlign(CustomDialog.ALIGN.CENTER).show()
     }
 
-    private fun loginOut() {
-        val data = LogdOperateBean()
-        ManageApplication.getDeviceInfo()?.let {
-            data.sn = it
+    private fun loginOut(hasUser:Boolean=true) {
+        //没有用户信息时，判断为初次调用，直接跳转登录页面
+        if (hasUser){
+            //调用接口传递退出事件，成功则退出登录
+            val data = LogdOperateBean()
+            ManageApplication.getDeviceInfo()?.let {
+                data.sn = it
+            }
+            data.comm = "退出登录"
+            data.doEvent = EventLog.ACCOUNTQUITEVENT
+            viewModel.eventLog(data)
+        }else{
+            loginOutSucess()
         }
-        data.comm = "退出登录"
-        data.doEvent = EventLog.ACCOUNTQUITEVENT
-        viewModel.eventLog(data)
+    }
+
+    private fun loginOutSucess(){
         WorkManager.getInstance(this).cancelAllWork()
         deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
         Const.USERID = null

app/src/main/java/com/xhly/manageapp/viewmodel/BaseViewModel.kt

@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import com.xhly.corelib.base.viewmodel.CommonBaseViewModel
 import com.xhly.corelib.network.RetrofitService
 import com.xhly.corelib.utils.MD5Utils
+import com.xhly.manageapp.bean.log.LogEventBean
 import com.xhly.manageapp.bean.log.LogPushBean
 import com.xhly.manageapp.bean.log.LogPushResultBean
 import com.xhly.manageapp.bean.log.LogdOperateBean
@@ -26,7 +27,8 @@ open class BaseViewModel : CommonBaseViewModel() {
     val resetlResultData: LiveData<Boolean> = resetResult
     private val logResult=MutableLiveData<LogPushResultBean>()
     val logResultData:LiveData<LogPushResultBean> =logResult
-
+    private val logEventResult=MutableLiveData<LogEventBean>()
+    val logEventData:LiveData<LogEventBean> =logEventResult
     /**
      * 解除当前锁屏
      */
@@ -65,7 +67,13 @@ open class BaseViewModel : CommonBaseViewModel() {
      */
     fun eventLog(operateBean: LogdOperateBean) {
         launchUI {
-            logService.postLogdoperateAdd(operateBean)
+            var result = logService.postLogdoperateAdd(operateBean)
+            if (result.code==0){
+                val logEventBean=LogEventBean()
+                logEventBean.enableFlag=true
+                logEventBean.logEventType=operateBean.doEvent
+                logEventResult.value=logEventBean
+            }
         }
     }