From 98696640c3023e57ca9cc2e69fb49063f0392ffe Mon Sep 17 00:00:00 2001 From: chenglifeng Date: Sun, 29 Sep 2024 17:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=A1=B9=E7=9B=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E5=85=B6=E4=BB=96=E9=A1=B5=E9=9D=A2=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/project/survey/constants/Constants.kt | 1 + .../com/project/survey/logic/bean/HahaReq.kt | 7 ------- .../com/project/survey/ui/home/HomeFragment.kt | 12 +++++++++++- .../project/survey/ui/home/InstrumentFragment.kt | 10 ++++++++++ .../com/project/survey/ui/home/MeFragment.kt | 16 ++++++++++++---- .../survey/ui/project/ProjectListActivity.kt | 3 +++ app/src/main/res/layout/fragment_me.xml | 13 +++++++------ 7 files changed, 44 insertions(+), 18 deletions(-) delete mode 100644 app/src/main/java/com/project/survey/logic/bean/HahaReq.kt diff --git a/app/src/main/java/com/project/survey/constants/Constants.kt b/app/src/main/java/com/project/survey/constants/Constants.kt index 494cd29..2f4352f 100644 --- a/app/src/main/java/com/project/survey/constants/Constants.kt +++ b/app/src/main/java/com/project/survey/constants/Constants.kt @@ -19,4 +19,5 @@ object SPConstants { object EventConstants { const val LOGIN_STATUS = "loginStatus" + const val UPDATE_PROJECT = "updateProject" } \ No newline at end of file diff --git a/app/src/main/java/com/project/survey/logic/bean/HahaReq.kt b/app/src/main/java/com/project/survey/logic/bean/HahaReq.kt deleted file mode 100644 index 6b8acc8..0000000 --- a/app/src/main/java/com/project/survey/logic/bean/HahaReq.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.project.survey.logic.bean - -data class HahaReq( - val type: String, - val userName: String? = null, - val page: Int = 1 -) diff --git a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt index d688f89..fa609d2 100644 --- a/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/HomeFragment.kt @@ -3,6 +3,7 @@ package com.project.survey.ui.home import android.view.LayoutInflater import android.view.ViewGroup import androidx.fragment.app.viewModels +import com.project.survey.constants.EventConstants import com.project.survey.constants.SPConstants import com.project.survey.databinding.FragmentHomeBinding import com.project.survey.extend.setOnClickNoRepeatListener @@ -31,10 +32,19 @@ class HomeFragment : BaseBindingFragment() { } override fun initData() { + viewModel.msgEvent.observe(this) { + if (it.msg == EventConstants.UPDATE_PROJECT) { + updateViewByData() + } + } + updateViewByData() +// mBinding.itemToBeProcessed.setBadge(4) + } + + private fun updateViewByData() { val currentProject = SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) mBinding.tvProject.text = currentProject?.XMXX_NAME -// mBinding.itemToBeProcessed.setBadge(4) } override fun initListener() { diff --git a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt index ac2c2f9..f30e625 100644 --- a/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/InstrumentFragment.kt @@ -13,6 +13,7 @@ import com.bingce.device.ui.ConnectTSActivity import com.bingce.rtk.command.RTK import com.bingce.rtk.config.GnssConfigManager import com.project.survey.R +import com.project.survey.constants.EventConstants import com.project.survey.constants.SPConstants import com.project.survey.databinding.FragmentInstrumentBinding import com.project.survey.extend.setOnClickNoRepeatListener @@ -46,6 +47,15 @@ class InstrumentFragment : BaseBindingFragment() { } override fun initData() { + viewModel.msgEvent.observe(this) { + if (it.msg == EventConstants.UPDATE_PROJECT) { + updateViewByData() + } + } + updateViewByData() + } + + private fun updateViewByData() { val currentProject = SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) mBinding.tvProject.text = currentProject?.XMXX_NAME diff --git a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt index 253e158..5342a64 100644 --- a/app/src/main/java/com/project/survey/ui/home/MeFragment.kt +++ b/app/src/main/java/com/project/survey/ui/home/MeFragment.kt @@ -38,13 +38,21 @@ class MeFragment : BaseBindingFragment() { } override fun initData() { + viewModel.msgEvent.observe(this) { + if (it.msg == EventConstants.UPDATE_PROJECT) { + updateViewByData() + } + } + mBinding.tvName.text = SPUtils.getString(SPConstants.ACCOUNT) + mBinding.tvVersion.text = BuildConfig.VERSION_NAME + + updateViewByData() + } + + private fun updateViewByData() { val currentProject = SPUtils.getParcelable(SPConstants.CURRENT_PROJECT, ProjectBean::class.java) mBinding.tvProject.text = currentProject?.XMXX_NAME - mBinding.tvName.text = SPUtils.getString(SPConstants.ACCOUNT) - if (BuildConfig.DEBUG) { - mBinding.tvVersion.text = BuildConfig.VERSION_NAME - } } override fun initListener() { diff --git a/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt b/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt index e9cc03f..9c625d1 100644 --- a/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/project/ProjectListActivity.kt @@ -5,10 +5,12 @@ import android.view.MenuItem import androidx.activity.viewModels import com.afollestad.materialdialogs.MaterialDialog import com.project.survey.R +import com.project.survey.constants.EventConstants import com.project.survey.constants.SPConstants import com.project.survey.databinding.ActivityProjectListBinding import com.project.survey.extend.smartDismiss import com.project.survey.extend.toast +import com.project.survey.logic.event.Message import com.project.survey.logic.viewmodel.ProjectViewModel import com.project.survey.model.LoginBean import com.project.survey.ui.MainActivity @@ -84,6 +86,7 @@ class ProjectListActivity : BaseBindingActivity(), O adapter.getItem(position)?.let { bean -> // 进入项目，设置当前项目 SPUtils.put(SPConstants.CURRENT_PROJECT, bean) + viewModel.msgEvent.postValue(Message(EventConstants.UPDATE_PROJECT)) MainActivity.start() ActivityNavUtil.finishActivity() } diff --git a/app/src/main/res/layout/fragment_me.xml b/app/src/main/res/layout/fragment_me.xml index e2548fd..79feb87 100644 --- a/app/src/main/res/layout/fragment_me.xml +++ b/app/src/main/res/layout/fragment_me.xml @@ -130,6 +130,13 @@ android:textSize="@dimen/sw_15sp" app:drawableStartCompat="@drawable/about" /> + + - - \ No newline at end of file