Skip to content

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

UI

parent 1323b74a
Hide whitespace changes
Inline Side-by-side
Showing with 328 additions and 138 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/inventory/fragment/InventoryAddFragment.java
View file @ ae575731
......@@ -38,6 +38,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
private List<Sssku> topCsList = new ArrayList<>();
private InventoryGoodsAdapter mInventoryGoodsAdapter;
private CsCartDialog mCartDialog = new CsCartDialog();
private Drawable drawable;
private RecyclerViewUtil.ListCardItemDecoration emptyItemDecoration;
private RecyclerViewUtil.ListCardItemDecoration listItemDecoration;
/**
* 当前购物车信息
*/
......@@ -53,7 +56,9 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
@Override
public void initView() {
drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
emptyItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 1);
listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 0);
initRecycler();
mViewBinding.setCartCount(0);
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
......@@ -144,6 +149,7 @@ public class InventoryAddFragment extends BaseFragment<InventoryPresenter, Fragm
Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
mViewBinding.recyclerView.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mViewBinding.recyclerView.setAdapter(mInventoryGoodsAdapter);
mViewBinding.recyclerView.addItemDecoration(emptyItemDecoration);
}
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java
View file @ ae575731
......@@ -33,6 +33,9 @@ import java.util.List;
public class OtherListFragment extends BaseFragment<OtherSelectPresenter, FragmentOtherListBinding> {
private OtherSelectAdapter mOtherSelectAdapter;
private Drawable drawable;
private RecyclerViewUtil.ListCardItemDecoration emptyItemDecoration;
private RecyclerViewUtil.ListCardItemDecoration listItemDecoration;
@Override
......@@ -42,14 +45,14 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
@Override
public void initView() {
drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
emptyItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 1);
listItemDecoration = new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable, 0);
mOtherSelectAdapter = new OtherSelectAdapter(new ArrayList<>());
mOtherSelectAdapter.setEmptyView(getEmptyView(R.string.empty_other_select));
mViewBinding.recyclerOtherSelcet.setLayoutManager(new LinearLayoutManager(getActivity()));
mViewBinding.recyclerOtherSelcet.setAdapter(mOtherSelectAdapter);
Drawable drawable = getResources().getDrawable(R.drawable.singleline_zhouyu_huanggai);
mViewBinding.recyclerOtherSelcet.addItemDecoration(new RecyclerViewUtil.ListCardItemDecoration(getActivity(), 50, drawable));
mViewBinding.recyclerOtherSelcet.addItemDecoration(emptyItemDecoration);
// mOtherSelectAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
// @Override
......@@ -83,15 +86,24 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
mOtherSelectAdapter.setEnableLoadMore(true);
mViewBinding.srlProduct.setRefreshing(false);
}
if (isRefresh) mOtherSelectAdapter.setNewData(pager.getList());
else if (pager.getList().size() > 0) mOtherSelectAdapter.addData(pager.getList());
if (isRefresh) {
mOtherSelectAdapter.setNewData(pager.getList());
if (pager.getList().size() == 0) {
mViewBinding.recyclerOtherSelcet.removeItemDecoration(listItemDecoration);
mViewBinding.recyclerOtherSelcet.removeItemDecoration(emptyItemDecoration);
mViewBinding.recyclerOtherSelcet.addItemDecoration(emptyItemDecoration);
mViewBinding.recyclerOtherSelcet.invalidateItemDecorations();
} else {
mViewBinding.recyclerOtherSelcet.removeItemDecoration(listItemDecoration);
mViewBinding.recyclerOtherSelcet.removeItemDecoration(emptyItemDecoration);
mViewBinding.recyclerOtherSelcet.addItemDecoration(listItemDecoration);
mViewBinding.recyclerOtherSelcet.invalidateItemDecorations();
}
} else if (pager.getList().size() > 0) mOtherSelectAdapter.addData(pager.getList());
if (pager.isLastPage()) mOtherSelectAdapter.loadMoreEnd(isRefresh);
else mOtherSelectAdapter.loadMoreComplete();
// if (mOtherSelectAdapter.getData().size() == 0) {
// mViewBinding.viewLine.setVisibility(View.GONE);
// } else {
// mViewBinding.viewLine.setVisibility(View.VISIBLE);
// }
}
......
app/src/main/java/com/xingdata/zzdpos/util/RecyclerViewUtil.java
View file @ ae575731
......@@ -17,6 +17,7 @@ public class RecyclerViewUtil {
private int spacing;
private boolean includeEdge;
public GridSpacingItemDecoration(int spanCount, int spacing, boolean includeEdge) {
this.spanCount = spanCount;
this.spacing = spacing;
......@@ -50,7 +51,7 @@ public class RecyclerViewUtil {
private Drawable mDividerDarwable;
private int mDividerHight = 1;
private Paint mColorPaint;
private int noNum;
public final int[] ATRRS = new int[]{android.R.attr.listDivider};
......@@ -81,11 +82,16 @@ public class RecyclerViewUtil {
mDividerHight = dividerHight;
mDividerDarwable = dividerDrawable;
}
public ListCardItemDecoration(Context context, int dividerHight, Drawable dividerDrawable,int noNum) {
this(context);
mDividerHight = dividerHight;
mDividerDarwable = dividerDrawable;
this. noNum=noNum;
}
@Override
public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
super.getItemOffsets(outRect, view, parent, state);
outRect.top = mDividerHight + 1;
outRect.top = mDividerHight;
}
@Override
......@@ -99,7 +105,7 @@ public class RecyclerViewUtil {
public void drawHorizontalDivider(Canvas c, RecyclerView parent) {
final int childCount = parent.getChildCount();
for (int i = 0; i < childCount - 1; i++) {
for (int i = noNum; i < childCount; i++) {
final View child = parent.getChildAt(i);
RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();
......@@ -109,8 +115,8 @@ public class RecyclerViewUtil {
int bottom = 0;
top = child.getTop() - params.topMargin;
bottom = top + mDividerHight;
bottom = child.getTop() - params.topMargin;
top = bottom - mDividerHight;
//画分割线
mDividerDarwable.setBounds(left, top, right, bottom);
mDividerDarwable.draw(c);
......
app/src/main/res/drawable/selector_edit_frame_blue_background.xml
View file @ ae575731
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/all_transparent" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" android:state_enabled="false" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" android:state_pressed="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_blue" android:state_focused="true" />
<item android:drawable="@drawable/shape_white_round_rectangle_dark" />
......
app/src/main/res/layout/activity_other_select.xml
View file @ ae575731
......@@ -5,25 +5,50 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:background="@color/white_caocao"
android:orientation="vertical">
<include
android:id="@+id/ly_title"
layout="@layout/title_order" />
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_below="@id/ly_title"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/other_select_edit_hint"
android:textColor="@color/black_likui"
android:inputType="text"
android:imeOptions="actionSearch"
android:textSize="@dimen/all_text_size_low"
/>
<FrameLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ly_title">
</FrameLayout>
android:layout_below="@id/ed_title"
android:background="@color/gray_zhouyu"></FrameLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title"
android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ed_title"
android:background="@color/gray_huanggai" />
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_handover.xml
View file @ ae575731
......@@ -104,7 +104,7 @@
android:orientation="vertical">
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -112,7 +112,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -120,7 +120,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -128,7 +128,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -136,7 +136,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -144,7 +144,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -152,7 +152,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -160,7 +160,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:singleLine="true"
......
app/src/main/res/layout/dialog_prompt.xml
View file @ ae575731
......@@ -108,13 +108,13 @@
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="@dimen/view_line_L050"
android:layout_height="match_parent"
android:background="@color/gray_huanggai"
android:background="@color/gray_kongming"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......
app/src/main/res/layout/fragment_inventory_add.xml
View file @ ae575731
......@@ -18,7 +18,7 @@
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu"
android:background="@color/white_caocao"
android:orientation="vertical">
<include
......@@ -32,37 +32,48 @@
android:background="@color/gray_huanggai"
app:layout_constraintTop_toBottomOf="@id/ic_title" />
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/other_select_edit_hint"
android:imeOptions="actionSearch"
android:inputType="text"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintTop_toBottomOf="@id/ic_title" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="@dimen/padding_small"
android:orientation="vertical"
app:layout_constraintBottom_toTopOf="@id/fl_cart"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/ic_title">
app:layout_constraintTop_toBottomOf="@id/ed_title">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/tv_title_small"
android:layout_marginTop="@dimen/Minus_padding_left_right"
android:background="@color/gray_zhouyu">
</android.support.v7.widget.RecyclerView>
<TextView
android:id="@+id/tv_title_small"
<View
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding"
android:text="@string/manage_inventory_add_title"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small_title"
android:textStyle="bold" />
android:layout_height="@dimen/view_line_L050"
android:layout_alignParentTop="true"
android:background="@color/gray_huanggai" />
</RelativeLayout>
......
app/src/main/res/layout/fragment_order_main.xml
View file @ ae575731
......@@ -9,31 +9,33 @@
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_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
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:layout_below="@id/ed_title"
android:background="@color/white_caocao"
app:tabMinWidth="100dp"
app:tabMaxWidth="100dp"
app:tabMode="scrollable"
app:tabSelectedTextColor="#ff7a61"
app:tabSelectedTextColor="@color/black_baozheng"
app:tabTextColor="@color/gray_kongming" />
......@@ -41,7 +43,7 @@
android:id="@+id/viewPager_data"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/ed_title"
android:layout_below="@id/tab_layout"
android:layout_marginTop="-1dp"
android:background="@color/gray">
......@@ -53,10 +55,13 @@
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:layout_alignParentTop="true"
android:background="@color/gray_huanggai" />
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_replenishement.xml
View file @ ae575731
......@@ -22,7 +22,27 @@
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" />
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="30dp"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
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"
/>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai" />
<LinearLayout
android:id="@+id/btn_add"
android:layout_width="match_parent"
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ ae575731
......@@ -57,9 +57,10 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
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"
android:splitMotionEvents="false">
<include
......@@ -72,7 +73,7 @@
android:id="@+id/cl_default"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/ly_title"
android:layout_below="@id/ed_title"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/white_caocao">
......@@ -410,14 +411,11 @@
<LinearLayout
android:id="@+id/ll_result"
android:layout_width="0dp"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toEndOf="@id/ll_num"
app:layout_constraintTop_toBottomOf="@id/tv_result_hint">
<TextView
......@@ -494,7 +492,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/singleline_zhouyu_huanggai"
android:padding="@dimen/all_bounced_padding"
android:padding="@dimen/all_padding"
android:text="定货明细"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small_title"
......@@ -503,25 +501,44 @@
</android.support.constraint.ConstraintLayout>
<View
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_height="30dp"
android:layout_below="@id/ly_title"
android:background="@color/gray_huanggai" />
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small"
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" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_below="@id/ly_title"
android:layout_above="@id/ed_title"
android:layout_marginTop="@dimen/all_bounced_padding"
android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_bounced_padding"
android:layout_below="@id/ed_title"
android:background="@drawable/singleline_zhouyu_huanggai" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_above="@id/ll_bottom"
android:layout_below="@id/cl_default">
android:layout_below="@id/cl_default"
android:background="@color/gray_zhouyu">
</android.support.v7.widget.RecyclerView>
......
app/src/main/res/layout/item_other_select.xml
View file @ ae575731
......@@ -5,6 +5,21 @@
<data>
<variable
name="shopName"
type="String" />
<variable
name="address"
type="String" />
<variable
name="phone"
type="String" />
<variable
name="stock"
type="String" />
</data>
......@@ -33,6 +48,7 @@
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:text="贝斯克莱因和美妖精生日巧克力蛋糕"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods"
app:layout_constraintTop_toTopOf="@id/img_goods" />
......@@ -69,17 +85,64 @@
app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
<TextView
android:id="@+id/tv_shop"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:drawableStart="@mipmap/icon_stores"
android:padding="@dimen/dp_4"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/all_text_size_small"
android:layout_weight="1"
android:gravity="right"
android:text="@{stock}"
android:textColor="@color/red_lvzhi"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
app:layout_constraintTop_toTopOf="@id/tv_goods_size" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_goods_size"
app:layout_constraintTop_toBottomOf="@id/tv_goods_size">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_stores"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding"
android:text="@{shopName}"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_address"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding"
android:text="@{address}"
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:drawablePadding="@dimen/all_padding"
android:drawableStart="@mipmap/icon_telephone"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_bounced_padding"
android:text="@{phone}"
android:textSize="@dimen/all_text_size_low" />
</LinearLayout>
</android.support.constraint.ConstraintLayout>
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ ae575731
......@@ -12,9 +12,9 @@
<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">
android:foreground="?attr/selectableItemBackground"
android:padding="@dimen/all_bounced_padding">
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/img_goods"
......@@ -59,11 +59,11 @@
android:id="@+id/tv_goods_size"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:background="@drawable/frame_frame_zhouyu_bg"
android:padding="@dimen/dp_4"
android:text="规格"
android:textSize="@dimen/all_text_size_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
app:layout_constraintBottom_toBottomOf="@id/tv_goods_code"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_goods_code" />
......@@ -72,19 +72,20 @@
android:id="@+id/tv_goods_price"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="999"
android:textColor="@color/store_product_price"
android:textSize="@dimen/big_text_size"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_rmb"
app:layout_constraintStart_toEndOf="@id/tv_rmb"
app:layout_constraintTop_toTopOf="@id/tv_price_hint" />
app:layout_constraintTop_toTopOf="@id/tv_rmb" />
<TextView
android:id="@+id/tv_rmb"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:text="@string/money_rmb"
android:textColor="@color/store_product_price"
android:textSize="@dimen/all_text_size_small"
......@@ -101,7 +102,10 @@
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
app:layout_constraintEnd_toEndOf="parent">
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/tv_price_hint"
>
<ImageButton
android:id="@+id/btn_down"
......@@ -112,6 +116,15 @@
android:background="@color/white"
android:src="@mipmap/but_reduce" />
<TextView
android:id="@+id/tv_finally_count"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="进货数量："
android:textStyle="bold"
android:visibility="gone" />
<EditText
android:id="@+id/et_count"
android:layout_width="50dp"
......@@ -124,7 +137,7 @@
android:hint="1"
android:inputType="number"
android:maxLength="4"
android:saveEnabled="false"
android:saveEnabled="true"
android:textSize="@dimen/all_text_size_low" />
<ImageButton
......@@ -163,26 +176,26 @@
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" />-->
<!--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" />-->
<!--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/view_inventory_detail.xml
View file @ ae575731
......@@ -221,7 +221,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="件"
android:text=" 件"
android:textColor="@color/black"
android:textSize="@dimen/small_text_size" />
</LinearLayout>
......
app/src/main/res/layout/view_order_detail.xml
View file @ ae575731
......@@ -115,7 +115,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -123,7 +123,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -138,7 +138,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -146,7 +146,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -161,7 +161,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -169,7 +169,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -184,7 +184,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -192,7 +192,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -207,7 +207,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -215,7 +215,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -230,7 +230,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -238,7 +238,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -253,7 +253,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -261,7 +261,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -276,7 +276,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -285,7 +285,7 @@
android:visibility="@{cutAmtShow? View.VISIBLE: View.GONE}" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......
app/src/main/res/layout/view_ticket.xml
View file @ ae575731
......@@ -101,7 +101,7 @@
android:weightSum="3">
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_low"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -110,7 +110,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -127,7 +127,7 @@
android:weightSum="3">
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_low"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -136,7 +136,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......@@ -153,7 +153,7 @@
android:weightSum="3">
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_low"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
......@@ -162,7 +162,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
......
app/src/main/res/layout/view_vip_recharge.xml
View file @ ae575731
......@@ -115,7 +115,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -123,7 +123,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -139,7 +139,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -147,7 +147,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -163,7 +163,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -171,7 +171,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -186,7 +186,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -194,7 +194,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -209,7 +209,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -217,7 +217,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......@@ -232,7 +232,7 @@
android:weightSum="3">
<TextView
android:layout_weight="1"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:singleLine="true"
......@@ -240,7 +240,7 @@
android:textSize="@dimen/all_text_size_low" />
<TextView
android:layout_weight="2"
style="@style/textView_body_small"
style="@style/dialog_textView_body_small"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="right|center_vertical"
......
app/src/main/res/values/strings.xml
View file @ ae575731
......@@ -268,7 +268,7 @@
<!--邻库查询界面-->
<string name="other_selcet_meun">邻库查询</string>
<string name="other_selcet_edit_hint">商品名称/商品条码/商品助记码</string>
<string name="other_select_edit_hint">请输入商品名称/商品条码</string>
<string name="other_selcet_shop">共%s个门店库存</string>
<!--补货界面-->
......
app/src/main/res/values/styles.xml
View file @ ae575731
......@@ -403,11 +403,23 @@
</style>
<style name="textView_body_small">
<item name="android:padding">@dimen/dp_4</item>
<item name="android:padding">@dimen/all_bounced_spacing</item>
<item name="android:textSize">@dimen/all_text_size_small</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
<style name="dialog_textView_body_small">
<item name="android:padding">@dimen/all_bounced_spacing</item>
<item name="android:textSize">@dimen/all_text_size_small</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
<style name="dialog_textView_body_low">
<item name="android:padding">@dimen/all_bounced_spacing</item>
<item name="android:textSize">@dimen/all_text_size_low</item>
<item name="android:textColor">@color/black_baozheng</item>
</style>
<style name="searchBarEditor">
<item name="android:drawableStart">@mipmap/ic_search</item>
<item name="android:drawablePadding">@dimen/all_spacing</item>
......
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