Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

plugin_member/src/main/java/com/rv.member/ConsumeRecordActivity.java

@@ -70,15 +70,6 @@ public class ConsumeRecordActivity extends BaseStatusActivity<CommonPresenter> i
         if (listBean != null && listBean.getData() != null) {
             pageCount = listBean.getData().getTotalPage();
             lists.addAll(listBean.getData().getData());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
-//            lists.add(new OrderListBean.DataBeanX.DataBean());
             adapter.notifyDataSetChanged();
         }
     }

plugin_member/src/main/java/com/rv.member/adapter/ConsumeRecordListAdapter.java

@@ -30,9 +30,6 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
     @Override
     protected void convert(BaseViewHolder helper, final OrderListBean.DataBeanX.DataBean bean) {
 
-        ImageView imgCarType = helper.itemView.findViewById(R.id.img_car_type);
-        GlideManager.getInstance(mContext).loadImage("https://xxtest.upyuns.com/image/admin/2019-06-27/4.png", imgCarType, 160, 160);
-
         if (bean != null) {
             if (!TextUtils.isEmpty(bean.getCrtTime())) {
                 helper.setText(R.id.tv_consume_time, "下单时间: " + bean.getCrtTime());
@@ -49,8 +46,8 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
                 helper.setText(R.id.tv_price, "¥" + bean.getOrderAmount());
 
                 if (!TextUtils.isEmpty(bean.getPicture())) {
-//                    ImageView imgCarType = helper.itemView.findViewById(R.id.img_car_type);
-                    GlideManager.getInstance(mContext).loadImage(bean.getPicture(), imgCarType);
+                    ImageView imgCarType = helper.itemView.findViewById(R.id.img_car_type);
+                    GlideManager.getInstance(mContext).loadImage(bean.getIcon(), imgCarType);
                 }
             }
             OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail vehicleDetail = bean.getOrderRentVehicleDetail();