Merge branch 'feature/dev_fight_order' of...

Merge branch 'feature/dev_fight_order' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into feature/dev_fight_order

Components/BUserOrder/src/main/java/com/yidian/shenghuoquan/buserorder/adapter/OrderListAdapter.kt

@@ -32,7 +32,7 @@ class OrderListAdapter : BaseQuickAdapter<OrderWebData, BaseViewHolder>(R.layout
 
   private fun mapDataToHoder(data: OrderWebData, holder: BaseViewHolder) {
     resetImageStatu(holder)
-    holder.itemView.setOnClickListener {
+    holder.itemView.findViewById<TextView>(R.id.tv_market_name).setOnClickListener {
       gotoMarketingDetail(data.marketing_id)
     }
     holder.itemView.findViewById<TextView>(R.id.tv_market_name).text = data.marketing_name

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

 package com.yidian.shenghuoquan.buserorder.ui
 
+import android.os.Bundle
 import androidx.activity.viewModels
 import com.yidian.bcommon.constant.IntentConstants
 import com.yidian.bcommon.constant.XEventConfig
@@ -10,6 +11,7 @@ import com.yidian.shenghuoquan.buserorder.databinding.BorderActivityOrderDetailB
 import com.yidian.shenghuoquan.buserorder.manager.OrderStatusManager
 import com.yidian.shenghuoquan.buserorder.viewmodel.OrderDetailViewModel
 import com.yidian.xarc.xevent.XBaseEvent
+import com.yidian.xarc.xevent.XEventManager
 import com.yidian.xpage.XPageViewProtocol
 import org.greenrobot.eventbus.Subscribe
 import org.greenrobot.eventbus.ThreadMode
@@ -39,6 +41,16 @@ class OrderDetailActivity : BaseMvvmActivity<BorderActivityOrderDetailBinding, O
     return XRouterPathConstants.ORDER_DETAIL_ACTIVITY
   }
 
+  override fun onCreate(savedInstanceState: Bundle?) {
+    super.onCreate(savedInstanceState)
+    XEventManager.register(this)
+  }
+
+  override fun onDestroy() {
+    super.onDestroy()
+    XEventManager.unRegister(this)
+  }
+
   override fun initView() {
     initSmartRefresh()
     vm.orderDetailData.observe(this, {

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

@@ -15,6 +15,8 @@ import com.yidian.shenghuoquan.buserorder.app.adapter.OrderListAdapter
 import com.yidian.shenghuoquan.buserorder.utils.SpaceItemDecoration
 import com.yidian.shenghuoquan.buserorder.databinding.BorderActivityOrderListBinding
 import com.yidian.shenghuoquan.buserorder.viewmodel.OrderListViewModel
+import com.yidian.shenghuoquan.buserorder.viewmodel.OrderListViewModel.Companion.LOAD
+import com.yidian.shenghuoquan.buserorder.viewmodel.OrderListViewModel.Companion.PULL
 import com.yidian.xpage.XPageViewProtocol
 import timber.log.Timber
 
@@ -30,7 +32,7 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
 
   override fun initView() {
     initTitleBar(binding.orderListToolbar, binding.tvTitle, "参与的")
-    SystemBarUtils.setStatusBarTextColorWhite(this)
+    SystemBarUtils.setStatusBarTextColorBlack(this)
     binding.orderListToolbar.setNavigationIcon(R.drawable.icon_back)
     initRecycleView()
     initClickEvent()
@@ -50,6 +52,8 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
       listAdapter = OrderListAdapter()
       binding.rcvOrderList.adapter = listAdapter
       listAdapter.setList(it)
+      var oldPos = listAdapter.itemCount
+      setRecyclePos(oldPos)
     })
   }
 
@@ -79,8 +83,16 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
       }
   }
 
-  private fun requestUserOrder() {
+  private fun setRecyclePos(pos:Int) {
+      when(vm._operationType) {
+        PULL -> {
+          binding.rcvOrderList.smoothScrollToPosition(1)
+        }
+        LOAD -> {
+          binding.rcvOrderList.smoothScrollToPosition(pos)
+        }
 
+      }
   }
 
   override fun getXPageName(): String {

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

@@ -11,15 +11,20 @@ class OrderListViewModel : BaseViewModel(){
     companion object {
       const val NORMAL = "NORMAL"
       const val REFUND = "REFUND"
+      const val PULL = "PULL"
+      const val LOAD = "LOAD"
     }
 
     private var orderList:MutableLiveData<List<OrderWebData>> = MutableLiveData<List<OrderWebData>>()
     var _orderList:LiveData<List<OrderWebData>> = orderList
     var _listType:String = NORMAL
+    var _operationType = PULL
     fun requestFreshUserOrder(param:HashMap<String, String?>) {
+      _operationType = PULL
       UserOrderListOperation.userOrderList(generateRereshParma(param), orderListCallBack)
     }
   fun requestLoadMoreUserOrder(param:HashMap<String, String?>) {
+    _operationType = LOAD
     UserOrderListOperation.userOrderList(generateLoadmoreParma(param), orderListCallBack)
   }
     private var orderListCallBack = object : OrderListCallBack {

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

@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="#D8D8D8">
+        android:background="#F7F7F7">
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/order_list_toolbar"
             android:layout_width="match_parent"
@@ -77,6 +77,11 @@
                 android:layout_height="wrap_content"
                 app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager">
             </androidx.recyclerview.widget.RecyclerView>
+            <com.scwang.smart.refresh.footer.ClassicsFooter
+                android:layout_width="match_parent"
+                android:layout_height="0dp">
+
+            </com.scwang.smart.refresh.footer.ClassicsFooter>
         </com.scwang.smart.refresh.layout.SmartRefreshLayout>
 
     </LinearLayout>