Skip to content

R
RvApp
Commit cc39f6e9 authored by linfeng's avatar linfeng
Browse files
Options

开发票功能列表

parent d131e3a4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1324 additions and 58 deletions
module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java
View file @ cc39f6e9
......@@ -63,14 +63,14 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
menuPosition = intent.getIntExtra("position", 0);
titleView.setTitle(mActivity.getString(R.string.rv_my_order));
// titleView.setText(R.id.tv_title_right, "开发票");
// titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
// @Override
// public void onClick(View v) {
// ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
// .navigation();
// }
// });
titleView.setText(R.id.tv_title_right, "开发票");
titleView.setChildClickListener(R.id.tv_title_right, new View.OnClickListener() {
@Override
public void onClick(View v) {
ARouter.getInstance().build(Constance.ACTIVITY_URL_INVOICINGACTIVITY)
.navigation();
}
});
initRecyclerView();
initViewpager();
......
module_mine/src/main/res/layout/rv_item_mine_collection_travel.xml
View file @ cc39f6e9
......@@ -45,17 +45,18 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textSize="@dimen/text_10"
android:text="20人待出发"
android:textColor="@color/textGray"
android:text="20人待出发" />
android:textSize="@dimen/text_10"
android:visibility="gone" />
<TextView
android:id="@+id/tv_tour_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="¥5000/人"
android:textColor="@color/colorBg"
android:textSize="@dimen/text_14"
android:text="¥5000/人" />
android:textSize="@dimen/text_14" />
</LinearLayout>
</RelativeLayout>
......
plugin_invoice/src/main/java/com/xxrv/invoice/activity/BillingHistoryActivity.java
View file @ cc39f6e9
......@@ -5,18 +5,27 @@ import android.content.Intent;
import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.xxrv.invoice.R;
import com.xxrv.invoice.R2;
import com.xxrv.invoice.adapter.InvoiceBillingHistoryAdapter;
import com.xxrv.invoice.api.InvoiceApi;
import com.xxrv.invoice.bean.BillingHistoryBean;
import com.xxrv.invoice.presenter.InvoicePresenter;
import com.yuyife.okgo.OkGoUtil;
import java.sql.Array;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
......@@ -24,15 +33,20 @@ import butterknife.ButterKnife;
/**
* 开票历史
*/
public class BillingHistoryActivity extends BaseStatusActivity<InvoicePresenter> {
public class BillingHistoryActivity extends BaseStatusActivity<InvoicePresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
@BindView(R2.id.rv_content)
RecyclerView rvContent;
@BindView(R2.id.iv_noorder_hint)
ImageView ivNoorderHint;
@BindView(R2.id.refresh)
SimpleRefreshLayout mSimpleRefreshLayout;
private InvoiceBillingHistoryAdapter adapter;
private int mPage;
private int countPage;
public static Intent getIntent(Context context) {
return new Intent(context, BillingHistoryActivity.class);
}
......@@ -48,21 +62,69 @@ public class BillingHistoryActivity extends BaseStatusActivity<InvoicePresenter>
adapter = new InvoiceBillingHistoryAdapter();
rvContent.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
adapter.setOnLoadMoreListener(this, rvContent);
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(this));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
rvContent.setAdapter(adapter);
}
setData();
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
onRefresh();
}
private void setData() {
ArrayList<String> list = new ArrayList<>();
for (int i = 0; i < 5; i++) {
list.add("33333");
}
adapter.addData(list);
private void getloadData(int page) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, InvoiceApi.HTTP_URL_INVOICE_SELECTBYTYPE, BillingHistoryBean.class, headMap, true);
}
@Override
public void onShowResult(int requestType, BaseBean result) {
switch (requestType) {
case 0:
setData((BillingHistoryBean) result);
break;
}
}
@Override
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
private void setData(BillingHistoryBean bean) {
if (mPage == 1) {
countPage = bean.getData().getTotalPage();
adapter.setNewData(bean.getData().getData());
mSimpleRefreshLayout.onRefreshComplete();
if (bean.getData().getTotalCount() == 0) {
ivNoorderHint.setVisibility(View.VISIBLE);
adapter.notifyDataSetChanged();
} else {
ivNoorderHint.setVisibility(View.GONE);
}
} else {
adapter.addData(bean.getData().getData());
adapter.loadMoreComplete();
}
}
@Override
public void onLoadMoreRequested() {
if (mPage >= countPage) {
adapter.loadMoreEnd();
} else {
mPage++;
getloadData(mPage);
}
}
@Override
public void onRefresh() {
mPage = 1;
getloadData(mPage);
}
}
plugin_invoice/src/main/java/com/xxrv/invoice/activity/InvoicingActivity.java
View file @ cc39f6e9
......@@ -53,14 +53,16 @@ public class InvoicingActivity extends BaseStatusActivity<InvoicePresenter> {
if (id == R.id.rl_item_announcement) {
showAnnouncement();
} else if (id == R.id.rl_item_car) {
startActivity(OrderInvoicingCarActivity.getIntent(mActivity));
//租房车
startActivity(OrderInvoicingCarActivity.getIntent(mActivity, 1));
} else if (id == R.id.rl_item_tourism) {
//房车游
startActivity(OrderInvoicingCarActivity.getIntent(mActivity, 2));
} else if (id == R.id.rl_item_member) {
//会员
startActivity(OrderInvoicingCarActivity.getIntent(mActivity, 3));
} else if (id == R.id.rl_item_billing_history) {
//开票历史
startActivity(BillingHistoryActivity.getIntent(mActivity));
} else if (id == R.id.rl_item_invoicing_help) {
......
plugin_invoice/src/main/java/com/xxrv/invoice/activity/OrderInvoicingCarActivity.java
View file @ cc39f6e9
......@@ -8,23 +8,30 @@ import android.support.v7.widget.RecyclerView;
import android.view.View;
import android.widget.CheckBox;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.alibaba.android.arouter.launcher.ARouter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.frame.base.url.Constance;
import com.frame.rv.config.RvFrameConfig;
import com.ruiwenliu.wrapper.base.BaseBean;
import com.ruiwenliu.wrapper.base.BaseStatusActivity;
import com.ruiwenliu.wrapper.weight.TitleView;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.xxrv.invoice.R;
import com.xxrv.invoice.R2;
import com.xxrv.invoice.adapter.OrderInvoicingCarAdapter;
import com.xxrv.invoice.api.InvoiceApi;
import com.xxrv.invoice.bean.OrderInvoicingCarBean;
import com.xxrv.invoice.presenter.InvoicePresenter;
import com.yuyife.okgo.OkGoUtil;
import java.util.ArrayList;
import java.math.BigDecimal;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import butterknife.BindView;
import butterknife.ButterKnife;
......@@ -33,7 +40,7 @@ import butterknife.OnClick;
/**
* 租车开发票订单列表
*/
public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresenter> {
public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresenter> implements BaseQuickAdapter.RequestLoadMoreListener, SimpleRefreshLayout.OnSimpleRefreshListener {
@BindView(R2.id.rv_content)
RecyclerView rvContent;
......@@ -47,13 +54,26 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
ImageView ivNoorderHint;
@BindView(R2.id.tv_item_next)
TextView tvItemNext;
@BindView(R2.id.refresh)
SimpleRefreshLayout mSimpleRefreshLayout;
@BindView(R2.id.ll_item_hint)
LinearLayout llItemHint;
@BindView(R2.id.ll_item_bottom)
LinearLayout llItemBottom;
private OrderInvoicingCarAdapter mAdapter;
private boolean isCheckAll = true;
public static Intent getIntent(Context context) {
return new Intent(context, OrderInvoicingCarActivity.class);
private int mPage;
private int countPage;
private int type;
public static Intent getIntent(Context context, int type) {
return new Intent(context, OrderInvoicingCarActivity.class)
.putExtra("type", type);
}
@Override
......@@ -65,8 +85,13 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
titleView.setTitle("按订单开票");
type = intent.getIntExtra("type", 1);
mAdapter = new OrderInvoicingCarAdapter();
rvContent.setLayoutManager(new LinearLayoutManager(mActivity, LinearLayoutManager.VERTICAL, false));
mAdapter.setOnLoadMoreListener(this, rvContent);
mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(this));
mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
rvContent.setAdapter(mAdapter);
......@@ -86,14 +111,18 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
}
}
});
setData();
}
private void getCountSelectData() {
List<OrderInvoicingCarBean.DataBeanX.DataBean> selectItem = mAdapter.getSelectItem();
tvNumber.setText(String.valueOf(selectItem.size()));
double totalPrice = 0;
if (selectItem != null && selectItem.size() > 0) {
for (int i = 0; i < selectItem.size(); i++) {
totalPrice = totalPrice + selectItem.get(i).getRealAmount();
}
}
tvPrice.setText(String.valueOf(new BigDecimal(totalPrice).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue()));
if (selectItem.size() > 0) {
tvItemNext.setBackgroundResource(R.drawable.shape_rv_bg_shallow_dark_yellow_circle);
......@@ -114,24 +143,21 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
}
}
private void setData() {
ArrayList<OrderInvoicingCarBean.DataBeanX.DataBean> objects = new ArrayList<>();
for (int i = 0; i < 5; i++) {
objects.add(new OrderInvoicingCarBean.DataBeanX.DataBean());
}
mAdapter.addData(objects);
}
@Override
public void onShowResult(int requestType, BaseBean result) {
mSimpleRefreshLayout.onRefreshComplete();
switch (requestType) {
case 0:
processData((OrderInvoicingCarBean) result);
break;
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
public void onShowError(String errorMsg, int errorType) {
super.onShowError(errorMsg, errorType);
mSimpleRefreshLayout.onRefreshComplete();
}
@OnClick({R2.id.tv_item_hint, R2.id.cb_all, R2.id.tv_item_next})
......@@ -159,4 +185,87 @@ public class OrderInvoicingCarActivity extends BaseStatusActivity<InvoicePresent
startActivity(OrderInvoicingCarDetailsActivity.getIntent(mActivity));
}
}
@Override
protected void loadData(Bundle savedInstanceState, Intent intent) {
onRefresh();
}
@Override
public void onRefresh() {
mPage = 1;
orderData(mPage);
// tvItemNext.setBackgroundResource(R.drawable.shape_rv_bg_shallow_dark_yellow_circle2);
// tvItemNext.setEnabled(false);
// tvNumber.setText("0");
// tvPrice.setText("0.0");
}
private void orderData(int page) {
Map<String, Object> headMap = new LinkedHashMap<>();
if (OkGoUtil.getToken() != null)
headMap.put("Authorization", OkGoUtil.getToken());
Map<String, Object> mapData = new LinkedHashMap<>();
mapData.put("page", page);
mapData.put("limit", 10);
mapData.put("multiStatus", "6,-1");
mapData.put("type", type); //"订单类型 1--租车；2--旅游; 3--会员订单")
mapData.put("invoiceStatus", "0"); //"开票状态，0未开票，1已开票
mPresenter.getData(RvFrameConfig.VEHICLE_ORDER, 0, InvoiceApi.HTTP_URL_ORDER_LIST, OrderInvoicingCarBean.class, mapData, headMap, page == 1 ? true : false);
}
/**
* 处理请求数据
*
* @param bean
*/
private void processData(OrderInvoicingCarBean bean) {
if (mPage == 1) {
countPage = bean.getData().getTotalPage();
mAdapter.setNewData(bean.getData().getData());
mSimpleRefreshLayout.onRefreshComplete();
if (bean.getData().getTotalCount() == 0) {
llItemHint.setVisibility(View.GONE);
llItemBottom.setVisibility(View.GONE);
ivNoorderHint.setVisibility(View.VISIBLE);
mAdapter.notifyDataSetChanged();
} else {
llItemHint.setVisibility(View.VISIBLE);
llItemBottom.setVisibility(View.VISIBLE);
ivNoorderHint.setVisibility(View.GONE);
}
} else {
mAdapter.addData(bean.getData().getData());
mAdapter.loadMoreComplete();
}
getCountSelectData();
if (mAdapter.getData().size() != mAdapter.getSelectItem().size()) {
cbAll.setChecked(false);
isCheckAll = true;
} else {
cbAll.setChecked(true);
isCheckAll = false;
}
}
@Override
public void onLoadMoreRequested() {
if (mPage >= countPage) {
mAdapter.loadMoreEnd();
} else {
mPage++;
orderData(mPage);
}
}
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// TODO: add setContentView(...) invocation
ButterKnife.bind(this);
}
}
plugin_invoice/src/main/java/com/xxrv/invoice/adapter/InvoiceBillingHistoryAdapter.java
View file @ cc39f6e9
......@@ -2,20 +2,33 @@ package com.xxrv.invoice.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.rv.component.utils.DateUtils;
import com.xxrv.invoice.R;
import com.xxrv.invoice.bean.BillingHistoryBean;
/**
* 开票历史 item
*/
public class InvoiceBillingHistoryAdapter extends BaseQuickAdapter<String, BaseViewHolder> {
public class InvoiceBillingHistoryAdapter extends BaseQuickAdapter<BillingHistoryBean.DataBeanX.DataBean, BaseViewHolder> {
public InvoiceBillingHistoryAdapter() {
super(R.layout.rv_item_invoice_billing_history);
}
@Override
protected void convert(BaseViewHolder helper, String item) {
protected void convert(BaseViewHolder helper, BillingHistoryBean.DataBeanX.DataBean item) {
helper.setText(R.id.tv_date, DateUtils.timestampToString1(item.getCrtTime()));
helper.setText(R.id.tv_type, item.getTitleName());
helper.setText(R.id.tv_price, String.valueOf(item.getAmount()));
if ("1".equals(item.getType())) { //"订单类型 1--租车；2--旅游; 3--会员订单")
helper.setText(R.id.tv_title, "租房车");
} else if ("2".equals(item.getType())) {
helper.setText(R.id.tv_title, "房车游");
} else if ("3".equals(item.getType())) {
helper.setText(R.id.tv_title, "会员");
}
}
}
plugin_invoice/src/main/java/com/xxrv/invoice/adapter/OrderInvoicingCarAdapter.java
View file @ cc39f6e9
......@@ -2,6 +2,7 @@ package com.xxrv.invoice.adapter;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.rv.component.utils.DateUtils;
import com.xxrv.invoice.R;
import com.xxrv.invoice.bean.OrderInvoicingCarBean;
......@@ -26,10 +27,33 @@ public class OrderInvoicingCarAdapter extends BaseQuickAdapter<OrderInvoicingCar
helper.setChecked(R.id.cb_select, false);
}
helper.setText(R.id.tv_name, item.getName());
OrderInvoicingCarBean.DataBeanX.DataBean.OrderRentVehicleDetail orderRentVehicleDetail = item.getOrderRentVehicleDetail();
OrderInvoicingCarBean.DataBeanX.DataBean.OrderTourDetail orderTourDetail = item.getOrderTourDetail();
OrderInvoicingCarBean.DataBeanX.DataBean.OrderMemberDetail orderMemberDetail = item.getOrderMemberDetail();
if (orderRentVehicleDetail != null) {
helper.setText(R.id.tv_type, "租房车");
helper.setText(R.id.tv_get_date, "取：" + DateUtils.timestampToString1(orderRentVehicleDetail.getStart_time()) + orderRentVehicleDetail.getStart_addr());
helper.setText(R.id.tv_out_date, "还：" + DateUtils.timestampToString1(orderRentVehicleDetail.getEnd_time()) + orderRentVehicleDetail.getEnd_addr());
helper.setText(R.id.tv_price, String.format("¥%1$s", item.getRealAmount()));
} else if (orderTourDetail != null) {
helper.setText(R.id.tv_type, "房车游");
helper.setText(R.id.tv_get_date, "出发时间：" + DateUtils.timestampToString1(orderTourDetail.getStartTime()));
helper.setText(R.id.tv_out_date, "人数：" + orderTourDetail.getTotalNumber() + "人");
helper.setText(R.id.tv_price, String.format("¥%1$s", item.getRealAmount()));
} else if (orderMemberDetail != null) {
helper.setText(R.id.tv_type, "会员");
helper.setText(R.id.tv_get_date, orderMemberDetail.getContent());
helper.setText(R.id.tv_out_date, item.getCrtTime());
helper.setText(R.id.tv_price, String.format("¥%1$s", item.getRealAmount()));
}
helper.addOnClickListener(R.id.ll_item_bg);
helper.addOnClickListener(R.id.cb_select);
}
public int getPosition(OrderInvoicingCarBean.DataBeanX.DataBean item) {
return mData.indexOf(item);
}
......
plugin_invoice/src/main/java/com/xxrv/invoice/api/InvoiceApi.java
View file @ cc39f6e9
......@@ -5,4 +5,8 @@ import com.frame.rv.config.RvFrameConfig;
public class InvoiceApi {
public static String HTTP_URL_CAR_TYPE_NOTICE = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/notice.html";//预定须知
public static String HTTP_URL_ORDER_LIST = RvFrameConfig.VEHICLE_ORDER + "baseOrder/page";//订单列表
public static String HTTP_URL_INVOICE_SELECTBYTYPE = RvFrameConfig.HOST + "/api/order/order/invoice/selectByType";//开票记录
}
plugin_invoice/src/main/java/com/xxrv/invoice/bean/BillingHistoryBean.java 0 → 100644
View file @ cc39f6e9
package com.xxrv.invoice.bean;
import com.ruiwenliu.wrapper.base.BaseBean;
import java.io.Serializable;
import java.util.List;
/**
* 开票记录
*/
public class BillingHistoryBean extends BaseBean {
private DataBeanX data;
private int code;
public DataBeanX getData() {
return data;
}
public void setData(DataBeanX data) {
this.data = data;
}
public int getCode() {
return code;
}
public void setCode(int code) {
this.code = code;
}
public static class DataBeanX {
private int totalCount;
private int totalPage;
private int pageNum;
private List<DataBean> data;
public int getTotalCount() {
return totalCount;
}
public void setTotalCount(int totalCount) {
this.totalCount = totalCount;
}
public int getTotalPage() {
return totalPage;
}
public void setTotalPage(int totalPage) {
this.totalPage = totalPage;
}
public int getPageNum() {
return pageNum;
}
public void setPageNum(int pageNum) {
this.pageNum = pageNum;
}
public List<DataBean> getData() {
return data;
}
public void setData(List<DataBean> data) {
this.data = data;
}
public static class DataBean implements Serializable {
private String id;
private String type;
private String orderIds;
private String titleType;
private String titleName;
private String taxCode;
private String contentRemark;
private String contentContact;
private String contentAccount;
private String drawer;
private double amount;
private String receiveType;
private String receiveContent;
private long crtTime;
private long updTime;
private String userId;
public String getId() {
return id;
}
public void setId(String id) {
this.id = id;
}
public String getType() {
return type;
}
public void setType(String type) {
this.type = type;
}
public String getOrderIds() {
return orderIds;
}
public void setOrderIds(String orderIds) {
this.orderIds = orderIds;
}
public String getTitleType() {
return titleType;
}
public void setTitleType(String titleType) {
this.titleType = titleType;
}
public String getTitleName() {
return titleName;
}
public void setTitleName(String titleName) {
this.titleName = titleName;
}
public String getTaxCode() {
return taxCode;
}
public void setTaxCode(String taxCode) {
this.taxCode = taxCode;
}
public String getContentRemark() {
return contentRemark;
}
public void setContentRemark(String contentRemark) {
this.contentRemark = contentRemark;
}
public String getContentContact() {
return contentContact;
}
public void setContentContact(String contentContact) {
this.contentContact = contentContact;
}
public String getContentAccount() {
return contentAccount;
}
public void setContentAccount(String contentAccount) {
this.contentAccount = contentAccount;
}
public String getDrawer() {
return drawer;
}
public void setDrawer(String drawer) {
this.drawer = drawer;
}
public double getAmount() {
return amount;
}
public void setAmount(double amount) {
this.amount = amount;
}
public String getReceiveType() {
return receiveType;
}
public void setReceiveType(String receiveType) {
this.receiveType = receiveType;
}
public String getReceiveContent() {
return receiveContent;
}
public void setReceiveContent(String receiveContent) {
this.receiveContent = receiveContent;
}
public long getCrtTime() {
return crtTime;
}
public void setCrtTime(long crtTime) {
this.crtTime = crtTime;
}
public long getUpdTime() {
return updTime;
}
public void setUpdTime(long updTime) {
this.updTime = updTime;
}
public String getUserId() {
return userId;
}
public void setUserId(String userId) {
this.userId = userId;
}
}
}
}
plugin_invoice/src/main/res/layout/activity_billing_history.xml
View file @ cc39f6e9
......@@ -4,11 +4,17 @@
android:layout_height="match_parent"
android:background="@color/colorGrayBg">
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
<ImageView
android:id="@+id/iv_noorder_hint"
......
plugin_invoice/src/main/res/layout/activity_order_invoicing_car.xml
View file @ cc39f6e9
......@@ -10,6 +10,7 @@
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_item_hint"
android:layout_width="match_parent"
android:layout_height="@dimen/size_40"
android:background="@color/colorWrite"
......@@ -27,15 +28,20 @@
android:textSize="@dimen/text_14" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
<com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
android:id="@+id/refresh"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
android:layout_weight="1">
<android.support.v7.widget.RecyclerView
android:id="@+id/rv_content"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout>
<LinearLayout
android:id="@+id/ll_item_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
......@@ -108,8 +114,8 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:background="@drawable/shape_rv_bg_shallow_dark_yellow_circle2"
android:gravity="center"
android:enabled="false"
android:gravity="center"
android:text="下一步"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
......
plugin_invoice/src/main/res/layout/rv_item_order_invoicing_car.xml
View file @ cc39f6e9
......@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="2"
android:maxLines="1"
android:text="取：2019-05-15 10:00 欣新房车控股集团（东莞市）"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......@@ -78,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:ellipsize="end"
android:maxLines="2"
android:maxLines="1"
android:text="还：2019-05-17 10:00 欣新房车控股集团（东莞市）"
android:textColor="@color/textGray"
android:textSize="@dimen/text_12" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment