bug修复

consumer/src/main/java/com/xx/hbhconsumer/adapter/MyCouponAdapter.java

@@ -33,12 +33,6 @@ public class MyCouponAdapter extends xxBaseRecyclerViewAdapter<ItemMyCouponBindi
 
         if ("1".equals(data.getCouponType())) {
             dataBind.ivCouponType.setVisibility(View.VISIBLE);
-            dataBind.tvReceive.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    viewMode.goCouponGoods(data.getCouponId());
-                }
-            });
             dataBind.tvCouponContent.setText(new BigDecimal(data.getDiscountAmount()).stripTrailingZeros().toPlainString());
 
             dataBind.tvDesc2.setText("2、订单满" + new BigDecimal(data.getOrderAmount()).stripTrailingZeros().toPlainString() + "减" + new BigDecimal(data.getDiscountAmount()).stripTrailingZeros().toPlainString());
@@ -48,6 +42,17 @@ public class MyCouponAdapter extends xxBaseRecyclerViewAdapter<ItemMyCouponBindi
             dataBind.tvDesc2.setText("2、订单满" + new BigDecimal(data.getOrderAmount()).stripTrailingZeros().toPlainString() + "赠" + data.getGiftName());
         }
 
+        dataBind.tvReceive.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if ("2".equals(data.getCouponType())) {
+                    viewMode.showGiftQrCode(v, data.getCouponId(), data.getGiftName());
+                } else {
+                    viewMode.goCouponGoods(data.getCouponId());
+                }
+            }
+        });
+
         dataBind.tvCouponNumber.setText("券编号：" + data.getCouponNumber());
 
         String time = data.getCouponStartTime() + " - " + data.getCouponEndTime();

consumer/src/main/java/com/xx/hbhconsumer/adapter/ShopBannerAdapter.kt

@@ -38,10 +38,13 @@ class ShopBannerAdapter(val context:Context, list:List<ShopBean> ) :
     ) {
         holder?.dataBind?.tvSlogan?.setText(data?.propaganda)
         holder?.dataBind?.tvShopName?.setText(data?.storeName)
-        holder?.dataBind?.imgBanner?.let {
-            Glide.with(context).load(RetrofitClient.baseImgUrl + data?.coverImage)
-                .into(it)
+        if (data?.coverImage != null) {
+            holder?.dataBind?.imgBanner?.let {
+                Glide.with(context).load(RetrofitClient.baseImgUrl + data?.coverImage)
+                    .into(it)
+            }
         }
 
+
     }
 }

consumer/src/main/java/com/xx/hbhconsumer/data/http/ApiService.kt

@@ -399,7 +399,7 @@ interface ApiService {
      * 查询活动列表信息
      */
     @Headers("Content-type:application/json")
-    @POST("app/user/closure-with-reason")
+    @PUT("app/user/closure-with-reason")
     fun logoff(@Body requestBody: RequestBody): Observable<BaseResponse<Boolean>>
 
 

consumer/src/main/java/com/xx/hbhconsumer/data/http/respons/CreditOrderBean.kt

@@ -18,6 +18,8 @@ data class CreditOrderBean(
     val pointGoodsNum: Int,
     val goodsPoint: Int,
     val pointOrderNumber: String,
+    val couponNumber: String,
+    val integralCommodityType: String,
     val remark: String,
     val status: String,
     val updateBy: String,

consumer/src/main/java/com/xx/hbhconsumer/ui/activity/ActivityFragment.java

@@ -77,6 +77,11 @@ public class ActivityFragment extends BaseFragment<FragmentActivityBinding, Acti
             } else {
                 binding.refresh.finishLoadMore();
             }
+            if (viewModel.page == viewModel.totalPage) {
+                binding.refresh.setEnableLoadMore(false);
+            } else {
+                binding.refresh.setEnableLoadMore(true);
+            }
         });
     }
 

consumer/src/main/java/com/xx/hbhconsumer/ui/activity/ActivityViewModel.java

@@ -151,7 +151,14 @@ public class ActivityViewModel extends BaseViewModel<ActivityRequest> {
                 }).subscribe(new ApiDisposablePageObserver<ActivityCenterBean>() {
                     @Override
                     public void onSuccess(List<ActivityCenterBean> resultBean) {
-                        activityList.postValue(resultBean);
+                        if (page == 1) {
+                            activityList.postValue(resultBean);
+                        } else {
+                            List<ActivityCenterBean> list = activityList.getValue();
+                            list.addAll(resultBean);
+                            activityList.postValue(list);
+                        }
+
                     }
 
                     @Override
@@ -163,8 +170,6 @@ public class ActivityViewModel extends BaseViewModel<ActivityRequest> {
                     public void getTotal(int total) {
                         totalPage = (total - 1) / 10 + 1;
                     }
-
-
                 });
     }
 }
\ No newline at end of file

consumer/src/main/java/com/xx/hbhconsumer/ui/creditorder/CreditOrderDetailActivity.java

 package com.xx.hbhconsumer.ui.creditorder;
 
 import android.os.Bundle;
+import android.view.View;
 
 import com.bumptech.glide.Glide;
 import com.xx.hbhconsumer.R;
@@ -26,7 +27,7 @@ public class CreditOrderDetailActivity extends BaseActivity<ActivityCreditOrderD
                 }
 
                 if ("0".equals(orderBean.getStatus())) {
-                    binding.ivOrderStateIcon.setImageDrawable(getDrawable(R.mipmap.jifendingdan_icon_yiwancheng));
+                    binding.ivOrderStateIcon.setImageDrawable(getDrawable(R.mipmap.dingdanxiangqing_icon_wancheng));
                     binding.tvOrderState.setText("订单状态：已完成");
                 } else if ("1".equals(orderBean.getStatus())) {
                     binding.ivOrderStateIcon.setImageDrawable(getDrawable(R.mipmap.jifendingdan_icon_dailing));
@@ -38,6 +39,12 @@ public class CreditOrderDetailActivity extends BaseActivity<ActivityCreditOrderD
                 binding.tvTotalCredit.setText(orderBean.getConsumptionPoints() + " 积分");
                 binding.tvOrderNumber.setText(orderBean.getPointOrderNumber() + "");
                 binding.tvOrderTime.setText(orderBean.getCreateTime());
+                if ("2".equals(orderBean.getIntegralCommodityType())) {
+                    binding.rlCouponNumber.setVisibility(View.VISIBLE);
+                } else {
+                    binding.rlCouponNumber.setVisibility(View.GONE);
+                }
+                binding.tvCouponNumber.setText(orderBean.getCouponNumber());
             }
         });
     }

consumer/src/main/java/com/xx/hbhconsumer/ui/creditorder/CreditOrderListFragment.java

@@ -58,6 +58,8 @@ public class CreditOrderListFragment extends BaseFragment<FragmentCreditOrderLis
             }
             if (viewModel.page == viewModel.totalPage) {
                 binding.refresh.setEnableLoadMore(false);
+            } else {
+                binding.refresh.setEnableLoadMore(true);
             }
         });
     }

consumer/src/main/java/com/xx/hbhconsumer/ui/goods/GoodsListActivity.java

@@ -66,7 +66,11 @@ public class GoodsListActivity extends BaseActivity<ActivityGoodsListBinding, Go
                 } else {
                     binding.refresh.finishLoadMore();
                 }
-
+                if (viewModel.page == viewModel.totalPage) {
+                    binding.refresh.setEnableLoadMore(false);
+                } else {
+                    binding.refresh.setEnableLoadMore(true);
+                }
             }
         });
     }
@@ -82,11 +86,11 @@ public class GoodsListActivity extends BaseActivity<ActivityGoodsListBinding, Go
     public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
         viewModel.page++;
         if (viewModel.page > viewModel.totalPage) {
-//            binding.tvNoMore.setVisibility(View.VISIBLE);
+            binding.tvNoMore.setVisibility(View.VISIBLE);
         } else if (viewModel.page == viewModel.totalPage) {
             binding.refresh.setEnableLoadMore(false);
             viewModel.loadGoodsList();
-//            binding.tvNoMore.setVisibility(View.VISIBLE);
+            binding.tvNoMore.setVisibility(View.VISIBLE);
         } else {
             viewModel.loadGoodsList();
         }

consumer/src/main/java/com/xx/hbhconsumer/ui/lowprice/LowPriceActivity.java

 package com.xx.hbhconsumer.ui.lowprice;
 
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
-import androidx.lifecycle.Observer;
 import androidx.recyclerview.widget.GridLayoutManager;
 
 import com.scwang.smart.refresh.layout.api.RefreshLayout;
@@ -12,12 +12,7 @@ import com.scwang.smart.refresh.layout.listener.OnRefreshListener;
 import com.xx.hbhconsumer.R;
 import com.xx.hbhconsumer.adapter.LowPriceNomalGoodsAdapter;
 import com.xx.hbhconsumer.data.http.requst.HomeRequest;
-import com.xx.hbhconsumer.data.http.respons.LowPriceGoodsBean;
 import com.xx.hbhconsumer.databinding.ActivityLowPriceBinding;
-import com.xx.hbhconsumer.databinding.ActivityNewProductsBinding;
-import com.xx.xxviewlibrary.base.xxBaseRecyclerViewAdapter;
-
-import java.util.List;
 
 import me.goldze.mvvmhabit.base.BaseActivity;
 import me.tatarka.bindingcollectionadapter2.BR;
@@ -40,26 +35,23 @@ public class LowPriceActivity extends BaseActivity<ActivityLowPriceBinding, LowP
         binding.refresh.setOnLoadMoreListener(this);
         GridLayoutManager manager = new GridLayoutManager(LowPriceActivity.this,2);
         binding.rvGoodsList.setLayoutManager(manager);
-        //获取适配器上下文
+
         LowPriceNomalGoodsAdapter orderListAdapter = new LowPriceNomalGoodsAdapter(LowPriceActivity.this);
-        //把adapterset进去
+
         binding.rvGoodsList.setAdapter(orderListAdapter);
-        orderListAdapter.setOnItemClick(new xxBaseRecyclerViewAdapter.OnItemClick<LowPriceGoodsBean>() {
-            @Override
-            public void itemClickCalBack(int position, LowPriceGoodsBean data) {
-                viewModel.goGoodsDetail(data.getBusinessId());
+        orderListAdapter.setOnItemClick((position, data) -> viewModel.goGoodsDetail(data.getBusinessId()));
+        viewModel.newCommodityList.observe(this, collectionBeanList -> {
+            orderListAdapter.mList = collectionBeanList;
+            orderListAdapter.notifyDataSetChanged();
+            if (viewModel.page == 1) {
+                binding.refresh.finishRefresh();
+            } else {
+                binding.refresh.finishLoadMore();
             }
-        });
-        viewModel.newCommodityList.observe(this, new Observer<List<LowPriceGoodsBean>>() {
-            @Override
-            public void onChanged(List<LowPriceGoodsBean> collectionBeanList) {
-                orderListAdapter.mList = collectionBeanList;
-                orderListAdapter.notifyDataSetChanged();
-                if (viewModel.page == 1) {
-                    binding.refresh.finishRefresh();
-                } else {
-                    binding.refresh.finishLoadMore();
-                }
+            if (viewModel.page == viewModel.totalPage) {
+                binding.refresh.setEnableLoadMore(false);
+            } else {
+                binding.refresh.setEnableLoadMore(true);
             }
         });
     }
@@ -75,11 +67,11 @@ public class LowPriceActivity extends BaseActivity<ActivityLowPriceBinding, LowP
         viewModel.page++;
 
         if (viewModel.page > viewModel.totalPage) {
-//            binding.tvNoMore.setVisibility(View.VISIBLE);
+            binding.tvNoMore.setVisibility(View.VISIBLE);
         } else if (viewModel.page == viewModel.totalPage) {
             binding.refresh.setEnableLoadMore(false);
             viewModel.loadData();
-//            binding.tvNoMore.setVisibility(View.VISIBLE);
+            binding.tvNoMore.setVisibility(View.VISIBLE);
         } else {
             viewModel.loadData();
         }

consumer/src/main/java/com/xx/hbhconsumer/ui/lowprice/LowPriceViewModel.java

@@ -69,7 +69,13 @@ public class LowPriceViewModel extends BaseViewModel<HomeRequest> {
                 }).subscribe(new ApiDisposablePageObserver<LowPriceGoodsBean>() {
                     @Override
                     public void onSuccess(List<LowPriceGoodsBean> newCommodityBeanList) {
-                        newCommodityList.postValue(newCommodityBeanList);
+                        if (page == 1) {
+                            newCommodityList.postValue(newCommodityBeanList);
+                        } else {
+                            List<LowPriceGoodsBean> list = newCommodityList.getValue();
+                            list.addAll(newCommodityBeanList);
+                            newCommodityList.postValue(list);
+                        }
                     }
 
                     @Override

consumer/src/main/java/com/xx/hbhconsumer/ui/mycollection/MyCollectionViewModel.java

@@ -145,6 +145,7 @@ public class MyCollectionViewModel extends BaseViewModel<CollectionRequest> {
                         public void onSuccess(Integer resultBean) {
                             loadData();
                             editFlag.postValue(false);
+                            checkCount.postValue(0);
                             ToastUtils.showShort("取消收藏成功");
                         }
 

consumer/src/main/java/com/xx/hbhconsumer/ui/mycoupon/MyCouponViewModel.java

@@ -3,14 +3,16 @@ package com.xx.hbhconsumer.ui.mycoupon;
 
 import android.app.Application;
 import android.os.Bundle;
+import android.view.View;
 
 import androidx.annotation.NonNull;
 import androidx.lifecycle.MutableLiveData;
 
 import com.xx.hbhconsumer.data.http.requst.CouponRequest;
-import com.xx.hbhconsumer.data.http.requst.LoginRequest;
 import com.xx.hbhconsumer.data.http.respons.MyCouponBean;
-import com.xx.hbhconsumer.ui.goods.GoodsDetailActivity;
+import com.xx.hbhconsumer.ui.credit.CreditDetailActivity;
+import com.xx.hbhconsumer.ui.home.SignDialog;
+import com.xx.xxviewlibrary.base.xxBaseDialog;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -131,6 +133,12 @@ public class MyCouponViewModel extends BaseViewModel<CouponRequest> {
         bundle.putString("couponId", businessId);
         startActivity(CouponGoodsListActivity.class, bundle);
     }
+
+    public void showGiftQrCode(View view, String couponId, String giftName) {
+        ReceiveGiftDialog dialog = new ReceiveGiftDialog(view.getContext(), couponId, giftName);
+        dialog.setDialogClickListener((xxBaseDialog.onDialogClickListener<SignDialog.SignCurrent>) (code, data) -> startActivity(CreditDetailActivity.class));
+        dialog.show();
+    }
 }
 
 

consumer/src/main/java/com/xx/hbhconsumer/ui/mycoupon/ReceiveGiftDialog.kt

+package com.xx.hbhconsumer.ui.mycoupon
+
+import android.content.Context
+import android.view.Gravity
+import android.view.View
+import android.view.WindowManager
+import cn.bingoogolapple.qrcode.zxing.QRCodeEncoder
+import com.xx.hbhconsumer.R
+import com.xx.hbhconsumer.databinding.DialogOrderPayBinding
+import com.xx.hbhconsumer.databinding.DialogReceiveGiftBinding
+import com.xx.xxviewlibrary.base.xxBaseDialog
+import me.jessyan.autosize.utils.AutoSizeUtils
+
+class ReceiveGiftDialog(context:Context, var couponId: String, var giftName: String): xxBaseDialog<DialogReceiveGiftBinding>(context) {
+    override fun InitView(): DialogSet {
+        return DialogSet(
+            R.layout.dialog_receive_gift,true,
+            Gravity.BOTTOM,true, WindowManager.LayoutParams.MATCH_PARENT,
+            AutoSizeUtils.dp2px(context,
+            333.0F));
+    }
+
+    override fun InitData() {
+        binding.receiveGiftDialog = this
+
+        binding.tvCancel.setOnClickListener {
+            dismiss()
+        }
+        var qrCode = QRCodeEncoder.syncEncodeQRCode("giftId=" + couponId, 144)
+        binding.ivOrderQrCode.setImageBitmap(qrCode)
+        binding.tvGiftName.setText(giftName)
+
+    }
+    data class SignCurrent(val context:String)
+
+    fun typeClickDialog(view: View) {
+        if (DialogClickListener != null) {
+            DialogClickListener.dialogClickBack(view.id, null)
+        }
+        dismiss()
+    }
+}
\ No newline at end of file

consumer/src/main/java/com/xx/hbhconsumer/ui/news/NewsDetailActivity.java

 package com.xx.hbhconsumer.ui.news;
 
+import android.Manifest;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.util.Log;
 import android.webkit.JavascriptInterface;
 
+import androidx.core.app.ActivityCompat;
+
 import com.xx.hbhconsumer.R;
 import com.xx.hbhconsumer.data.http.requst.NewsRequest;
 import com.xx.hbhconsumer.databinding.ActivityNewsDetailBinding;
@@ -46,13 +50,28 @@ public class NewsDetailActivity extends BaseActivity<ActivityNewsDetailBinding,
         @JavascriptInterface
         public String downloadInfo(Object msg)  {
 
-            JSONObject jsonObject = (JSONObject) msg;
-            Log.i(TAG, "downloadInfo 接收到的参数：" + jsonObject.toString());
-            try {
-                String url = RetrofitClient.baseImgUrl + jsonObject.getString("informationAttachment");
-                viewModel.downloadFile(url);
-            } catch (JSONException e) {
-                throw new RuntimeException(e);
+            int permission = ActivityCompat.checkSelfPermission(NewsDetailActivity.this,
+                    Manifest.permission.READ_EXTERNAL_STORAGE);//缺少什么权限就写什么权限
+            if (permission != PackageManager.PERMISSION_GRANTED) {
+                // We don't have permission so prompt the user
+                ActivityCompat.requestPermissions(NewsDetailActivity.this, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,}, 0);
+            }
+            int permission2 = ActivityCompat.checkSelfPermission(NewsDetailActivity.this,
+                    Manifest.permission.WRITE_EXTERNAL_STORAGE);//缺少什么权限就写什么权限
+            if (permission2 != PackageManager.PERMISSION_GRANTED) {
+                // We don't have permission so prompt the user
+                ActivityCompat.requestPermissions(NewsDetailActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,}, 0);
+            }
+            else {
+
+                JSONObject jsonObject = (JSONObject) msg;
+                Log.i(TAG, "downloadInfo 接收到的参数：" + jsonObject.toString());
+                try {
+                    String url = RetrofitClient.baseImgUrl + jsonObject.getString("informationAttachment");
+                    viewModel.downloadFile(url);
+                } catch (JSONException e) {
+                    throw new RuntimeException(e);
+                }
             }
 
             return "success";

consumer/src/main/java/com/xx/hbhconsumer/ui/order/OrderListFragment.java

@@ -60,6 +60,8 @@ public class OrderListFragment extends BaseFragment<FragmentOrderListBinding, Or
                 }
                 if (viewModel.page == viewModel.totalPage) {
                     binding.refresh.setEnableLoadMore(false);
+                } else {
+                    binding.refresh.setEnableLoadMore(true);
                 }
             }
         });

consumer/src/main/res/layout/activity_change_phone.xml

@@ -106,6 +106,7 @@
                         style="@style/CommEdit"
                         android:hint="请输入您的手机号"
                         android:background="@null"
+                        android:text="@={phoneViewModel.changePhoneNumber}"
                         android:maxLines="1"/>
 
                     <View
@@ -144,6 +145,7 @@
                         android:layout_below="@id/tv_code_label"
                         android:layout_marginTop="25dp"
                         android:layout_marginBottom="28dp"
+                        android:text="@={phoneViewModel.code}"
                         style="@style/CommEdit"
                         android:hint="请输入验证码"
                         android:background="@null"

consumer/src/main/res/layout/activity_credit_order_detail.xml

@@ -29,7 +29,6 @@
         <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginBottom="92dp"
             android:background="@color/bg_grey"
             android:layout_below="@id/bar">
 
@@ -200,54 +199,95 @@
                         android:layout_below="@id/tv_total_credit"
                         android:background="#FFE1E1E1"/>
 
-                    <TextView
-                        android:id="@+id/tv_order_number_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/view_divider"
-                        android:layout_marginTop="30dp"
-                        android:layout_marginLeft="13dp"
-                        android:text="订单编号"
-                        android:textSize="14sp"
-                        android:textColor="#FF757575"/>
-
-                    <TextView
-                        android:id="@+id/tv_order_number"
+                    <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_below="@id/view_divider"
-                        android:layout_marginTop="30dp"
-                        android:layout_marginRight="13dp"
-                        android:layout_alignParentRight="true"
-                        android:textStyle="bold"
-                        android:text="120积分"
-                        android:textSize="14sp"
-                        android:textColor="#FF333333"/>
-
-                    <TextView
-                        android:id="@+id/tv_order_time_label"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/tv_order_number"
-                        android:layout_marginTop="21dp"
-                        android:layout_marginLeft="13dp"
-                        android:layout_marginBottom="21dp"
-                        android:text="创建时间"
-                        android:textSize="14sp"
-                        android:textColor="#FF757575"/>
+                        android:orientation="vertical">
 
-                    <TextView
-                        android:id="@+id/tv_order_time"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/tv_order_number"
-                        android:layout_marginTop="21dp"
-                        android:layout_marginRight="13dp"
-                        android:layout_alignParentRight="true"
-                        android:textStyle="bold"
-                        android:text="120积分"
-                        android:textSize="14sp"
-                        android:textColor="#FF333333"/>
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:id="@+id/tv_order_number_label"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="30dp"
+                                android:layout_marginLeft="13dp"
+                                android:text="订单编号"
+                                android:textSize="14sp"
+                                android:textColor="#FF757575"/>
+
+                            <TextView
+                                android:id="@+id/tv_order_number"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="30dp"
+                                android:layout_marginRight="13dp"
+                                android:layout_alignParentRight="true"
+                                android:textStyle="bold"
+                                android:text="120积分"
+                                android:textSize="14sp"
+                                android:textColor="#FF333333"/>
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:id="@+id/rl_coupon_number"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+                            <TextView
+                                android:id="@+id/tv_coupon_number_label"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="30dp"
+                                android:layout_marginLeft="13dp"
+                                android:text="优惠券编号"
+                                android:textSize="14sp"
+                                android:textColor="#FF757575"/>
+
+                            <TextView
+                                android:id="@+id/tv_coupon_number"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="30dp"
+                                android:layout_marginRight="13dp"
+                                android:layout_alignParentRight="true"
+                                android:textStyle="bold"
+                                android:text="120积分"
+                                android:textSize="14sp"
+                                android:textColor="#FF333333"/>
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content">
+
+                            <TextView
+                                android:id="@+id/tv_order_time_label"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="21dp"
+                                android:layout_marginLeft="13dp"
+                                android:layout_marginBottom="21dp"
+                                android:text="创建时间"
+                                android:textSize="14sp"
+                                android:textColor="#FF757575"/>
+
+                            <TextView
+                                android:id="@+id/tv_order_time"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="21dp"
+                                android:layout_marginRight="13dp"
+                                android:layout_alignParentRight="true"
+                                android:textStyle="bold"
+                                android:text="120积分"
+                                android:textSize="14sp"
+                                android:textColor="#FF333333"/>
+                        </RelativeLayout>
+                    </LinearLayout>
 
                 </RelativeLayout>
 

consumer/src/main/res/layout/activity_goods_list.xml

@@ -153,10 +153,11 @@
                     android:layout_below="@id/rl_category_bar"/>
 
                 <TextView
-                    android:id="@+id/tv_goods_no_more"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_no_more"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
+                    android:gravity="center"
+                    android:visibility="gone"
                     android:layout_below="@id/rv_search_goods_list"
                     android:text="~ 没有更多啦 ~"
                     android:textSize="13sp"

consumer/src/main/res/layout/activity_logoff_second_step.xml

@@ -184,7 +184,8 @@
                 android:id="@+id/btn_aap_draft"
                 android:textColor="@color/foreground"
                 android:textSize="16sp"
-                android:textStyle="bold"/>
+                android:textStyle="bold"
+                android:onClick="@{logoffSecondStepViewModel.clickFinish}"/>
 
             <androidx.appcompat.widget.AppCompatButton
                 android:layout_width="match_parent"

consumer/src/main/res/layout/activity_low_price.xml

@@ -53,10 +53,11 @@
                     android:layout_marginRight="17dp"/>
 
                 <TextView
-                    android:id="@+id/tv_goods_no_more"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tv_no_more"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_centerHorizontal="true"
+                    android:gravity="center"
+                    android:visibility="gone"
                     android:layout_below="@id/rv_search_goods_list"
                     android:text="~ 没有更多啦 ~"
                     android:textSize="13sp"

consumer/src/main/res/layout/dialog_collect_goods.xml

@@ -63,7 +63,9 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/price_yellow"
                     android:textSize="16sp"
-                    android:text="3499"/>
+                    android:text="3499"
+                    android:singleLine="true"
+                    android:ellipsize="end"/>
             </LinearLayout>
 
             <View

consumer/src/main/res/layout/dialog_receive_gift.xml

+<?xml version="1.0" encoding="utf-8"?>
+<layout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:binding="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+    <data>
+
+        <variable
+            name="receiveGiftDialog"
+            type="com.xx.hbhconsumer.ui.mycoupon.ReceiveGiftDialog" />
+
+        <import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LayoutManagers" />
+
+        <import type="me.goldze.mvvmhabit.binding.viewadapter.recyclerview.LineManagers" />
+    </data>
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        >
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingLeft="17dp"
+            android:paddingRight="17dp"
+            android:background="@drawable/bg_white_radius_12">
+
+            <TextView
+                android:id="@+id/tv_tips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="31dp"
+                android:text="请将二维码提供给收银台"
+                android:textColor="#FF333333"
+                android:textSize="20sp"
+                android:textStyle="bold" />
+
+            <ImageView
+                android:id="@+id/iv_order_qr_code"
+                android:layout_width="144dp"
+                android:layout_height="144dp"
+                android:layout_marginTop="21dp"
+                android:layout_below="@id/tv_tips"
+                android:layout_centerHorizontal="true"
+                android:src="@mipmap/jifenduihuan_icon_jianshao"/>
+
+            <LinearLayout
+                android:id="@+id/ll_price"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/iv_order_qr_code"
+                android:layout_centerHorizontal="true"
+                android:layout_marginTop="21dp"
+                android:layout_marginBottom="4dp"
+                android:background="@drawable/bg_white_radius_24"
+                android:orientation="horizontal">
+                <TextView
+                    android:id="@+id/tv_gift_name"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:textColor="@color/price_yellow"
+                    android:textSize="16sp"
+                    android:text="3499"/>
+            </LinearLayout>
+
+            <View
+                android:id="@+id/view_divider"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_above="@id/tv_cancel"
+                android:background="@color/bg_grey"/>
+
+
+            <TextView
+                android:id="@+id/tv_cancel"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:gravity="center_horizontal"
+                android:paddingTop="15dp"
+                android:paddingBottom="17dp"
+                android:text="取消"
+                android:textSize="16sp"
+                android:textColor="#FF333333"/>
+
+
+        </RelativeLayout>
+
+
+
+    </RelativeLayout>
+</layout>
\ No newline at end of file

consumer/src/main/res/layout/fragment_activity.xml

@@ -116,9 +116,10 @@
 
                         <TextView
                             android:id="@+id/tv_no_more"
-                            android:layout_width="wrap_content"
+                            android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_centerHorizontal="true"
+                            android:layout_marginBottom="17dp"
                             android:gravity="center"
                             android:visibility="gone"
                             android:layout_below="@id/rv_search_goods_list"

consumer/src/main/res/layout/item_coupon_goods.xml

@@ -31,6 +31,8 @@
             android:text="单人沙发扶手椅"
             android:textSize="16sp"
             android:textColor="#FF333333"
+            android:singleLine="true"
+            android:ellipsize="end"
             />
 
         <LinearLayout