From 4085fe2d14eb13e946b2822c99826e3fb82f32c1 Mon Sep 17 00:00:00 2001 From: wangyu Date: Wed, 25 Feb 2026 18:11:57 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=A6=96=E9=A1=B5=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=8A=9F=E8=83=BD=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=BC=95?= =?UTF-8?q?=E5=AF=BC=E9=A1=B5=E8=BF=9B=E5=85=A5=E9=BB=98=E8=AE=A4=E9=A1=B5?= =?UTF-8?q?=E4=B8=BA=E6=8E=A8=E9=80=81=E9=A1=B5=EF=BC=8C2.7.2/272?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ++-- .../main/java/com/cheng/blzb/bean/MenuEntity.kt | 8 ++++---- .../java/com/cheng/blzb/event/PayStatusEvent.kt | 2 +- .../com/cheng/blzb/ui/activity/MainActivity.kt | 7 ++++++- .../ui/fragment/guide/vip/GuideVipFragment.kt | 4 ++-- .../cheng/blzb/ui/fragment/main/MainFragment.kt | 5 +++++ .../cheng/blzb/ui/fragment/main/MainViewModel.kt | 15 ++++++++++++++- .../java/com/cheng/blzb/utils/pay/PayUtils.kt | 2 +- 8 files changed, 35 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 44a30d5..35af05c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -20,8 +20,8 @@ android { applicationId "com.cheng.BoLe" minSdk 26 targetSdk 34 - versionCode 271 - versionName "2.7.1" + versionCode 272 + versionName "2.7.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { diff --git a/app/src/main/java/com/cheng/blzb/bean/MenuEntity.kt b/app/src/main/java/com/cheng/blzb/bean/MenuEntity.kt index 333eadd..6b1f69e 100644 --- a/app/src/main/java/com/cheng/blzb/bean/MenuEntity.kt +++ b/app/src/main/java/com/cheng/blzb/bean/MenuEntity.kt @@ -12,10 +12,10 @@ data class MenuEntity( companion object { fun getHomeMenu(): List { val list = mutableListOf() - list.add(MenuEntity("dljz", R.mipmap.ic_home_icon1, "代理记账")) - list.add(MenuEntity("qyzc", R.mipmap.ic_home_icon2, "企业注册")) - list.add(MenuEntity("bszz", R.mipmap.ic_home_icon3, "标书制作")) - list.add(MenuEntity("zzdb", R.mipmap.ic_home_icon4, "资质代办")) +// list.add(MenuEntity("dljz", R.mipmap.ic_home_icon1, "代理记账")) +// list.add(MenuEntity("qyzc", R.mipmap.ic_home_icon2, "企业注册")) +// list.add(MenuEntity("bszz", R.mipmap.ic_home_icon3, "标书制作")) +// list.add(MenuEntity("zzdb", R.mipmap.ic_home_icon4, "资质代办")) UserConfigManager.getBidTypes().forEach { when(it.name) { "招标公告" -> list.add(MenuEntity(it.id, R.mipmap.ic_home_icon5, it.name)) diff --git a/app/src/main/java/com/cheng/blzb/event/PayStatusEvent.kt b/app/src/main/java/com/cheng/blzb/event/PayStatusEvent.kt index 949d4f7..e66a796 100644 --- a/app/src/main/java/com/cheng/blzb/event/PayStatusEvent.kt +++ b/app/src/main/java/com/cheng/blzb/event/PayStatusEvent.kt @@ -1,3 +1,3 @@ package com.cheng.blzb.event -class PayStatusEvent(var payStatus: PayStatusEnum, var message: String? = "") \ No newline at end of file +class PayStatusEvent(var payStatus: PayStatusEnum, var message: String = "") \ No newline at end of file diff --git a/app/src/main/java/com/cheng/blzb/ui/activity/MainActivity.kt b/app/src/main/java/com/cheng/blzb/ui/activity/MainActivity.kt index 3588c50..9026e6c 100644 --- a/app/src/main/java/com/cheng/blzb/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/cheng/blzb/ui/activity/MainActivity.kt @@ -7,6 +7,7 @@ import android.text.TextUtils import android.window.OnBackInvokedDispatcher import androidx.activity.addCallback import androidx.core.os.BuildCompat +import androidx.fragment.app.Fragment import com.cheng.blzb.R import com.cheng.blzb.common.EventConstants import com.cheng.blzb.event.LogoutSuccessEvent @@ -23,7 +24,11 @@ class MainActivity : BaseActivity() { private var lastBackClickTime = 0L - override fun getFragment() = MainFragment() + override fun getFragment(): Fragment { + val fragment = MainFragment() + fragment.arguments = intent.extras + return fragment + } override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/guide/vip/GuideVipFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/guide/vip/GuideVipFragment.kt index 0b39560..a4a85ea 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/guide/vip/GuideVipFragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/guide/vip/GuideVipFragment.kt @@ -782,11 +782,11 @@ class GuideVipFragment: BaseFragment private fun setBackPressed() { if (BuildCompat.isAtLeastT()) { requireActivity().onBackInvokedDispatcher.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT) { - requireActivity().startActivity() + requireActivity().startActivity(Pair("origin", "bootpage")) } } else { requireActivity().onBackPressedDispatcher.addCallback(this) { - requireActivity().startActivity() + requireActivity().startActivity(Pair("origin", "bootpage")) } } } diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainFragment.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainFragment.kt index 95973b9..f1831cc 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainFragment.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainFragment.kt @@ -38,6 +38,7 @@ import com.huantansheng.easyphotos.EasyPhotos class MainFragment : BaseFragment() { + private val origin by lazy { arguments?.getString("origin") ?: "" } private val tabText = listOf("首页", "推送", "合作商", "我的") private val fragmentList by lazy { mutableListOf() } private val pageAdapter by lazy { BasePageAdapter(childFragmentManager, tabText, fragmentList, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) } @@ -101,6 +102,10 @@ class MainFragment : BaseFragment() { override fun initData() { super.initData() + if (origin == "bootpage") { + binding.rbPush.isChecked = true + } + UserConfigManager.userConfig { checkVersion() } diff --git a/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainViewModel.kt b/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainViewModel.kt index 82d94e3..44521c6 100644 --- a/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainViewModel.kt +++ b/app/src/main/java/com/cheng/blzb/ui/fragment/main/MainViewModel.kt @@ -2,6 +2,7 @@ package com.cheng.blzb.ui.fragment.main import androidx.lifecycle.MutableLiveData import com.cheng.blzb.bean.AreaEntity +import com.cheng.blzb.bean.UserAuthEntity import com.cheng.blzb.bean.UserEntity import com.cheng.blzb.net.ApiFactory import com.example.base.extensions.toast @@ -12,9 +13,9 @@ import okhttp3.RequestBody.Companion.toRequestBody class MainViewModel : BaseViewModel() { val userInfoLiveData = MutableLiveData() - val areaLiveData = MutableLiveData>() val getCouponLiveData = MutableLiveData() + val authLiveData = MutableLiveData() fun userInfo() { launchOnUiTryCatch({ @@ -78,4 +79,16 @@ class MainViewModel : BaseViewModel() { L.d(it) }) } + + fun checkAuth() { + launchOnUiTryCatch({ + val response = ApiFactory.apiService.checkAuth() + if (response.status) { + authLiveData.postValue(response.data) + } else toast(response.message, true) + }, { + setError(it) + L.d(it) + }) + } } \ No newline at end of file diff --git a/app/src/main/java/com/cheng/blzb/utils/pay/PayUtils.kt b/app/src/main/java/com/cheng/blzb/utils/pay/PayUtils.kt index 42a85a2..98d1254 100644 --- a/app/src/main/java/com/cheng/blzb/utils/pay/PayUtils.kt +++ b/app/src/main/java/com/cheng/blzb/utils/pay/PayUtils.kt @@ -120,7 +120,7 @@ object PayUtils { else -> { // 该笔订单真实的支付结果，需要依赖服务端的异步通知。 L.d("resultStatus=${resultStatus}") - RxBus.defaultInstance.post(PayStatusEvent(PayStatusEnum.PAY_ERROR, resultInfo)) + RxBus.defaultInstance.post(PayStatusEvent(PayStatusEnum.PAY_ERROR, resultInfo ?: "")) } } }