中建365-二期开发-优化

develop
wlh 1 year ago
parent e5adb8e3ae
commit d3c1305b62

@ -490,19 +490,19 @@ class MainActivity : BaseVmAct<MainVm>(), Consumer<AbstractMeasureData> {
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun bindDevSuccess(event: BindDevEvent){ fun bindDevSuccess(event: BindDevEvent){
mViewModel.getMySetting() // mViewModel.getMySetting()
mViewModel.getIsDemonstate() mViewModel.getIsDemonstate()
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun refreshUI(event: MyInfoEvent){ fun refreshUI(event: MyInfoEvent){
mViewModel.getMySetting() // mViewModel.getMySetting()
} }
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){ fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){
mViewModel.getMySetting() // mViewModel.getMySetting()
mViewModel.getIsDemonstate() mViewModel.getIsDemonstate()
} }

@ -240,7 +240,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
override fun onResume() { override fun onResume() {
super.onResume() super.onResume()
// mViewModel.getWarningMsg() //mViewModel.getAllInfo()
} }
//点击事件 //点击事件
@ -475,7 +475,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
} }
private fun request() { private fun request() {
// LogUtils.e("DynamicManagementFrag","请求数据拉") LogUtils.e("DynamicManagementFrag","请求数据拉")
mViewModel.getAllInfo(showIdInfo, false) mViewModel.getAllInfo(showIdInfo, false)
// mViewModel.getMySetting() // mViewModel.getMySetting()
mViewModel.getTips() mViewModel.getTips()
@ -749,6 +749,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
//获取首页所有信息返回 //获取首页所有信息返回
mViewModel.allData.observe(this) { mViewModel.allData.observe(this) {
LogUtils.e(TAG,"请求到数据拉")
it.data?.let { bean -> it.data?.let { bean ->
if (bean.user.name.isNullOrEmpty()||bean.user.age.isNullOrEmpty()) { if (bean.user.name.isNullOrEmpty()||bean.user.age.isNullOrEmpty()) {
dialogInfoUn.show() dialogInfoUn.show()
@ -1261,11 +1262,11 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
} }
fun cancelTimer(){ fun cancelTimer(){
LogUtils.e("DynamicManagementFrag","取消定时cancelTimer") LogUtils.e(TAG,"取消定时cancelTimer")
// getHealthInfoJob?.cancel() // getHealthInfoJob?.cancel()
mDisposable?.let { mDisposable?.let {
if(!it.isDisposed){ if(!it.isDisposed){
LogUtils.e("DynamicManagementFrag","取消定时") LogUtils.e(TAG,"取消定时")
it.dispose() it.dispose()
} }
@ -1577,7 +1578,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun loginOutChange(event: LoginOutEvent){ fun loginOutChange(event: LoginOutEvent){
LogUtils.e("DynamicManagementFrag","loginOutChange") LogUtils.e(TAG,"loginOutChange")
isJob = false isJob = false
cancelTimer() cancelTimer()
@ -1590,7 +1591,7 @@ class DynamicManagementFrag : BaseVmFrag<DynamicManagementVm>() , EasyPermission
@Subscribe(threadMode = ThreadMode.MAIN) @Subscribe(threadMode = ThreadMode.MAIN)
fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){ fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){
// LogUtils.e("DynamicManagementFrag","登录啦啦啦") LogUtils.e(TAG,"登录啦啦啦")
showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") { showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") {
"" ""
} else { } else {

@ -480,7 +480,7 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
if (!TextUtils.isEmpty(showIdInfo)) { if (!TextUtils.isEmpty(showIdInfo)) {
mViewModel.getMySetting() mViewModel.getMySetting()
mViewModel.getUserOtherInfo() mViewModel.getUserOtherInfo()
mViewModel.getAllInfo(showIdInfo, false) // mViewModel.getAllInfo(showIdInfo, false)
mViewModel.searchInviteInfo() mViewModel.searchInviteInfo()
} }
} }
@ -490,9 +490,9 @@ class MineFrag : BaseVmFrag<SettingVm>() , EasyPermissions.PermissionCallbacks{
super.onResume() super.onResume()
if (!TextUtils.isEmpty(showIdInfo)){ if (!TextUtils.isEmpty(showIdInfo)){
mViewModel.getMySetting() mViewModel.getMySetting()
mViewModel.getAllInfo(showIdInfo,false) // mViewModel.getAllInfo(showIdInfo,false)
mViewModel.searchInviteInfo() mViewModel.searchInviteInfo()
mViewModel.getUserOtherInfo() // mViewModel.getUserOtherInfo()
} }
} }

@ -81,7 +81,7 @@ class HomeVm: BaseVm() {
} }
fun getHomeLayout(){ fun getHomeLayout(){
startHttp { startHttp (false){
var body= apiInterface().getHomeLayout() var body= apiInterface().getHomeLayout()
body.getCodeStatus(layoutLive,nowData) body.getCodeStatus(layoutLive,nowData)
} }

@ -192,7 +192,7 @@ class MainVm : BaseVm() {
* 个人设置接口 * 个人设置接口
*/ */
fun getMySetting() { fun getMySetting() {
startHttp { startHttp(false) {
val body = apiInterface().getMySetting() val body = apiInterface().getMySetting()
body.getCodeStatus(settingLive, nowData) body.getCodeStatus(settingLive, nowData)
} }

@ -11,7 +11,7 @@ class MessageVm(): BaseVm() {
val msgAllRead by lazy { MutableLiveData<RespBody<Any>>() } val msgAllRead by lazy { MutableLiveData<RespBody<Any>>() }
fun getSystemMsg(){ fun getSystemMsg(){
startHttp { startHttp(false) {
var response = apiInterface().getSystemMsg() var response = apiInterface().getSystemMsg()
response.getCodeStatus(msgData, nowData) response.getCodeStatus(msgData, nowData)
} }

@ -189,7 +189,7 @@ class SettingVm : BaseVm() {
} }
fun getUserOtherInfo(){ fun getUserOtherInfo(){
startHttp { startHttp(false) {
val response = apiInterface().getUserOtherInfo() val response = apiInterface().getUserOtherInfo()
response.getCodeStatus(useOtherInfoLiveData,nowData) response.getCodeStatus(useOtherInfoLiveData,nowData)
} }

Loading…
Cancel
Save