1.将MainActivity中的livedata改为flow防止不可见时无法登陆socket。

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

@@ -683,37 +683,44 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Downloa
                 }
             }
         }
+        viewModel.viewModelScope.launch {
+            viewModel.mainLoginData.collect{bean->
+               bean?.let {suserBean->
+                    if (!updateUser){
+                        return@collect
+                    }
+                    updateUser=false
+                    if (suserBean.xhlyLoginSucess){
+                        userBean=suserBean
+                        val data = LogdOperateBean()
+                        ManageApplication.getDeviceInfo()?.let {
+                            data.sn = it
+                        }
+                        data.doEvent = EventLog.ACCOUNTLOGINEVENT
+                        data.comm=EventLog.ACCOUNTLOGINEVENTSTRING
+                        viewModel.eventLog(data)
+                        Const.USERID=suserBean.userid
+                        Const.USERNAME=suserBean.username.toString()
+                        Const.SCHOOLID=suserBean.schoolid
+                        Const.CLASSID=suserBean.classid
+                        spUtils.saveJson(Const.USERINFO,suserBean)
+                        val parseClassToJson = GsonUtils.parseClassToJson(suserBean)
+                        ZSpProvider.save(this@MainActivity,Const.USERINFO,parseClassToJson)
+                        AppSocket.onDestroy()
+                        AppSocket.startSocket(ManageApplication.instance)
+                    }else{
+                        suserBean.xhlyLoginMessage?.let {
+                            Toast(it)
+                        }
+                    }
 
-        viewModel.mainLoginData.observe(this){userBean->
-            if (!updateUser){
-                return@observe
-            }
-            updateUser=false
-            if (userBean.xhlyLoginSucess){
-                this.userBean=userBean
-                val data = LogdOperateBean()
-                ManageApplication.getDeviceInfo()?.let {
-                    data.sn = it
-                }
-                data.doEvent = EventLog.ACCOUNTLOGINEVENT
-                data.comm=EventLog.ACCOUNTLOGINEVENTSTRING
-                viewModel.eventLog(data)
-                Const.USERID=userBean.userid
-                Const.USERNAME=userBean.username.toString()
-                Const.SCHOOLID=userBean.schoolid
-                Const.CLASSID=userBean.classid
-                spUtils.saveJson(Const.USERINFO,userBean)
-                val parseClassToJson = GsonUtils.parseClassToJson(userBean)
-                ZSpProvider.save(this,Const.USERINFO,parseClassToJson)
-                AppSocket.onDestroy()
-                AppSocket.startSocket(ManageApplication.instance)
-            }else{
-                userBean.xhlyLoginMessage?.let {
-                    Toast(it)
                 }
             }
         }
 
+        /*viewModel.mainLoginData.observe(this){userBean->
+        }
+*/
         lifecycleScope.launch {
             isCreatFlag = true
             isDestroyFlag=false

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

@@ -53,8 +53,11 @@ open class BaseViewModel : CommonBaseViewModel() {
     val autoAppData: Flow<AutoAppBean?> = autoAppResult.asStateFlow()
 
 
-    private val mainLoginResult=MutableLiveData<UserBean>()
-    val mainLoginData:LiveData<UserBean> =mainLoginResult
+    /*private val mainLoginResult=MutableLiveData<UserBean>()
+    val mainLoginData:LiveData<UserBean> =mainLoginResult*/
+
+    private val mainLoginResult = MutableStateFlow<UserBean?>(null)
+    val mainLoginData: Flow<UserBean?> = mainLoginResult.asStateFlow()
     //标记修改登录信息失败，失败3次则不再继续
     var editNum=0
 
@@ -65,6 +68,7 @@ open class BaseViewModel : CommonBaseViewModel() {
                 val postLogin = loginService.postLoginEdit(loginStudentBean)
                 if (postLogin.code==0){
                     if (postLogin.obj!=null){
+                        LogShow("修改登录信息成功11"+postLogin.obj)
                         mainLoginResult.value=postLogin.obj
                     }
                 }else{