修改错误的package

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

@@ -10,7 +10,7 @@ class XBirdPageConstants {
     // webView加载的页面url
     const val PAGE_URL = "page_url"
     // 商品  -  发布商品地址，需要和config.json中的name一致
-    const val COMMODITY_PUBLISH_COMMODITY = "xbrid_coupon_publish"
+    const val COMMODITY_PUBLISH_COMMODITY = "xbrid_b_coupon_publish"
   }
 }
 

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/adapter/VoncherAdapter.kt

-package com.yidian.shenghuoquan.border.app.adapter
+package com.yidian.shenghuoquan.border.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -7,9 +7,9 @@ import android.view.ViewGroup
 import android.widget.TextView
 import androidx.recyclerview.widget.RecyclerView
 import com.yidian.shenghuoquan.border.R
-import com.yidian.shenghuoquan.border.app.bean.Coupon
+import com.yidian.shenghuoquan.border.dto.Coupon1
 
-class VoncherAdapter(var context: Context, var voncherList:List<Coupon>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+class VoncherAdapter(var context: Context, var voncherList:List<Coupon1>) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
   override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
     var view: View = LayoutInflater.from(context).inflate(R.layout.border_voncher_item, parent, false)
     var holder = MyViewHoder(view)
@@ -28,7 +28,7 @@ class VoncherAdapter(var context: Context, var voncherList:List<Coupon>) : Recyc
 
   }
 
-  private fun mapDataToHoder(data: Coupon, holder: MyViewHoder, position: Int) {
+  private fun mapDataToHoder(data: Coupon1, holder: MyViewHoder, position: Int) {
     holder.itemView.findViewById<TextView>(R.id.tv_voncher_name).text = data.name
     holder.itemView.findViewById<TextView>(R.id.tv_voncher_amount).text = data.coupon_amount.toString()
     holder.itemView.findViewById<TextView>(R.id.tv_start_end_time).text = "${data.start_time} ${data.end_time}"

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/dto/CounponDto.kt

-package com.yidian.shenghuoquan.border.app.bean
+package com.yidian.shenghuoquan.border.dto
 
 import android.os.Parcelable
 import com.google.gson.annotations.SerializedName
 import kotlinx.parcelize.Parcelize
 
 data class CounponDto(
-    val coupon_list: List<Coupon>
+    val coupon_list: List<Coupon1>
 )
 @Parcelize
-data class Coupon(
+data class Coupon1(
     @SerializedName("amount")
     val amount: String,
     @SerializedName("counpon_amount")

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/dto/OrderDetailDto.kt

@@ -22,7 +22,7 @@ data class OrderDetailDto(
   @SerializedName("comment") // 订单备注
   val comment: String,
   @SerializedName("coupon_list") // 优惠券信息
-  val couponList: List<Coupon>,
+  val couponList: List<Coupon1>,
   @SerializedName("create_time")
   val createTime: String,
   @SerializedName("discount_fee") // 优惠金额

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/http/UserOrderListOperation.kt

-package com.yidian.shenghuoquan.border.app.http
+package com.yidian.shenghuoquan.border.http
 
 import com.yidian.bcommon.http.HttpParamsUtils
 import com.yidian.bcommon.http.HttpResult
@@ -6,7 +6,7 @@ import com.yidian.bcommon.http.HttpResultSubscriber
 import com.yidian.bcommon.http.TransformUtil
 import com.yidian.http.ServiceFactory
 import com.yidian.shenghuoquan.border.app.bean.OrderWebData
-import com.yidian.shenghuoquan.border.app.http.callback.OrderListCallBack
+import com.yidian.shenghuoquan.border.http.callback.OrderListCallBack
 import timber.log.Timber
 
 object UserOrderListOperation {

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/http/UserOrderListService.kt

-package com.yidian.shenghuoquan.border.app.http
+package com.yidian.shenghuoquan.border.http
 
 import com.yidian.bcommon.http.HttpResult
 import io.reactivex.rxjava3.core.Observable
 import retrofit2.http.Body
-import retrofit2.http.GET
 import retrofit2.http.POST
 import retrofit2.http.QueryMap
-import java.util.*
 
 interface UserOrderListService {
   companion object{

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/http/callback/OrderListCallBack.kt

-package com.yidian.shenghuoquan.border.app.http.callback
+package com.yidian.shenghuoquan.border.http.callback
 
 import com.yidian.shenghuoquan.border.app.bean.OrderWebData
 

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/http/callback/WebListDataCallback.kt

-package com.yidian.shenghuoquan.border.app.http.callback
+package com.yidian.shenghuoquan.border.http.callback
 
 interface WebListDataCallback <T>{
   fun onWebListDataCallBack(list: List<T>)

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

@@ -21,6 +21,7 @@ import timber.log.Timber
 import com.pingplusplus.android.Pingpp
 import com.pingplusplus.android.Pingpp.REQUEST_CODE_PAYMENT
 import com.yidian.bcommon.utils.ToastUtils
+import com.yidian.shenghuoquan.border.viewmodel.ConfirmOrderViewModel
 
 
 /**

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

-package com.yidian.shenghuoquan.border.app.activity
+package com.yidian.shenghuoquan.border.ui
 
 object HardCode {
   const val VoncherList = "{" +

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

@@ -9,7 +9,7 @@ import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.news.ui.SystemBarUtils
 import com.yidian.shenghuoquan.border.R
 import com.yidian.shenghuoquan.border.app.adapter.OrderListAdapter
-import com.yidian.shenghuoquan.border.app.utils.SpaceItemDecoration
+import com.yidian.shenghuoquan.border.utils.SpaceItemDecoration
 import com.yidian.shenghuoquan.border.databinding.BorderActivityOrderListBinding
 import com.yidian.shenghuoquan.border.viewmodel.OrderListViewModel
 import com.yidian.xpage.XPageViewProtocol

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

@@ -7,11 +7,10 @@ import com.yidian.bcommon.extensions.initTitleBar
 import com.yidian.bcommon.mvvm.BaseMvvmActivity
 import com.yidian.news.ui.SystemBarUtils
 import com.yidian.shenghuoquan.border.R
-import com.yidian.shenghuoquan.border.app.activity.HardCode
-import com.yidian.shenghuoquan.border.app.adapter.VoncherAdapter
-import com.yidian.shenghuoquan.border.app.bean.CounponDto
-import com.yidian.shenghuoquan.border.app.utils.SpaceItemDecoration
-import com.yidian.shenghuoquan.border.app.viewmodel.VoncherViewModel
+import com.yidian.shenghuoquan.border.adapter.VoncherAdapter
+import com.yidian.shenghuoquan.border.dto.CounponDto
+import com.yidian.shenghuoquan.border.utils.SpaceItemDecoration
+import com.yidian.shenghuoquan.border.viewmodel.VoncherViewModel
 import com.yidian.shenghuoquan.border.databinding.BorderActivityVoncherBinding
 import com.yidian.xpage.XPageViewProtocol
 

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

-package com.yidian.shenghuoquan.border.app.utils
+package com.yidian.shenghuoquan.border.utils
 
 import com.yidian.bcommon.constant.XRouterPathConstants
 import com.yidian.shenghuoquan.border.ui.OrderListActivity

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

-package com.yidian.shenghuoquan.border.app.utils
+package com.yidian.shenghuoquan.border.utils
 
-import android.graphics.Color
 import android.graphics.Rect
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/view/RoundImageView.kt

-package com.yidian.shenghuoquan.border.app.view
+package com.yidian.shenghuoquan.border.view
 
 import android.content.Context
 import kotlin.jvm.JvmOverloads

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/ui/ConfirmOrderViewModel.kt → Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/ConfirmOrderViewModel.kt

-package com.yidian.shenghuoquan.border.ui
+package com.yidian.shenghuoquan.border.viewmodel
 
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/OrderListViewModel.kt

@@ -4,8 +4,8 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import com.yidian.bcommon.mvvm.BaseViewModel
 import com.yidian.shenghuoquan.border.app.bean.OrderWebData
-import com.yidian.shenghuoquan.border.app.http.UserOrderListOperation
-import com.yidian.shenghuoquan.border.app.http.callback.OrderListCallBack
+import com.yidian.shenghuoquan.border.http.UserOrderListOperation
+import com.yidian.shenghuoquan.border.http.callback.OrderListCallBack
 
 class OrderListViewModel : BaseViewModel(){
 

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/border/viewmodel/VoncherViewModel.kt

-package com.yidian.shenghuoquan.border.app.viewmodel
+package com.yidian.shenghuoquan.border.viewmodel
 
 import com.yidian.bcommon.mvvm.BaseViewModel
 

Components/BUserOrder/src/main/res/layout/border_activity_confirm_order.xml

@@ -7,7 +7,7 @@
 
         <variable
             name="vm"
-            type="com.yidian.shenghuoquan.border.ui.ConfirmOrderViewModel" />
+            type="com.yidian.shenghuoquan.border.viewmodel.ConfirmOrderViewModel" />
 
     </data>
 

Components/BUserOrder/src/main/res/layout/border_activity_voncher.xml

@@ -5,7 +5,7 @@
     <data>
         <variable
             name="vm"
-            type="com.yidian.shenghuoquan.border.app.viewmodel.VoncherViewModel" />
+            type="com.yidian.shenghuoquan.border.viewmodel.VoncherViewModel" />
     </data>
     <LinearLayout
         android:layout_width="match_parent"

Components/BUserOrder/src/main/res/layout/border_recycle_order_item.xml

@@ -71,13 +71,13 @@
             android:layout_width="82dp"
             android:layout_height="match_parent"
             android:orientation="vertical">
-            <com.yidian.shenghuoquan.border.app.view.RoundImageView
+            <com.yidian.shenghuoquan.border.view.RoundImageView
                 android:layout_width="@dimen/dp82"
                 android:layout_height="@dimen/dp60"
                 android:scaleType="centerInside"
                 app:radius="@dimen/dp12"
                 android:src="@drawable/test_pic">
-            </com.yidian.shenghuoquan.border.app.view.RoundImageView>
+            </com.yidian.shenghuoquan.border.view.RoundImageView>
             <TextView
                 android:id="@+id/tv_goog1_name"
                 android:layout_width="wrap_content"
@@ -98,13 +98,13 @@
             android:orientation="vertical"
             android:layout_toRightOf="@+id/ll_order_image1"
             android:layout_marginStart="@dimen/dp8">
-            <com.yidian.shenghuoquan.border.app.view.RoundImageView
+            <com.yidian.shenghuoquan.border.view.RoundImageView
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/dp60"
                 android:scaleType="centerCrop"
                 app:radius="@dimen/dp12"
                 android:src="@drawable/test_pic">
-            </com.yidian.shenghuoquan.border.app.view.RoundImageView>
+            </com.yidian.shenghuoquan.border.view.RoundImageView>
 
             <TextView
                 android:id="@+id/tv_goog2_name"
@@ -126,13 +126,13 @@
             android:orientation="vertical"
             android:layout_marginLeft="@dimen/dp8"
             android:layout_toRightOf="@+id/ll_order_image2">
-            <com.yidian.shenghuoquan.border.app.view.RoundImageView
+            <com.yidian.shenghuoquan.border.view.RoundImageView
                 android:layout_width="match_parent"
                 android:layout_height="60dp"
                 android:scaleType="centerCrop"
                 app:radius="@dimen/dp12"
                 android:src="@drawable/test_pic">
-            </com.yidian.shenghuoquan.border.app.view.RoundImageView>
+            </com.yidian.shenghuoquan.border.view.RoundImageView>
             <TextView
                 android:id="@+id/tv_good3_name"
                 android:layout_width="wrap_content"