修改订单相关页面路由地址，webView根据加载页面不同动态设置顶部导航UI

CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/XBirdPageConstants.kt

@@ -9,8 +9,12 @@ class XBirdPageConstants {
   companion object {
     // webView加载的页面url
     const val PAGE_URL = "page_url"
-    // 商品  -  发布商品地址，需要和config.json中的name一致
+    // 商品 - 发布商品地址，需要和config.json中的name一致
     const val COMMODITY_PUBLISH_COMMODITY = "xbrid_b_coupon_publish"
+    // 拼单 - 首页
+    const val FIGHT_ORDER_HOME_PAGE = "/b/group-meal-home"
+    // 拼单 - 活动详情
+    const val FIGHT_ORDER_EVENT_DETAILS = "/b/group-meal-detail"
   }
 }
 

CommonLib/BCommon/src/main/java/com/yidian/bcommon/constant/XRouterPathConstants.kt

@@ -146,22 +146,22 @@ class XRouterPathConstants {
     const val COMMODITY_MANAGEMENT = "/b/goods/commodity_management"
 
     /**
-     * BOrder组件内的页面
+     * BUserOrder组件内的页面
      */
     // 订单 — 确认订单
-    const val CONFIRM_ORDER_ACTIVITY = "/b/order/confirm_order"
+    const val CONFIRM_ORDER_ACTIVITY = "/b/user_order/confirm_order"
 
     // 订单 — 选择自提点
-    const val PICKUP_POINT_ACTIVITY = "/b/order/pick_up_point"
+    const val PICKUP_POINT_ACTIVITY = "/b/user_order/pick_up_point"
 
     // 订单 — 选择代金券
-    const val CHOOSE_VOUCHER_ACTIVITY = "/b/order/choose_voucher"
+    const val CHOOSE_VOUCHER_ACTIVITY = "/b/user_order/choose_voucher"
 
     // 订单 — 订单详情
-    const val ORDER_DETAIL_ACTIVITY = "/b/order/order_detail"
+    const val ORDER_DETAIL_ACTIVITY = "/b/user_order/order_detail"
 
     // 订单 — 订单列表
-    const val ORDER_LIST_ACTIVITY = "/b/order/order_list"
+    const val ORDER_LIST_ACTIVITY = "/b/user_order/order_list"
 
     /**
      * C端页面

Components/BDemo/src/main/res/layout/activity_demo_test.xml

@@ -22,6 +22,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="确认订单"
+        android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/ui/ConfirmOrderActivity.kt

@@ -38,6 +38,7 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
   override val vm: ConfirmOrderViewModel by viewModels()
 
   override fun initView() {
+    ToastUtils.showShortSafe("进入确认订单了")
     XEventManager.register(this)
     subscribeUiEvent()
     initList()
@@ -52,22 +53,27 @@ class ConfirmOrderActivity : BaseMvvmActivity<BorderActivityConfirmOrderBinding,
     val params = intent?.getSerializableExtra(XRouterPathConstants.ParamsKey)
     if (params != null) {
       // 注意接收h5传过来的JSONObject
-      params as HashMap<String, Any?>
-//      params["自定义一个共用的key"] as JSONObject
+//      params as HashMap<String, Any?>
+      params as JSONObject
+
       // TODO 修改为h5传递的参数
-      parsingParameters()
+      parsingParameters(params)
     }
   }
 
-  private fun parsingParameters() {
-    // 解析本地json数据
-    val jsonStr = JsonUtils.file2JsonStr(this, "order.json")
-    jsonStr?.let {
-      val jsonObject = JSONObject(it)
-      Timber.tag("确认订单").e("订单请求参数JSON：${jsonObject}")
-      marketingId = jsonObject.optInt("marketing_id").toString()
-      requestConfirmOrder(jsonObject)
-    }
+  private fun parsingParameters(jsonObject: JSONObject) {
+//    // 解析本地json数据
+//    val jsonStr = JsonUtils.file2JsonStr(this, "order.json")
+//    jsonStr?.let {
+//      val jsonObject = JSONObject(it)
+//      Timber.tag("确认订单").e("订单请求参数JSON：${jsonObject}")
+//      marketingId = jsonObject.optInt("marketing_id").toString()
+//      requestConfirmOrder(jsonObject)
+//    }
+
+    Timber.tag("确认订单").e("订单请求参数JSON：${jsonObject}")
+    marketingId = jsonObject.optInt("marketing_id").toString()
+    requestConfirmOrder(jsonObject)
   }
 
   /**

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/ui/HardCode.kt

-package com.yidian.shenghuoquan.buserorder.ui
-
-object HardCode {
-  const val VoncherList = "{" +
-    "    \"coupon_list\":[" +
-    "    {" +
-    "        \"id\": \"02A9NOTyZjKT5F\"," +
-    "        \"coupon_id\": \"02A9NOTyZjKT5F\"," +
-    "        \"coupon_amount\": 300," +
-    "        \"amount\": \"3.00\"," +
-    "        \"start_time\": \"2021.08.25 10:03\"," +
-    "        \"end_time\": \"2021.09.01 10:03\"," +
-    "        \"status\": 1," +
-    "        \"name\": \"新用户无门槛代金券\"," +
-    "        \"desc\": \"仅限生活圈午餐使用\"," +
-    "        \"thumbnail\": \"\"," +
-    "        \"jump_url\": \"\"," +
-    "        \"type\": 1," +
-    "        \"use_shop_type\": 0," +
-    "        \"use_activity_type\": 0," +
-    "        \"use_amount_type\": 0," +
-    "        \"use_amount_min\": 0" +
-    "    }," +
-    "    {" +
-    "        \"id\": \"02A9NOTyZjKT5F\"," +
-    "        \"coupon_id\": \"02A9NOTyZjKT5F\"," +
-    "        \"coupon_amount\": 300," +
-    "        \"amount\": \"3.00\"," +
-    "        \"start_time\": \"2021.08.25 10:03\"," +
-    "        \"end_time\": \"2021.09.01 10:03\"," +
-    "        \"status\": 1," +
-    "        \"name\": \"新用户无门槛代金券1\"," +
-    "        \"desc\": \"仅限生活圈午餐使用1\"," +
-    "        \"thumbnail\": \"\"," +
-    "        \"jump_url\": \"\"," +
-    "        \"type\": 1," +
-    "        \"use_shop_type\": 0," +
-    "        \"use_activity_type\": 0," +
-    "        \"use_amount_type\": 0," +
-    "        \"use_amount_min\": 0" +
-    "    }," +
-    "    {" +
-    "        \"id\": \"02A9NOTyZjKT5F\"," +
-    "        \"coupon_id\": \"02A9NOTyZjKT5F\"," +
-    "        \"coupon_amount\": 300," +
-    "        \"amount\": \"3.00\"," +
-    "        \"start_time\": \"2021.08.25 10:03\"," +
-    "        \"end_time\": \"2021.09.01 10:03\"," +
-    "        \"status\": 1," +
-    "        \"name\": \"新用户无门槛代金券2\"," +
-    "        \"desc\": \"仅限生活圈午餐使用2\"," +
-    "        \"thumbnail\": \"\"," +
-    "        \"jump_url\": \"\"," +
-    "        \"type\": 1," +
-    "        \"use_shop_type\": 0," +
-    "        \"use_activity_type\": 0," +
-    "        \"use_amount_type\": 0," +
-    "        \"use_amount_min\": 0" +
-    "    }" +
-    "]" +
-    "}"
-}

Components/BXBridBusiness/src/main/java/com/yidian/shenghuoquan/bxbirdbusiness/ui/CommonWebViewActivity.kt

@@ -4,10 +4,12 @@ import android.content.Intent
 import android.webkit.WebChromeClient
 import android.webkit.WebView
 import androidx.activity.viewModels
+import androidx.core.content.ContextCompat
 import com.pingplusplus.android.Pingpp
 import com.pingplusplus.android.Pingpp.REQUEST_CODE_PAYMENT
 import com.yidian.bcommon.constant.XBirdPageConstants
 import com.yidian.bcommon.constant.XRouterPathConstants
+import com.yidian.bcommon.extensions.setBgColor
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.bcommon.utils.ToastUtils
 import com.yidian.bcommon.widget.CommonHintDialog
@@ -84,6 +86,18 @@ class CommonWebViewActivity : BaseMvvmActivity<XbridActivityCommonWebViewBinding
   }
 
   private fun initPageTitle(title: String) {
+    when (getCurrentPageName()) {
+      XBirdPageConstants.FIGHT_ORDER_HOME_PAGE -> {
+        binding.commonTopBar.setTitleTextColor(ContextCompat.getColor(this, R.color.white))
+        binding.commonTopBar.setBackImageResource(R.drawable.icon_back_white)
+        binding.commonTopBar.setBgColor(R.color.color_FD7823)
+      }
+      else -> {
+        binding.commonTopBar.setTitleTextColor(ContextCompat.getColor(this, R.color.color_333333))
+        binding.commonTopBar.setBackImageResource(R.drawable.icon_back)
+        binding.commonTopBar.setBgColor(R.color.transparent)
+      }
+    }
     binding.commonTopBar.setTitle(title)
   }
 
@@ -95,7 +109,7 @@ class CommonWebViewActivity : BaseMvvmActivity<XbridActivityCommonWebViewBinding
   }
 
   override fun onBackPressed() {
-    when (XBridManager.getXBridPageName(url)) {
+    when (getCurrentPageName()) {
       XBirdPageConstants.COMMODITY_PUBLISH_COMMODITY -> {
         CommonHintDialog(this, "返回后，商品信息不会保存", arrayListOf("取消", "返回"), object : CommonHintDialog.OnHintOptionCallback {
           override fun onLeftOption() {
@@ -114,6 +128,13 @@ class CommonWebViewActivity : BaseMvvmActivity<XbridActivityCommonWebViewBinding
     }
   }
 
+  /**
+   * 获取当前加载页面的名称
+   */
+  private fun getCurrentPageName(): String? {
+    return XBridManager.getXBridPageName(url)
+  }
+
   companion object {
     var resolver: ResultResolver? = null
     val context by lazy { this }

Components/BXBridBusiness/src/main/res/values/colors.xml

@@ -7,4 +7,6 @@
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="color_FD7823">#FD7823</color>
+
 </resources>
\ No newline at end of file