Skip to content

T
TangKuPos
Commit efd8524d authored by 王海's avatar 王海
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents b0582c13 8fef851e
Hide whitespace changes
Inline Side-by-side
Showing with 614 additions and 610 deletions
app/build.gradle
View file @ efd8524d
......@@ -66,7 +66,7 @@ dependencies {
compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
compile 'io.reactivex.rxjava2:rxjava:2.1.5'
compile 'io.reactivex.rxjava2:rxandroid:2.0.1'
compile 'com.alibaba:fastjson:1.2.39'
compile 'com.alibaba:fastjson:1.1.67.android'
compile 'com.blankj:utilcode:1.11.1'
compile 'com.facebook.fresco:fresco:1.5.0'
compile 'com.facebook.fresco:animated-gif:1.5.0'
......
app/src/main/java/com/xingdata/zzdpos/model/Saleorder.java
View file @ efd8524d
......@@ -17,8 +17,6 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import io.realm.annotations.Ignore;
/**
* 订单
......@@ -505,7 +503,8 @@ public class Saleorder extends SectionEntity<MediaStore.Video> implements BaseMo
private Long createTime;
private Salepay salepay;
@Ignore
@JSONField(serialize = false)
private String PayName;
private List<Saledetail> saledetailList;
......
app/src/main/java/com/xingdata/zzdpos/model/Ticket.java
View file @ efd8524d
......@@ -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 @ efd8524d
......@@ -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/manage/sssku/fragment/SkugrpFragment.java
View file @ efd8524d
......@@ -54,7 +54,7 @@ public class SkugrpFragment extends BaseFragment<SsskuPresenter, FragmentSsskuSk
public void loadSkugrps(List<Sskugrp> sskugrps) {
mSskugrps = sskugrps;
if (mSkugrpAdapter == null) return;
mSkugrpAdapter.notifyDataSetChanged();
mSkugrpAdapter.setNewData(mSskugrps);
mViewBinding.setVisibility(sskugrps.size() > 0 ? View.VISIBLE : View.INVISIBLE);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/settle/fragment/VipFragment.java
View file @ efd8524d
......@@ -40,10 +40,6 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
mPresenter.selectVip(mVipAdapter.getData().get(position));
this.pop();
});
mViewBinding.llNone.setOnClickListener(view -> {
mPresenter.selectVip(Vip.createDefault());
this.pop();
});
}
/**
......@@ -54,6 +50,10 @@ public class VipFragment extends BaseFragment<SettlePresenter, FragmentSettleVip
public void loadVips(List<Vip> vips) {
mViewBinding.setEmpty(vips.size() == 0);
mVipAdapter.setNewData(vips);
if (vips.size() == 1) {
mPresenter.selectVip(vips.get(0));
this.pop();
}
}
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsDetailActivity.java
View file @ efd8524d
......@@ -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/StatisticsTitleFragment.java
View file @ efd8524d
......@@ -96,6 +96,9 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
return false;
});
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.tvTitle.setText("订单记录");
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/order/OrderMainFragment.java
View file @ efd8524d
......@@ -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 @ efd8524d
......@@ -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/drawable/shape_gray_r2.xml
View file @ efd8524d
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/settle_btn_radius" />
<corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/gray_kongming" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_ms.xml
View file @ efd8524d
......@@ -47,7 +47,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="number"
android:labelFor="@+id/et_search"
......
app/src/main/res/layout/activity_other_select.xml
View file @ efd8524d
<?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"
......@@ -12,22 +12,18 @@
android:id="@+id/ly_title"
layout="@layout/title_order" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" />
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
android:layout_below="@id/ly_title">
</FrameLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title"
android:background="@color/gray_huanggai" />
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/activity_settle.xml
View file @ efd8524d
......@@ -45,7 +45,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="number"
android:labelFor="@+id/et_search"
......
app/src/main/res/layout/activity_sssku.xml
View file @ efd8524d
......@@ -49,7 +49,6 @@
android:id="@+id/et_search"
style="@style/searchBarEditor"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:inputType="text"
android:labelFor="@+id/et_search"
......
app/src/main/res/layout/activity_statistics_detail.xml
View file @ efd8524d
......@@ -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/activity_store.xml
View file @ efd8524d
......@@ -193,17 +193,15 @@
<TextView
android:id="@+id/tv_settle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/button2_width"
android:layout_height="@dimen/button2_height"
android:layout_marginEnd="@dimen/all_margin"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:gravity="center"
android:text="@string/store_btn_settle"
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toTopOf="@id/fl_cart"
app:layout_constraintRight_toRightOf="@id/fl_cart"
app:layout_constraintTop_toBottomOf="@id/fl_cart" />
......
app/src/main/res/layout/dialog_prompt.xml
View file @ efd8524d
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:gravity="center"
android:orientation="vertical">
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:gravity="center"
android:orientation="vertical">
<RelativeLayout
android:layout_width="@dimen/prompt_dialog_width"
android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/store_back"
android:background="@color/white_caocao"
android:gravity="center"
android:orientation="vertical"
android:paddingTop="@dimen/all_margin">
>
<LinearLayout
android:layout_width="match_parent"
......@@ -33,74 +33,92 @@
android:gravity="center"
android:orientation="vertical">
<com.github.ybq.android.spinkit.SpinKitView
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/spin_kit"
style="@style/SpinKitView.Circle"
android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginTop="@dimen/all_padding_left_right"
android:visibility="gone"
app:SpinKit_Color="@color/black"/>
app:SpinKit_Color="@color/black" />
<ImageView
android:id="@+id/iv_logo"
android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_centerHorizontal="true"
android:src="@mipmap/prompt_dialog_success"/>
android:src="@mipmap/prompt_dialog_success" />
<ScrollView
android:layout_width="match_parent"
android:layout_height="70dp">
android:layout_height="@dimen/list2_height">
<TextView
android:id="@+id/tv_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginTop="@dimen/all_padding_left_right"
android:gravity="center"
android:text="正在处理，请稍后."
android:textColor="@color/succ"
android:textSize="@dimen/text_secondary_title"/>
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
</ScrollView>
<Button
android:id="@+id/btn_custom"
style="@style/button_positive_allradius"
android:layout_width="@dimen/dialog_button_width"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:text="重新获取"/>
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:layout_marginBottom="@dimen/all_padding_left_right"
android:text="重新获取" />
</LinearLayout>
<LinearLayout
<android.support.constraint.ConstraintLayout
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="@dimen/list2_height"
android:layout_alignParentBottom="true"
android:orientation="horizontal"
android:visibility="gone">
<Button
android:id="@+id/btn_cancel"
style="@style/button_positive_bg_gray_noradius"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="取消"/>
style="@style/button_passive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="取消"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_ok"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/btn_ok"
style="@style/button_positive_noradius"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="确认"/>
</LinearLayout>
style="@style/button_positive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="确认"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="@dimen/view_line_L050"
android:layout_height="match_parent"
android:background="@color/gray_huanggai"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout>
</LinearLayout>
......
app/src/main/res/layout/fragment_ms_list.xml
View file @ efd8524d
......@@ -53,7 +53,7 @@
android:id="@+id/ll_empty"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/white_caocao"
android:background="@color/gray_zhouyu"
android:gravity="center"
android:orientation="vertical"
android:visibility="gone"
......
app/src/main/res/layout/fragment_order_main.xml
View file @ efd8524d
......@@ -5,18 +5,32 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:background="@color/white_caocao"
tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout -->
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_marginEnd="@dimen/all_padding_left_right"
android:layout_marginStart="@dimen/all_padding_left_right"
android:layout_marginTop="@dimen/padding_small"
android:layout_marginBottom="@dimen/padding_small"
android:layout_height="30dp"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
android:layout_below="@id/tab_layout"
/>
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
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"
......@@ -27,7 +41,7 @@
android:id="@+id/viewPager_data"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/tab_layout"
android:layout_below="@id/ed_title"
android:layout_marginTop="-1dp"
android:background="@color/gray">
......@@ -39,6 +53,10 @@
android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/viewPager_data"
android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/ed_title"
android:background="@color/gray_huanggai" />
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_other_list.xml
View file @ efd8524d
......@@ -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_pay_result.xml
View file @ efd8524d
......@@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_time"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_time"
......@@ -77,7 +77,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<LinearLayout
......@@ -94,7 +94,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_type"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_type"
......@@ -102,7 +102,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<LinearLayout
......@@ -118,7 +118,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_count"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_count"
......@@ -126,7 +126,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
<LinearLayout
......@@ -142,7 +142,7 @@
android:layout_height="wrap_content"
android:text="@string/settle_pay_order_amt"
android:textColor="@color/black_zhangfei"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
<TextView
android:id="@+id/tv_order_amt"
......@@ -150,7 +150,7 @@
android:layout_height="wrap_content"
android:gravity="end"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_caption_size" />
android:textSize="@dimen/all_body_size" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ efd8524d
......@@ -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/fragment_settle.xml
View file @ efd8524d
......@@ -80,7 +80,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_vip"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/list3_height"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground">
......@@ -336,30 +336,18 @@
android:paddingStart="@dimen/all_margin" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@color/white_caocao"
android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
......@@ -385,9 +373,24 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginStart="@dimen/all_margin"
android:background="@color/gray_kongming" />
android:background="@color/gray_huanggai" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_vip"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:orientation="vertical"
android:visibility="@{defualtVip?View.GONE:View.VISIBLE}">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<LinearLayout
android:id="@+id/ll_ticket"
......@@ -563,16 +566,14 @@
<TextView
android:id="@+id/tv_settle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/button2_width"
android:layout_height="@dimen/button2_height"
android:background="@drawable/shape_red_round_rectangle_more_round"
android:foreground="?android:attr/actionBarItemBackground"
android:paddingBottom="@dimen/all_spacing"
android:paddingEnd="@dimen/all_margin_big"
android:paddingStart="@dimen/all_margin_big"
android:paddingTop="@dimen/all_spacing"
android:gravity="center"
android:text="@string/settle_btn_expand"
android:textColor="@color/white_caocao" />
android:textColor="@color/white_caocao"
android:textSize="@dimen/all_text_size" />
</LinearLayout>
<View
......
app/src/main/res/layout/fragment_settle_vip.xml
View file @ efd8524d
......@@ -18,49 +18,6 @@
android:background="@color/gray_zhouyu"
android:orientation="vertical">
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_gravity="bottom"
android:layout_marginTop="@dimen/all_spacing"
android:background="@color/gray_huanggai" />
<LinearLayout
android:id="@+id/ll_none"
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground"
android:gravity="center"
android:paddingEnd="@dimen/all_margin"
android:paddingStart="@dimen/all_margin">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/settle_vip_none"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:button="@mipmap/but_elect02" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginBottom="@dimen/all_margin"
android:background="@color/gray_huanggai"
android:visibility="@{empty?View.GONE:View.VISIBLE}" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray_huanggai" />
<android.support.v7.widget.RecyclerView
android:id="@+id/rl_vip"
......
app/src/main/res/layout/item_inventory_goods.xml
View file @ efd8524d
......@@ -10,6 +10,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/singleline_white_gray"
android:paddingBottom="@dimen/all_padding">
......
app/src/main/res/layout/item_menu_bottom.xml
View file @ efd8524d
......@@ -8,6 +8,7 @@
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:gravity="center"
android:foreground="?attr/selectableItemBackground"
android:orientation="vertical">
<ImageView
......
app/src/main/res/layout/item_replenishment.xml
View file @ efd8524d
......@@ -40,6 +40,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/singleline_white_gray">
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ efd8524d
......@@ -12,6 +12,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:foreground="?attr/selectableItemBackground"
android:background="@drawable/singleline_white_gray"
android:padding="@dimen/all_padding">
......@@ -29,6 +30,7 @@
android:layout_marginEnd="@dimen/all_padding_left_right"
android:layout_marginStart="@dimen/all_padding_left_right"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" />
......@@ -61,6 +63,7 @@
android:padding="@dimen/dp_4"
android:text="规格"
android:textSize="@dimen/all_text_size_small"
android:layout_marginEnd="@dimen/all_padding_left_right"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
......@@ -94,6 +97,7 @@
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
android:layout_height="@dimen/dialog_cart_item_button_height"
android:layout_marginEnd="@dimen/all_padding"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
......@@ -103,7 +107,7 @@
android:id="@+id/btn_down"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding"
android:layout_weight="1"
android:background="@color/white"
android:src="@mipmap/but_reduce" />
......@@ -127,7 +131,7 @@
android:id="@+id/btn_up"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/all_margin"
android:layout_marginStart="@dimen/all_padding"
android:layout_weight="1"
android:background="@color/white"
android:src="@mipmap/but_add"
......@@ -158,27 +162,27 @@
app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toTopOf="@id/tv_stock_hint" />
<TextView
android:id="@+id/tv_traffic_hint"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_margin_big"
android:text="在途："
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_stock"
app:layout_constraintStart_toEndOf="@id/tv_stock"
app:layout_constraintTop_toTopOf="@id/tv_stock" />
<TextView
android:id="@+id/tv_traffic"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0个"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"
app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />
<!--<TextView-->
<!--android:id="@+id/tv_traffic_hint"-->
<!--style="@style/other_select_smallstyle"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_marginStart="@dimen/all_margin_big"-->
<!--android:text="在途："-->
<!--android:textStyle="bold"-->
<!--app:layout_constraintBottom_toBottomOf="@id/tv_stock"-->
<!--app:layout_constraintStart_toEndOf="@id/tv_stock"-->
<!--app:layout_constraintTop_toTopOf="@id/tv_stock" />-->
<!--<TextView-->
<!--android:id="@+id/tv_traffic"-->
<!--style="@style/other_select_smallstyle"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="0个"-->
<!--android:textStyle="bold"-->
<!--app:layout_constraintBottom_toBottomOf="@id/tv_traffic_hint"-->
<!--app:layout_constraintStart_toEndOf="@id/tv_traffic_hint" />-->
<TextView
android:id="@+id/tv_price_hint"
......
app/src/main/res/layout/item_selector.xml
View file @ efd8524d
......@@ -32,7 +32,7 @@
android:layout_height="match_parent"
android:gravity="center"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size" />
android:textSize="@{selected?@dimen/all_text_size:@dimen/all_body_size}" />
</FrameLayout>
......
app/src/main/res/layout/item_settle_saledetail.xml
View file @ efd8524d
......@@ -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/item_settle_vip.xml
View file @ efd8524d
......@@ -20,7 +20,7 @@
<android.support.constraint.ConstraintLayout
android:id="@+id/cl_vip"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_height="@dimen/list3_height"
android:background="@color/white_caocao"
android:foreground="?android:attr/selectableItemBackground">
......
app/src/main/res/layout/view_order_detail.xml
View file @ efd8524d
......@@ -107,180 +107,195 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
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">
<LinearLayout
android:layout_width="match_parent"
android:weightSum="3">
<TextView
android:layout_weight="1"
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/oder_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/oder_detail_no"
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/oder_detail_oper"
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/oder_detail_payType"
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/oder_detail_goodsNum"
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/oder_detail_SumAmt"
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/oder_detail_discountAmt"
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/oder_detail_cutAmt"
android:textSize="@dimen/all_text_size_low"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="3"
android:gravity="right"
android:orientation="vertical"
android:weightSum="8">
<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" />
<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="@{operName}"
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="@{payType}"
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="@{goodsNum}"
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="@{sumAmt}"
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="@{disAmt}"
android:textColor="@color/black_likui" />
android:singleLine="true"
android:text="@string/oder_detail_date"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_no"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{orderNo}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_oper"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{operName}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_payType"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{payType}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_goodsNum"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{goodsNum}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_SumAmt"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{sumAmt}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_discountAmt"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{disAmt}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_cutAmt"
android:textSize="@dimen/all_text_size_low"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{cutAmt}"
android:textColor="@color/black_likui"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
<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="@{cutAmt}"
android:textColor="@color/black_likui"
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
......@@ -329,7 +344,7 @@
android:text="品名"
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 @ efd8524d
<?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 @ efd8524d
......@@ -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/layout/view_vip_recharge.xml
View file @ efd8524d
......@@ -15,7 +15,7 @@
type="String" />
<variable
name="orderNo"
name="cardNo"
type="String" />
<variable
......@@ -112,162 +112,143 @@
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">
<LinearLayout
android:layout_width="match_parent"
android:weightSum="3">
<TextView
android:layout_weight="1"
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/oder_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/oder_detail_no"
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="会员名："
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="手机号："
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="收款金额："
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="赠送金额："
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="6">
<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" />
<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="@{vipName}"
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="@{vipTel}"
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="@{payAmt}"
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="@{sendAmt}"
android:textColor="@color/black_likui" />
</LinearLayout>
android:singleLine="true"
android:text="@string/oder_detail_date"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{date}"
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">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="@string/oder_detail_card_no"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{cardNo}"
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">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="会员名"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{vipName}"
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
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="手机号"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{vipTel}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="收款金额"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{payAmt}"
android:textColor="@color/black_likui" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
android:text="赠送金额："
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
android:singleLine="true"
android:text="@{sendAmt}"
android:textColor="@color/black_likui" />
</LinearLayout>
</LinearLayout>
......
app/src/main/res/values/colors.xml
View file @ efd8524d
......@@ -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 @ efd8524d
......@@ -69,8 +69,8 @@
<dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框-->
<dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">250dp</dimen>
<dimen name="prompt_dialog_logo_size">64dp</dimen>
<dimen name="prompt_dialog_height">200dp</dimen>
<dimen name="prompt_dialog_logo_size">48dp</dimen>
<!--商品页面-->
<integer name="fragment_store_product_item_span_count">4</integer>
<integer name="fragment_store_group_item_span_count">7</integer>
......@@ -219,8 +219,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>
......@@ -238,6 +237,15 @@
<dimen name="button3_height">44dp</dimen>
<dimen name="button3_marginHorizontal">16dp</dimen>
<dimen name="button3_width">328dp</dimen>
<dimen name="list1_height">48dp</dimen>
<dimen name="list2_height">56dp</dimen>
<dimen name="list3_height">72dp</dimen>
<dimen name="list4_height">90dp</dimen>
<dimen name="list5_height">100dp</dimen>
<!--交班-->
<dimen name="handover_amt_size">34sp</dimen>
......
app/src/main/res/values/strings.xml
View file @ efd8524d
......@@ -88,7 +88,7 @@
<string name="cart_product_price">单价</string>
<string name="cart_product_amt">小计</string>
<string name="cart_count">总数:</string>
<string name="cart_amt">总计:</string>
<string name="cart_amt">总计</string>
<string name="cart_pay">应收:</string>
<string name="cart_dis">优惠:</string>
<string name="cart_dis_list">优惠项目:</string>
......@@ -562,7 +562,7 @@
<string name="settle_pay_order_amt">合计金额</string>
<string name="settle_retry">重新支付</string>
<string name="settle_complete">完成</string>
<string name="settle_auth_amt">总计</string>
<string name="settle_auth_amt">合计</string>
<string name="settle_ticket">优惠券</string>
<string name="settle_ticket_text">张可用</string>
<string name="settle_point">积分抵扣</string>
......@@ -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