修改选择优惠券和订单列表的路由

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

@@ -174,8 +174,5 @@ class XRouterPathConstants {
 
     // C端设置页
     const val C_SETTING = "/SettingActivity"
-
-    const val ORDER_LIST = "/b/order/order_list"
-    const val VONCHER_LIST = "/b/order/voncher_list"
   }
 }

Components/BUserOrder/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
         <activity android:name="com.yidian.shenghuoquan.border.ui.OrderDetailActivity" />
         <activity android:name="com.yidian.shenghuoquan.border.ui.SelectPickupPointActivity" />
         <activity android:name=".ui.OrderListActivity"/>
-        <activity android:name=".ui.VoncherActivity"/>
+        <activity android:name=".ui.VoucherActivity"/>
     </application>
 
 </manifest>
\ No newline at end of file

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/app/ClassMapUtil.kt

@@ -13,8 +13,8 @@ object ClassMapUtil {
     XRouterPathConstants.Companion.CONFIRM_ORDER_ACTIVITY to ConfirmOrderActivity::class.java, // 确认订单
     XRouterPathConstants.Companion.ORDER_DETAIL_ACTIVITY to OrderDetailActivity::class.java, // 订单详情
     XRouterPathConstants.Companion.PICKUP_POINT_ACTIVITY to SelectPickupPointActivity::class.java, // 选择自提点
-    XRouterPathConstants.Companion.ORDER_LIST to OrderListActivity::class.java, // 订单列表
-    XRouterPathConstants.Companion.VONCHER_LIST to VoncherActivity::class.java, // 优惠券列表
+    XRouterPathConstants.Companion.ORDER_LIST_ACTIVITY to OrderListActivity::class.java, // 订单列表
+    XRouterPathConstants.Companion.CHOOSE_VOUCHER_ACTIVITY to VoucherActivity::class.java, // 优惠券列表
   )
 
 }

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/ui/OrderListActivity.kt

@@ -71,6 +71,6 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
   }
 
   override fun getXPageName(): String {
-    return XRouterPathConstants.ORDER_LIST
+    return XRouterPathConstants.ORDER_LIST_ACTIVITY
   }
 }

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/ui/VoncherActivity.kt → Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/ui/VoucherActivity.kt

@@ -2,7 +2,7 @@ package com.yidian.shenghuoquan.border.ui
 
 import androidx.activity.viewModels
 import com.google.gson.Gson
-import com.yidian.bcommon.constant.XRouterPathConstants.Companion.VONCHER_LIST
+import com.yidian.bcommon.constant.XRouterPathConstants.Companion.CHOOSE_VOUCHER_ACTIVITY
 import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.news.ui.SystemBarUtils
@@ -14,8 +14,9 @@ import com.yidian.shenghuoquan.border.viewmodel.VoncherViewModel
 import com.yidian.shenghuoquan.border.databinding.BorderActivityVoncherBinding
 import com.yidian.xpage.XPageViewProtocol
 
-class VoncherActivity : BaseMvvmActivity<BorderActivityVoncherBinding, VoncherViewModel>(), XPageViewProtocol{
-  override val layoutId: Int =  R.layout.border_activity_voncher
+class VoucherActivity : BaseMvvmActivity<BorderActivityVoncherBinding, VoncherViewModel>(), XPageViewProtocol {
+
+  override val layoutId: Int = R.layout.border_activity_voncher
 
   override val vm: VoncherViewModel by viewModels()
 
@@ -29,15 +30,14 @@ class VoncherActivity : BaseMvvmActivity<BorderActivityVoncherBinding, VoncherVi
   }
 
   override fun getXPageName(): String {
-    return VONCHER_LIST
+    return CHOOSE_VOUCHER_ACTIVITY
   }
 
   private fun initRecycleView() {
     val spacingInPixels = resources.getDimensionPixelSize(R.dimen.dp10)
     binding.rcvVoncherList.addItemDecoration(SpaceItemDecoration(spacingInPixels))
-    var gson = Gson()
-    var voncherObj = gson.fromJson<CounponDto>(HardCode.VoncherList, CounponDto::class.java)
-    listAdapter = VoncherAdapter(this, voncherObj.coupon_list)
+    val voucherObj = Gson().fromJson<CounponDto>(HardCode.VoncherList, CounponDto::class.java)
+    listAdapter = VoncherAdapter(this, voucherObj.coupon_list)
     binding.rcvVoncherList.adapter = listAdapter
   }
 }

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/utils/PageMapUtils.kt

-package com.yidian.shenghuoquan.border.utils
-
-import com.yidian.bcommon.constant.XRouterPathConstants
-import com.yidian.shenghuoquan.border.ui.OrderListActivity
-import com.yidian.shenghuoquan.border.ui.VoncherActivity
-
-object PageMapUtils {
-  val xPageNodeMap = mapOf(
-    XRouterPathConstants.Companion.ORDER_LIST to OrderListActivity::class.java,// 订单列表
-    XRouterPathConstants.Companion.VONCHER_LIST to VoncherActivity::class.java// 订单列表
-  )
-}