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/ui/OrderListActivity.kt

@@ -60,7 +60,6 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
   private fun initClickEvent() {
       binding.smartRefresh.setOnRefreshListener(this)
       binding.smartRefresh.setOnLoadMoreListener(this)
-      binding.smartRefresh.autoRefresh()
       binding.tvRefunded.setOnClickListener {
         vm._listType = OrderListViewModel.REFUND
         binding.tvRefunded.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD))
@@ -111,4 +110,9 @@ class OrderListActivity : BaseMvvmActivity<BorderActivityOrderListBinding, Order
     super.onBackPressed()
     vm.goBackPointReport()
   }
+
+  override fun onResume() {
+    super.onResume()
+    binding.smartRefresh.autoRefresh()
+  }
 }

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

@@ -45,6 +45,7 @@ class OrderPickupPointInfoView @JvmOverloads constructor(context: Context, attrs
   private fun registerUIEvent() {
     // 监听点击联系自提点
     vm.contractPickupPoint.observe(context as LifecycleOwner, { phone ->
+      if (phone.isNullOrEmpty()) return@observe
       // 先判断权限
       RxPermissions(context as FragmentActivity).request(Manifest.permission.CALL_PHONE).subscribe { granted ->
         if (granted) {

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

@@ -16,14 +16,19 @@
         android:orientation="horizontal"
         android:layout_marginStart="16dp"
         android:layout_centerHorizontal="true">
+
         <TextView
             android:id="@+id/tv_market_name"
-            android:layout_width="wrap_content"
+            android:layout_width="96dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:textSize="16sp"
+            android:maxLines="1"
+            android:ellipsize="end"
+            android:text="拼餐优惠多多"
             android:textColor="#333333"
-            android:text="拼餐优惠多多">
+            android:textSize="16sp"
+            >
+
         </TextView>
         <ImageView
             android:layout_width="@dimen/dp14"
@@ -168,14 +173,15 @@
         android:layout_marginLeft="@dimen/dp16"
         android:layout_marginTop="@dimen/dp16"
         android:layout_below="@+id/rl_order_image_count">
+
         <TextView
             android:id="@+id/tv_pay_time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
             android:layout_centerVertical="true"
             android:text="2010-3-24 11:07"
-            android:textColor="#666666">
+            android:textColor="#666666"
+            android:textSize="14sp">
 
         </TextView>
         <LinearLayout

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

@@ -7,6 +7,8 @@
 
         <import type="android.view.View" />
 
+        <import type="android.text.TextUtils" />
+
         <variable
             name="vm"
             type="com.yidian.shenghuoquan.buserorder.viewmodel.OrderPickupPointViewModel" />
@@ -88,7 +90,7 @@
             android:text="@{@string/pickup_point_contract(data.contactName, data.phone)}"
             android:textColor="@color/color_999999"
             android:textSize="@dimen/sp14"
-            android:visibility="@{data != null ? View.VISIBLE : View.GONE}"
+            android:visibility="@{!TextUtils.isEmpty(data.contactName) || !TextUtils.isEmpty(data.phone) ? View.VISIBLE : View.GONE}"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/tv_pickup_point_name"
             app:layout_constraintTop_toBottomOf="@id/tv_pickup_point_address"