diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 4d81d07..66bd2e6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -35,6 +35,7 @@ private val timer = object : Timer() {} private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel + private lateinit var noticeViewModel: NoticeViewModel private lateinit var userData: UserInfoModel.DataModel private var currentIndex = 0 private val qrManager by lazy { @@ -69,8 +70,7 @@ } } - val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.getNoticeList("", "", "", "", "", 1) + noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val data = it.data @@ -135,6 +135,11 @@ }) } + override fun onResume() { + super.onResume() + noticeViewModel.getNoticeList("", "", "", "", "", 1) + } + override fun initEvent() { scanCodeView.setOnClickListener { qrManager.startScan(requireActivity()) { result -> diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index 4d81d07..66bd2e6 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -35,6 +35,7 @@ private val timer = object : Timer() {} private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel + private lateinit var noticeViewModel: NoticeViewModel private lateinit var userData: UserInfoModel.DataModel private var currentIndex = 0 private val qrManager by lazy { @@ -69,8 +70,7 @@ } } - val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.getNoticeList("", "", "", "", "", 1) + noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val data = it.data @@ -135,6 +135,11 @@ }) } + override fun onResume() { + super.onResume() + noticeViewModel.getNoticeList("", "", "", "", "", 1) + } + override fun initEvent() { scanCodeView.setOnClickListener { qrManager.startScan(requireActivity()) { result -> diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 65145ce..4174e94 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -19,6 +19,8 @@ class MinePageFragment : KotlinBaseFragment() { + private lateinit var noticeViewModel: NoticeViewModel + override fun initData() { val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] @@ -45,8 +47,7 @@ } } - val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.getNoticeList("", "", "", "", "", 1) + noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val data = it.data @@ -72,6 +73,11 @@ } } + override fun onResume() { + super.onResume() + noticeViewModel.getNoticeList("", "", "", "", "", 1) + } + override fun initEvent() { noticeLayout.setOnClickListener { requireContext().navigatePageTo()