|
@@ -323,9 +323,7 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
|
323
|
323
|
val userBean = spUtils.getFromJson(
|
324
|
324
|
Const.USERINFO, UserBean().javaClass
|
325
|
325
|
) as UserBean
|
326
|
|
- val appVersionCode =
|
327
|
|
- SystemUtil.getAppVersionCode(this@MainActivity, packageName)
|
328
|
|
- viewModel.postEditPwd(userBean.userid,newCode,oldCode,appVersionCode)
|
|
326
|
+ viewModel.postEditPwd(userBean.userid,newCode,oldCode)
|
329
|
327
|
} catch (e: Exception) {
|
330
|
328
|
|
331
|
329
|
}
|
|
@@ -823,10 +821,10 @@ class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>() {
|
823
|
821
|
data.comm = "退出登录"
|
824
|
822
|
data.doEvent = EventLog.ACCOUNTQUITEVENT
|
825
|
823
|
viewModel.eventLog(data)
|
826
|
|
- Const.USERID=null
|
827
|
|
- Const.USERNAME=""
|
828
|
824
|
WorkManager.getInstance(this).cancelAllWork()
|
829
|
825
|
deleteSharedPreferences(SharedPreferencesUtils.SP_FILE_NAME)
|
|
826
|
+ Const.USERID=null
|
|
827
|
+ Const.USERNAME=""
|
830
|
828
|
startIntentActivity(LoginActivity().javaClass)
|
831
|
829
|
finish()
|
832
|
830
|
}
|