Przeglądaj źródła

feat: 默认都会进到JoinUs引导页面

DoggyZhang 2 miesięcy temu
rodzic
commit
f4206ca900

+ 0 - 1
app/src/main/java/com/adealink/weparty/ui/category/CategoryFragment.kt

@@ -246,7 +246,6 @@ class CategoryFragment : BaseFragment(R.layout.fragment_category) {
                 Router.build(act, JoinUs.ApplySKill.PATH)
                     .putExtra(JoinUs.ApplySKill.EXTRA_CATEGORY, item.data)
                     .start()
-                activity?.finish()
             }
         }
     }

+ 10 - 14
module/joinus/src/main/java/com/adealink/weparty/joinus/JoinUsInterceptor.kt

@@ -32,6 +32,16 @@ class JoinUsInterceptor : UriInterceptor {
             return
         }
         CoroutineScope(Dispatcher.UI).launch {
+            val skipGuide = request.intent.getBooleanExtra(JoinUs.JoinUs.EXTRA_SKIP_GUIDE, false)
+            //进入引导
+            if (!skipGuide) {
+                Router.build(activity, Web.FullScreen.PATH)
+                    .putExtra(Web.Common.EXTRA_URL, UrlConfig.playmateApply)
+                    .start()
+                chain.abort()
+                return@launch
+            }
+
             (activity as? BaseActivity)?.showLoading()
             val rlt = joinUsHttpService.loadJoinUsProgress()
             (activity as? BaseActivity)?.dismissLoading()
@@ -40,21 +50,7 @@ class JoinUsInterceptor : UriInterceptor {
                 chain.abort()
                 return@launch
             }
-
             val joinProgressData = (rlt as Rlt.Success).data.data
-
-            val skipGuide = request.intent.getBooleanExtra(JoinUs.JoinUs.EXTRA_SKIP_GUIDE, false)
-            //进入引导
-            if (!skipGuide) {
-                if (joinProgressData == null || joinProgressData.getCurrentStep() == null) {
-                    Router.build(activity, Web.FullScreen.PATH)
-                        .putExtra(Web.Common.EXTRA_URL, UrlConfig.playmateApply)
-                        .start()
-                    chain.abort()
-                    return@launch
-                }
-            }
-
             //进入申请流程
             request.intent.putExtra(JoinUs.Common.EXTRA_JOIN_US, joinProgressData)
             chain.proceed(request)