From d3c1305b6233851c66800c27425afb0ddfde5ef7 Mon Sep 17 00:00:00 2001 From: wlh <646507849@qq.com> Date: Sun, 4 Feb 2024 09:21:42 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AD=E5=BB=BA365-=E4=BA=8C=E6=9C=9F?= =?UTF-8?q?=E5=BC=80=E5=8F=91-=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/zj365/dc/activity/MainActivity.kt | 6 +++--- .../com/zj365/dc/fragment/DynamicManagementFrag.kt | 13 +++++++------ app/src/main/java/com/zj365/dc/fragment/MineFrag.kt | 6 +++--- app/src/main/java/com/zj365/dc/vm/HomeVm.kt | 2 +- app/src/main/java/com/zj365/dc/vm/MainVm.kt | 2 +- app/src/main/java/com/zj365/dc/vm/MessageVm.kt | 2 +- mine/src/main/java/com/zj365/mime/vm/SettingVm.kt | 2 +- 7 files changed, 17 insertions(+), 16 deletions(-) diff --git a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt index 5522b1c..de2b82c 100644 --- a/app/src/main/java/com/zj365/dc/activity/MainActivity.kt +++ b/app/src/main/java/com/zj365/dc/activity/MainActivity.kt @@ -490,19 +490,19 @@ class MainActivity : BaseVmAct(), Consumer { @Subscribe(threadMode = ThreadMode.MAIN) fun bindDevSuccess(event: BindDevEvent){ - mViewModel.getMySetting() + // mViewModel.getMySetting() mViewModel.getIsDemonstate() } @Subscribe(threadMode = ThreadMode.MAIN) fun refreshUI(event: MyInfoEvent){ - mViewModel.getMySetting() + // mViewModel.getMySetting() } @Subscribe(threadMode = ThreadMode.MAIN) fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){ - mViewModel.getMySetting() + // mViewModel.getMySetting() mViewModel.getIsDemonstate() } diff --git a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt index b93862b..5d20313 100644 --- a/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/DynamicManagementFrag.kt @@ -240,7 +240,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission override fun onResume() { super.onResume() - // mViewModel.getWarningMsg() + //mViewModel.getAllInfo() } //点击事件 @@ -475,7 +475,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } private fun request() { -// LogUtils.e("DynamicManagementFrag","请求数据拉") + LogUtils.e("DynamicManagementFrag","请求数据拉") mViewModel.getAllInfo(showIdInfo, false) // mViewModel.getMySetting() mViewModel.getTips() @@ -749,6 +749,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission //获取首页所有信息返回 mViewModel.allData.observe(this) { + LogUtils.e(TAG,"请求到数据拉") it.data?.let { bean -> if (bean.user.name.isNullOrEmpty()||bean.user.age.isNullOrEmpty()) { dialogInfoUn.show() @@ -1261,11 +1262,11 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission } fun cancelTimer(){ - LogUtils.e("DynamicManagementFrag","取消定时cancelTimer") + LogUtils.e(TAG,"取消定时cancelTimer") // getHealthInfoJob?.cancel() mDisposable?.let { if(!it.isDisposed){ - LogUtils.e("DynamicManagementFrag","取消定时") + LogUtils.e(TAG,"取消定时") it.dispose() } @@ -1577,7 +1578,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission @Subscribe(threadMode = ThreadMode.MAIN) fun loginOutChange(event: LoginOutEvent){ - LogUtils.e("DynamicManagementFrag","loginOutChange") + LogUtils.e(TAG,"loginOutChange") isJob = false cancelTimer() @@ -1590,7 +1591,7 @@ class DynamicManagementFrag : BaseVmFrag() , EasyPermission @Subscribe(threadMode = ThreadMode.MAIN) fun onLoginOrRegisterSuccess(event: LoginOrRegisterEvent){ -// LogUtils.e("DynamicManagementFrag","登录啦啦啦") + LogUtils.e(TAG,"登录啦啦啦") showIdInfo =if (MMkvHelper.getLong(Const.USER_ID).toString() == "0") { "" } else { diff --git a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt index 3dc513b..8b4ab1f 100644 --- a/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt +++ b/app/src/main/java/com/zj365/dc/fragment/MineFrag.kt @@ -480,7 +480,7 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ if (!TextUtils.isEmpty(showIdInfo)) { mViewModel.getMySetting() mViewModel.getUserOtherInfo() - mViewModel.getAllInfo(showIdInfo, false) + // mViewModel.getAllInfo(showIdInfo, false) mViewModel.searchInviteInfo() } } @@ -490,9 +490,9 @@ class MineFrag : BaseVmFrag() , EasyPermissions.PermissionCallbacks{ super.onResume() if (!TextUtils.isEmpty(showIdInfo)){ mViewModel.getMySetting() - mViewModel.getAllInfo(showIdInfo,false) + // mViewModel.getAllInfo(showIdInfo,false) mViewModel.searchInviteInfo() - mViewModel.getUserOtherInfo() + // mViewModel.getUserOtherInfo() } } diff --git a/app/src/main/java/com/zj365/dc/vm/HomeVm.kt b/app/src/main/java/com/zj365/dc/vm/HomeVm.kt index 6b048ed..c7d58bb 100644 --- a/app/src/main/java/com/zj365/dc/vm/HomeVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/HomeVm.kt @@ -81,7 +81,7 @@ class HomeVm: BaseVm() { } fun getHomeLayout(){ - startHttp { + startHttp (false){ var body= apiInterface().getHomeLayout() body.getCodeStatus(layoutLive,nowData) } diff --git a/app/src/main/java/com/zj365/dc/vm/MainVm.kt b/app/src/main/java/com/zj365/dc/vm/MainVm.kt index fccd296..bd93640 100644 --- a/app/src/main/java/com/zj365/dc/vm/MainVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/MainVm.kt @@ -192,7 +192,7 @@ class MainVm : BaseVm() { * 个人设置接口 */ fun getMySetting() { - startHttp { + startHttp(false) { val body = apiInterface().getMySetting() body.getCodeStatus(settingLive, nowData) } diff --git a/app/src/main/java/com/zj365/dc/vm/MessageVm.kt b/app/src/main/java/com/zj365/dc/vm/MessageVm.kt index 168469f..8bd1889 100644 --- a/app/src/main/java/com/zj365/dc/vm/MessageVm.kt +++ b/app/src/main/java/com/zj365/dc/vm/MessageVm.kt @@ -11,7 +11,7 @@ class MessageVm(): BaseVm() { val msgAllRead by lazy { MutableLiveData>() } fun getSystemMsg(){ - startHttp { + startHttp(false) { var response = apiInterface().getSystemMsg() response.getCodeStatus(msgData, nowData) } diff --git a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt index 86426c9..87e863a 100644 --- a/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt +++ b/mine/src/main/java/com/zj365/mime/vm/SettingVm.kt @@ -189,7 +189,7 @@ class SettingVm : BaseVm() { } fun getUserOtherInfo(){ - startHttp { + startHttp(false) { val response = apiInterface().getUserOtherInfo() response.getCodeStatus(useOtherInfoLiveData,nowData) }