隐藏首页部分功能，修改引导页进入默认页为推送页，2.7.2/272

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 {

app/src/main/java/com/cheng/blzb/bean/MenuEntity.kt

@@ -12,10 +12,10 @@ data class MenuEntity(
     companion object {
         fun getHomeMenu(): List<MenuEntity> {
             val list = mutableListOf<MenuEntity>()
-            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))

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? = "")
+class PayStatusEvent(var payStatus: PayStatusEnum, var message: String = "")

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)

app/src/main/java/com/cheng/blzb/ui/fragment/guide/vip/GuideVipFragment.kt

@@ -782,11 +782,11 @@ class GuideVipFragment: BaseFragment<FragmentGuideVipBinding, GuideVipViewModel>
     private fun setBackPressed() {
         if (BuildCompat.isAtLeastT()) {
             requireActivity().onBackInvokedDispatcher.registerOnBackInvokedCallback(OnBackInvokedDispatcher.PRIORITY_DEFAULT) {
-                requireActivity().startActivity<MainActivity>()
+                requireActivity().startActivity<MainActivity>(Pair("origin", "bootpage"))
             }
         } else {
             requireActivity().onBackPressedDispatcher.addCallback(this) {
-                requireActivity().startActivity<MainActivity>()
+                requireActivity().startActivity<MainActivity>(Pair("origin", "bootpage"))
             }
         }
     }

app/src/main/java/com/cheng/blzb/ui/fragment/main/MainFragment.kt

@@ -38,6 +38,7 @@ import com.huantansheng.easyphotos.EasyPhotos
 
 
 class MainFragment : BaseFragment<FragmentMainBinding, MainViewModel>() {
+    private val origin by lazy { arguments?.getString("origin") ?: "" }
     private val tabText = listOf("首页", "推送", "合作商", "我的")
     private val fragmentList by lazy { mutableListOf<Fragment>() }
     private val pageAdapter by lazy { BasePageAdapter(childFragmentManager, tabText, fragmentList, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT) }
@@ -101,6 +102,10 @@ class MainFragment : BaseFragment<FragmentMainBinding, MainViewModel>() {
 
     override fun initData() {
         super.initData()
+        if (origin == "bootpage") {
+            binding.rbPush.isChecked = true
+        }
+
         UserConfigManager.userConfig {
             checkVersion()
         }

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<UserEntity>()
-
     val areaLiveData = MutableLiveData<List<AreaEntity>>()
     val getCouponLiveData = MutableLiveData<Int>()
+    val authLiveData = MutableLiveData<UserAuthEntity>()
 
     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)
+        })
+    }
 }

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 ?: ""))
                         }
                     }
                 }