Skip to content

T
TangKuPos
Commit f4473c31 authored by 陈前's avatar 陈前
Browse files
Options

UI

parent 2d7d2f15
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 434 additions and 433 deletions
app/src/main/java/com/xingdata/zzdpos/model/Ticket.java
View file @ f4473c31
......@@ -69,6 +69,8 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
private Long ticketNo;
private String vipName;
private Long vipId;
private Long ticketExp;
......@@ -91,6 +93,14 @@ public class Ticket extends SectionEntity<MediaStore.Video> implements BaseBean
private String mac;
public String getVipName() {
return vipName;
}
public void setVipName(String vipName) {
this.vipName = vipName;
}
public Long getId() {
return id;
}
......
app/src/main/java/com/xingdata/zzdpos/model/VipRechargeOrder.java
View file @ f4473c31
......@@ -18,7 +18,7 @@ import java.util.List;
public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements BaseOrderPrint, BaseBean {
private Long cardAmtPay;
private Long cardAmtSend;
private String orderNo;
private String cardNo;
private Long rechangeBefore;
private Long rechangeAfter;
private String vipName;
......@@ -26,6 +26,14 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
private String vipMobile;
private Long createTime;
public String getCardNo() {
return cardNo;
}
public void setCardNo(String cardNo) {
this.cardNo = cardNo;
}
public VipRechargeOrder(boolean isHeader, String header) {
super(isHeader, header);
}
......@@ -78,9 +86,6 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
this.rctraceNo = rctraceNo;
}
public void setOrderNo(String orderNo) {
this.orderNo = orderNo;
}
public String getVipMobile() {
return vipMobile;
......@@ -146,8 +151,8 @@ public class VipRechargeOrder extends SectionEntity<MediaStore.Video> implements
@Override
public String getOrderNo() {
if (orderNo != null && orderNo.length() != 0) {
return orderNo;
if (cardNo != null && cardNo.length() != 0) {
return cardNo;
}
return rctraceNo;
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ f4473c31
......@@ -99,6 +99,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
viewTicketBinding.tvAmt.setText(ConvertUtil.fenToYuan(ticket.getTicketValAmt(), true));
viewTicketBinding.setDate(com.blankj.utilcode.util.TimeUtils.date2String(ticket.getUpdateTime()));
viewTicketBinding.setOrderNo(ticket.getUseOrderNo());
viewTicketBinding.setVipName(ticket.getVipName());
}
......@@ -146,7 +147,7 @@ public class StatisticsDetailActivity extends BaseActivity<StatisticsDetailPrese
ViewVipRechargeBinding viewVipRechargeBinding = DataBindingUtil.bind(mViewBinding.viewVipRecharge.getRoot());
viewVipRechargeBinding.tvAmt.setText(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay() + vipRechargeOrder.getCardAmtSend(), true));
viewVipRechargeBinding.setDate(com.blankj.utilcode.util.TimeUtils.millis2String(vipRechargeOrder.getCreateTime()));
viewVipRechargeBinding.setOrderNo(vipRechargeOrder.getOrderNo());
viewVipRechargeBinding.setCardNo(vipRechargeOrder.getCardNo());
viewVipRechargeBinding.setVipName(vipRechargeOrder.getVipName());
viewVipRechargeBinding.setVipTel(vipRechargeOrder.getVipMobile());
viewVipRechargeBinding.setPayAmt(ConvertUtil.fenToYuan(vipRechargeOrder.getCardAmtPay(), false));
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java
View file @ f4473c31
......@@ -111,7 +111,7 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "");
mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
month--;
}
......@@ -130,7 +130,7 @@ public class OrderMainFragment extends BaseFragment<MainPresenter, FragmentOrder
}, 1);
for (int i = 0; i < fragments.size(); i++) {
if (month == 0) month = 12;
mViewBinding.tabLayout.getTabAt(i).setText(month + "");
mViewBinding.tabLayout.getTabAt(i).setText(month + "月");
month--;
}
}
......
app/src/main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
View file @ f4473c31
......@@ -85,7 +85,7 @@ public class RecyclerViewUtil {
@Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
super.getItemOffsets(outRect, view, parent, state);
outRect.top = mDividerHight;
outRect.top = mDividerHight + 1;
}
@Override
......@@ -99,7 +99,7 @@ public class RecyclerViewUtil {
public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) {
for (int i = 0; i < childCount - 1; i++) {
final View child = parent.getChildAt(i);
RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
......@@ -109,8 +109,8 @@ public class RecyclerViewUtil {
int bottom = 0;
bottom = child.getTop() - params.topMargin;
top = bottom - mDividerHight;
top = child.getTop() - params.topMargin;
bottom = top + mDividerHight;
//画分割线
mDividerDarwable.setBounds(left, top, right, bottom);
mDividerDarwable.draw(c);
......
app/src/main/res/layout/activity_other_select.xml
View file @ f4473c31
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
......@@ -13,6 +13,7 @@
layout="@layout/title_order" />
<View
android:layout_below="@id/ly_title"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" />
......@@ -28,6 +29,6 @@
</FrameLayout>
</LinearLayout>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_statistics_detail.xml
View file @ f4473c31
......@@ -64,10 +64,10 @@
style="@style/button_passive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:gravity="center"
android:stateListAnimator="@null"
android:text="@string/settle_print_receipt"
android:textSize="@dimen/all_text_size"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_return"
......@@ -79,9 +79,9 @@
style="@style/button_positive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:gravity="center"
android:stateListAnimator="@null"
android:text="@string/pay_return"
android:gravity="center"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_print"
......@@ -90,6 +90,11 @@
app:layout_goneMarginStart="@dimen/all_margin_big_big"
tools:targetApi="lollipop" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_order_main.xml
View file @ f4473c31
......@@ -16,7 +16,6 @@
android:layout_width="match_parent"
android:layout_height="30dp"
android:background="@color/white_caocao"
app:tabIndicatorHeight="0dp"
app:tabMinWidth="100dp"
app:tabMode="scrollable"
app:tabSelectedTextColor="#ff7a61"
......
app/src/main/res/layout/fragment_other_list.xml
View file @ f4473c31
......@@ -15,7 +15,7 @@
android:id="@+id/srl_product"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ll_title">
>
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_other_selcet"
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ f4473c31
......@@ -525,40 +525,32 @@
</android.support.v7.widget.RecyclerView>
<LinearLayout
<android.support.constraint.ConstraintLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/layout_statistics_bottom_height"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:background="@color/white_caocao"
android:elevation="@dimen/view_line_L2"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent">
<Button
<TextView
android:id="@+id/btn_cancel"
style="@style/button_passive"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding"
android:layout_weight="1"
android:stateListAnimator="@null"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="取消"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@id/btn_confirm"
app:layout_constraintRight_toLeftOf="@id/btn_ok"
app:layout_constraintTop_toTopOf="parent" />
<Button
<TextView
android:id="@+id/btn_ok"
style="@style/button_positive"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding"
android:layout_weight="1"
android:stateListAnimator="@null"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="定货提交"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -566,7 +558,7 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
<View
android:layout_width="match_parent"
......
app/src/main/res/layout/item_settle_saledetail.xml
View file @ f4473c31
......@@ -17,7 +17,7 @@
android:maxLines="2"
android:textColor="@color/black_baozheng"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="5"
app:layout_constraintHorizontal_weight="4"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_count"
app:layout_constraintTop_toTopOf="parent" />
......
app/src/main/res/layout/view_saledetail_header.xml
View file @ f4473c31
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<layout>
<LinearLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
......@@ -26,7 +26,7 @@
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:layout_weight="4"
android:gravity="start"
android:text="@string/cart_product_name"
android:textColor="@color/black_baozheng"
......
app/src/main/res/layout/view_ticket.xml
View file @ f4473c31
......@@ -15,6 +15,9 @@
name="orderNo"
type="String" />
<variable
name="vipName"
type="String" />
</data>
......@@ -95,92 +98,81 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="@dimen/all_padding"
android:paddingEnd="@dimen/dp_4"
android:paddingStart="@dimen/dp_4"
android:paddingTop="@dimen/dp_4"
android:weightSum="10">
android:weightSum="3">
<LinearLayout
android:layout_width="match_parent"
<TextView
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="7"
android:orientation="vertical">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/ticket_detail_date"
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/ticket_detail_no"
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="right"
android:orientation="vertical"
android:weightSum="2">
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui" />
<TextView
style="@style/textView_body_small"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui" />
</LinearLayout>
android:layout_weight="1"
android:singleLine="true"
android:text="会员名："
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{vipName}"
android:textColor="@color/black_likui" />
</LinearLayout>
<View
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu" />
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L1"
android:background="@color/gray_zhouyu" />
<TextView
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:text="使用时间："
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_goods_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_padding"
android:orientation="vertical"
android:padding="@dimen/dp_4"
android:visibility="gone">
android:orientation="horizontal"
android:weightSum="3">
<TextView
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:singleLine="true"
android:text="销售单号："
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/values/colors.xml
View file @ f4473c31
......@@ -127,7 +127,7 @@
<color name="gray_zhouyu">#f6f6f6</color>
<color name="gray_huanggai">#afb9c3</color>
<color name="gray_kongming">#e6e6e6</color>
<color name="gray_kongming">#dddddd</color>
<color name="white_caocao">#ffffff</color>
......
app/src/main/res/values/dimens.xml
View file @ f4473c31
......@@ -215,8 +215,7 @@
<!--统计条目-->
<dimen name="item_statistics_height">72dp</dimen>
<dimen name="layout_statistics_bottom_height">56dp</dimen>
<dimen name="layout_statistics_bottom_button_height">35dp</dimen>
<dimen name="layout_statistics_bottom_button_width">105dp</dimen>
<!--新标准-->
<dimen name="headline">20dp</dimen>
......
app/src/main/res/values/strings.xml
View file @ f4473c31
......@@ -672,6 +672,7 @@
<!--商品详情POS-->
<string name="oder_detail_date">交易时间:</string>
<string name="oder_detail_no">订单号:</string>
<string name="oder_detail_card_no">卡号:</string>
<string name="oder_detail_oper">收银员:</string>
<string name="oder_detail_payType">收款方式:</string>
<string name="oder_detail_goodsNum">商品总数:</string>
......
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