Skip to content

T
TangKuPos
Commit bfb3b8bc authored by zhang_z's avatar zhang_z
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents 3c14cea5 815d498a
Show whitespace changes
Inline Side-by-side
Showing with 293 additions and 211 deletions
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/OtherSelectPresenter.java
View file @ bfb3b8bc
...@@ -39,10 +39,10 @@ public class OtherSelectPresenter extends OtherSelectContract.Presenter { ...@@ -39,10 +39,10 @@ public class OtherSelectPresenter extends OtherSelectContract.Presenter {
}) })
.subscribe(osskus -> { .subscribe(osskus -> {
if (osskus.getTotalRow() == 0) { if (osskus.getTotalRow() == 0) {
ToastUtils.showShort("没有搜到当前商品，请重新输入"); ToastUtils.showShort("no find");
mView.loadOssku(osskus, nowPageNumber == 1,keyword); mView.loadOssku(osskus, nowPageNumber == 1, keyword);
}else { } else {
mView.loadOssku(osskus, nowPageNumber == 1,keyword); mView.loadOssku(osskus, nowPageNumber == 1, keyword);
} }
//判断是否能加载更多 //判断是否能加载更多
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/otherselect/fragment/OtherListFragment.java
View file @ bfb3b8bc
...@@ -126,7 +126,7 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme ...@@ -126,7 +126,7 @@ public class OtherListFragment extends BaseFragment<OtherSelectPresenter, Fragme
public void search(String string) { public void search(String string) {
KeyboardUtils.hideSoftInput(getActivity()); KeyboardUtils.hideSoftInput(getActivity());
if (string.length() == 0) { if (string.length() == 0) {
ToastUtils.showShort("请输入搜索内容"); ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
return; return;
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/manage/replenishment/fragment/ReplenishmentDetailFragment.java
View file @ bfb3b8bc
...@@ -215,7 +215,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese ...@@ -215,7 +215,7 @@ public class ReplenishmentDetailFragment extends BaseFragment<ReplenishmentPrese
mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true)); mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true));
} else { } else {
mViewBinding.setSumNum("0"); mViewBinding.setSumNum("0");
mViewBinding.setFinallyPrice("￥0.00"); mViewBinding.setFinallyPrice("---");
} }
mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName()); mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName());
mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn()); mViewBinding.setShopName(LoginPresenter.loginReturnBean.getShopNameAbcn());
......
app/src/main/java/com/xingdata/zzdpos/util/ConvertUtil.java
View file @ bfb3b8bc
...@@ -3,6 +3,8 @@ package com.xingdata.zzdpos.util; ...@@ -3,6 +3,8 @@ package com.xingdata.zzdpos.util;
import com.blankj.utilcode.util.StringUtils; import com.blankj.utilcode.util.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Currency;
import java.util.Locale;
public class ConvertUtil { public class ConvertUtil {
...@@ -62,7 +64,9 @@ public class ConvertUtil { ...@@ -62,7 +64,9 @@ public class ConvertUtil {
* @return 元 * @return 元
*/ */
public static String fenToYuan(Long fen, boolean isMonetary) { public static String fenToYuan(Long fen, boolean isMonetary) {
return (isMonetary ? "￥" : "") + fenToYuan(fen); Currency currency = Currency.getInstance(Locale.getDefault());
String symbol = currency.getSymbol();
return (isMonetary ? symbol : "") + fenToYuan(fen);
} }
/** /**
......
app/src/main/java/com/xingdata/zzdpos/view/SearchBar.java
View file @ bfb3b8bc
...@@ -86,7 +86,7 @@ public class SearchBar extends ConstraintLayout { ...@@ -86,7 +86,7 @@ public class SearchBar extends ConstraintLayout {
if (i == EditorInfo.IME_ACTION_SEARCH) { if (i == EditorInfo.IME_ACTION_SEARCH) {
String str = mViewBinding.etSearch.getText().toString(); String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) { if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort("请输入搜索内容"); ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
return true; return true;
} }
KeyboardUtils.hideSoftInput(mViewBinding.etSearch); KeyboardUtils.hideSoftInput(mViewBinding.etSearch);
...@@ -97,7 +97,7 @@ public class SearchBar extends ConstraintLayout { ...@@ -97,7 +97,7 @@ public class SearchBar extends ConstraintLayout {
mViewBinding.tvSearch.setOnClickListener(view -> { mViewBinding.tvSearch.setOnClickListener(view -> {
String str = mViewBinding.etSearch.getText().toString(); String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) { if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort("请输入搜索内容"); ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
this.showSoftInput(); this.showSoftInput();
return; return;
} }
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ bfb3b8bc
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android" <layout xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data> <data>
...@@ -61,7 +59,8 @@ ...@@ -61,7 +59,8 @@
type="String" /> type="String" />
</data> </data>
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/white_caocao" android:background="@color/white_caocao"
...@@ -107,10 +106,10 @@ ...@@ -107,10 +106,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding" android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:paddingBottom="@dimen/all_padding" android:text="@string/sku_subtitle_supplier"
android:text="供货方"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" android:textSize="@dimen/all_text_size_low"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
...@@ -147,8 +146,8 @@ ...@@ -147,8 +146,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toTopOf="@id/view_line_left_1"> app:layout_constraintTop_toTopOf="@id/view_line_left_1">
...@@ -168,9 +167,9 @@ ...@@ -168,9 +167,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{supplierName}" android:text="@{supplierName}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -193,9 +192,9 @@ ...@@ -193,9 +192,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{supplierAddress}" android:text="@{supplierAddress}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -218,9 +217,9 @@ ...@@ -218,9 +217,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{supplierTel}" android:text="@{supplierTel}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -234,10 +233,10 @@ ...@@ -234,10 +233,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding" android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding" android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding" android:paddingTop="@dimen/all_padding"
android:paddingBottom="@dimen/all_padding" android:text="@string/replenishment_tv_shop"
android:text="定货方"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" android:textSize="@dimen/all_text_size_low"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
...@@ -269,8 +268,8 @@ ...@@ -269,8 +268,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tv_shop_title"> app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
...@@ -292,9 +291,9 @@ ...@@ -292,9 +291,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{shopName}" android:text="@{shopName}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -319,9 +318,9 @@ ...@@ -319,9 +318,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{shopAddress}" android:text="@{shopAddress}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -346,9 +345,9 @@ ...@@ -346,9 +345,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{shopTel}" android:text="@{shopTel}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -370,8 +369,8 @@ ...@@ -370,8 +369,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop" app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop" app:layout_constraintStart_toStartOf="@id/ll_shop"
...@@ -385,9 +384,9 @@ ...@@ -385,9 +384,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{date}" android:text="@{date}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -399,8 +398,8 @@ ...@@ -399,8 +398,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding" android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}" android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop" app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop" app:layout_constraintStart_toStartOf="@id/ll_shop"
...@@ -414,9 +413,9 @@ ...@@ -414,9 +413,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{no}" android:text="@{no}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -424,6 +423,96 @@ ...@@ -424,6 +423,96 @@
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:id="@+id/ll_result2"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_result_hint2">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingRight="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"
android:text="@{finallyPrice}"
android:textColor="@color/reddeep"
android:textSize="@dimen/big_big_text_size" />
</LinearLayout>
<LinearLayout
android:id="@+id/ll_num2"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/ll_result2"
app:layout_constraintEnd_toStartOf="@id/ll_result2"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/ll_result2">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/all_padding"
android:text="@{sumNum}"
android:textColor="@color/reddeep"
android:textSize="@dimen/big_big_text_size"
android:textStyle="bold" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_slight_line_width"
android:background="@color/gray_kongming"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_result_hint2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:paddingTop="@dimen/all_padding"
android:text="@string/replenishment_tv_amt"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintEnd_toEndOf="@+id/ll_result2"
app:layout_constraintStart_toStartOf="@id/ll_result2"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_margin"
android:paddingTop="@dimen/all_padding"
android:text="@string/replenishment_tv_needReplenishmentItem"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
app:layout_constraintBottom_toBottomOf="@id/tv_result_hint2"
app:layout_constraintEnd_toEndOf="@id/ll_num2"
app:layout_constraintStart_toStartOf="@id/ll_num2"
app:layout_constraintTop_toTopOf="@id/tv_result_hint2" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_bounced_padding"
android:background="@drawable/singleline_zhouyu_huanggai"
app:layout_constraintTop_toBottomOf="@id/ll_result2" />
</android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>
...@@ -457,10 +546,10 @@ ...@@ -457,10 +546,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding" android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/all_padding"
android:paddingRight="@dimen/all_padding" android:paddingRight="@dimen/all_padding"
android:paddingBottom="@dimen/dp_4" android:paddingTop="@dimen/all_padding"
android:text="@{finallyPrice}" android:text="@{finallyPrice}"
android:textColor="@color/reddeep" android:textColor="@color/reddeep"
android:textSize="@dimen/big_big_text_size" /> android:textSize="@dimen/big_big_text_size" />
...@@ -503,8 +592,7 @@ ...@@ -503,8 +592,7 @@
android:textSize="@dimen/all_text_size_low" android:textSize="@dimen/all_text_size_low"
app:layout_constraintEnd_toEndOf="@+id/ll_result" app:layout_constraintEnd_toEndOf="@+id/ll_result"
app:layout_constraintStart_toStartOf="@id/ll_result" app:layout_constraintStart_toStartOf="@id/ll_result"
app:layout_constraintTop_toBottomOf="@id/ll_no" app:layout_constraintTop_toTopOf="parent" />
tools:ignore="NotSibling" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -550,10 +638,10 @@ ...@@ -550,10 +638,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="30dp" android:layout_height="30dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginBottom="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginTop="@dimen/padding_small" android:layout_marginTop="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginBottom="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding" android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint" android:hint="@string/statistics_order_edit_hint"
android:inputType="number" android:inputType="number"
...@@ -572,8 +660,8 @@ ...@@ -572,8 +660,8 @@
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/layout_statistics_bottom_height" android:layout_height="@dimen/layout_statistics_bottom_height"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:background="@color/white_caocao" android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent"> app:layout_constraintBottom_toBottomOf="parent">
...@@ -594,7 +682,7 @@ ...@@ -594,7 +682,7 @@
style="@style/button_positive" style="@style/button_positive"
android:layout_width="@dimen/button1_width" android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height" android:layout_height="@dimen/button1_height"
android:text="@string/settle_complete" android:text="@string/replenishment_detail_submit"
android:textSize="@dimen/all_text_size" android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_cancel" app:layout_constraintLeft_toRightOf="@id/btn_cancel"
......
app/src/main/res/layout/item_replenishment.xml
View file @ bfb3b8bc
...@@ -73,10 +73,10 @@ ...@@ -73,10 +73,10 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding" android:layout_margin="@dimen/all_padding"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding"
android:paddingStart="@dimen/all_padding" android:paddingStart="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding"
android:paddingBottom="@dimen/dp_4"
android:text="@{status}" android:text="@{status}"
android:textColor="@color/white" android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@id/ll_boss" app:layout_constraintBottom_toBottomOf="@id/ll_boss"
...@@ -101,9 +101,9 @@ ...@@ -101,9 +101,9 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingStart="@dimen/all_padding" android:paddingStart="@dimen/all_padding"
android:paddingTop="@dimen/dp_4" android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{date}" android:text="@{date}"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" /> android:textSize="@dimen/all_text_size_low" />
...@@ -230,8 +230,8 @@ ...@@ -230,8 +230,8 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_margin"
android:layout_marginRight="@dimen/all_padding"
android:gravity="end" android:gravity="end"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
...@@ -241,25 +241,32 @@ ...@@ -241,25 +241,32 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@{num}" android:padding="@dimen/dp_4"
android:textColor="@color/reddeep" android:text="@string/cart_product_count"
android:textSize="@dimen/all_text_size_big" /> android:textColor="@color/black" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/dp_4" android:text=":"
android:text="件"
android:textColor="@color/black" /> android:textColor="@color/black" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{num}"
android:textColor="@color/reddeep"
android:textSize="@dimen/all_text_size_big" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_price" android:id="@+id/ll_price"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding"
android:gravity="end" android:gravity="end"
android:orientation="horizontal" android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@id/ll_cut" app:layout_constraintEnd_toEndOf="@id/ll_cut"
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ bfb3b8bc
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
android:id="@+id/img_goods" android:id="@+id/img_goods"
android:layout_width="65dp" android:layout_width="65dp"
android:layout_height="65dp" android:layout_height="65dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderImage="@mipmap/icon_goods_default" /> app:placeholderImage="@mipmap/icon_goods_default" />
<TextView <TextView
...@@ -27,8 +29,8 @@ ...@@ -27,8 +29,8 @@
style="@style/other_select_blacktext_style" style="@style/other_select_blacktext_style"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding" android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:text="" android:text=""
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods" app:layout_constraintStart_toEndOf="@id/img_goods"
...@@ -38,11 +40,11 @@ ...@@ -38,11 +40,11 @@
android:id="@+id/tv_goods_code_hint" android:id="@+id/tv_goods_code_hint"
style="@style/other_select_smallstyle" style="@style/other_select_smallstyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="28dp" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding" android:layout_marginTop="@dimen/all_padding"
android:text="@string/sku_barcode" android:text="@string/sku_barcode"
app:layout_constraintTop_toBottomOf="@id/tv_goods_name" app:layout_constraintStart_toStartOf="@id/tv_goods_name"
tools:layout_editor_absoluteX="97dp" /> app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />
<TextView <TextView
android:id="@+id/tv_goods_code" android:id="@+id/tv_goods_code"
...@@ -96,6 +98,40 @@ ...@@ -96,6 +98,40 @@
app:layout_constraintTop_toTopOf="@id/tv_price_hint" /> app:layout_constraintTop_toTopOf="@id/tv_price_hint" />
<TextView
android:id="@+id/tv_stock_hint"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:text="@string/sssku_stock"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
<TextView
android:id="@+id/tv_stock"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"
app:layout_constraintStart_toEndOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toTopOf="@id/tv_stock_hint" />
<TextView
android:id="@+id/tv_price_hint"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:text="@string/sku_cost"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_stock_hint"
app:layout_constraintTop_toBottomOf="@id/tv_stock_hint" />
<LinearLayout <LinearLayout
android:id="@+id/linearLayout" android:id="@+id/linearLayout"
android:layout_width="wrap_content" android:layout_width="wrap_content"
...@@ -103,9 +139,8 @@ ...@@ -103,9 +139,8 @@
android:layout_marginEnd="@dimen/all_padding" android:layout_marginEnd="@dimen/all_padding"
android:gravity="center" android:gravity="center"
android:orientation="horizontal" 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" app:layout_constraintTop_toBottomOf="@id/tv_price_hint"
> >
...@@ -131,8 +166,8 @@ ...@@ -131,8 +166,8 @@
android:id="@+id/et_count" android:id="@+id/et_count"
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4" android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/selector_edit_frame_blue_background" android:background="@drawable/selector_edit_frame_blue_background"
android:gravity="center" android:gravity="center"
...@@ -154,65 +189,6 @@ ...@@ -154,65 +189,6 @@
tools:layout_editor_absoluteY="97dp" /> tools:layout_editor_absoluteY="97dp" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/tv_stock_hint"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:text="@string/sssku_stock"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="@id/tv_goods_code_hint"
app:layout_constraintTop_toBottomOf="@id/tv_goods_code_hint" />
<TextView
android:id="@+id/tv_stock"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="0dp"
android:text="0个"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@id/tv_stock_hint"
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_price_hint"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:text="@string/sku_cost"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="@id/tv_stock_hint"
app:layout_constraintTop_toBottomOf="@id/tv_stock_hint" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
......
app/src/main/res/values-en/strings.xml
View file @ bfb3b8bc
...@@ -326,7 +326,7 @@ ...@@ -326,7 +326,7 @@
<string name="ing_dialog_title">System reminder</string> <string name="ing_dialog_title">System reminder</string>
<!--货币--> <!--货币-->
<string name="money_rmb">￥</string> <string name="money_rmb">$</string>
<!--星期--> <!--星期-->
<string name="week_mon">Monday</string> <string name="week_mon">Monday</string>
......
app/src/main/res/values-en/strings_chen.xml
View file @ bfb3b8bc
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<string name="replenishment_tv_replenishmentDetail">Order details</string> <string name="replenishment_tv_replenishmentDetail">Order details</string>
<string name="replenishment_toast_noNeedDo">Stock is normal</string> <string name="replenishment_toast_noNeedDo">Stock is normal</string>
<string name="replenishment_tv_amt">Amount</string> <string name="replenishment_tv_amt">Amount</string>
<string name="replenishment_tv_shop">Shop</string>
<!--盘点界面--> <!--盘点界面-->
...@@ -73,6 +74,6 @@ ...@@ -73,6 +74,6 @@
<string name="ticket_default_lostVip">Lost Vip</string> <string name="ticket_default_lostVip">Lost Vip</string>
<string name="bale_toast_noSearch">not find</string>
</resources> </resources>
app/src/main/res/values-zh/strings_chen.xml
View file @ bfb3b8bc
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<string name="replenishment_tv_replenishmentDetail">定货详情</string> <string name="replenishment_tv_replenishmentDetail">定货详情</string>
<string name="replenishment_toast_noNeedDo">库存正常，无需补货</string> <string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
<string name="replenishment_tv_amt">金额</string> <string name="replenishment_tv_amt">金额</string>
<string name="replenishment_tv_shop">定货方</string>
<!--盘点界面--> <!--盘点界面-->
......
app/src/main/res/values/strings_chen.xml
View file @ bfb3b8bc
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
<string name="replenishment_tv_replenishmentDetail">定货详情</string> <string name="replenishment_tv_replenishmentDetail">定货详情</string>
<string name="replenishment_toast_noNeedDo">库存正常，无需补货</string> <string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
<string name="replenishment_tv_amt">金额</string> <string name="replenishment_tv_amt">金额</string>
<string name="replenishment_tv_shop">定货方</string>
<!--盘点界面--> <!--盘点界面-->
...@@ -73,6 +74,9 @@ ...@@ -73,6 +74,9 @@
<string name="ticket_default_lostVip">流失会员</string> <string name="ticket_default_lostVip">流失会员</string>
<string name="bale_toast_noSearch">没有搜到当前商品，请重新输入</string>
</resources> </resources>
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