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
Expand all Hide 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 {
})
.subscribe(osskus -> {
if (osskus.getTotalRow() == 0) {
ToastUtils.showShort("没有搜到当前商品，请重新输入");
mView.loadOssku(osskus, nowPageNumber == 1,keyword);
}else {
mView.loadOssku(osskus, nowPageNumber == 1,keyword);
ToastUtils.showShort("no find");
mView.loadOssku(osskus, nowPageNumber == 1, keyword);
} else {
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
public void search(String string) {
KeyboardUtils.hideSoftInput(getActivity());
if (string.length() == 0) {
ToastUtils.showShort("请输入搜索内容");
ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
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
mViewBinding.setFinallyPrice(ConvertUtil.fenToYuan(getSumPrice(), true));
} else {
mViewBinding.setSumNum("0");
mViewBinding.setFinallyPrice("￥0.00");
mViewBinding.setFinallyPrice("---");
}
mViewBinding.setShopOderName(LoginPresenter.loginReturnBean.getOperName());
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;
import com.blankj.utilcode.util.StringUtils;
import java.math.BigDecimal;
import java.util.Currency;
import java.util.Locale;
public class ConvertUtil {
......@@ -62,7 +64,9 @@ public class ConvertUtil {
* @return 元
*/
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 {
if (i == EditorInfo.IME_ACTION_SEARCH) {
String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort("请输入搜索内容");
ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
return true;
}
KeyboardUtils.hideSoftInput(mViewBinding.etSearch);
......@@ -97,7 +97,7 @@ public class SearchBar extends ConstraintLayout {
mViewBinding.tvSearch.setOnClickListener(view -> {
String str = mViewBinding.etSearch.getText().toString();
if (StringUtils.isEmpty(str) && !isEmptyEnabled) {
ToastUtils.showShort("请输入搜索内容");
ToastUtils.showShort(getActivity().getString(R.string.replenishment_toast_seachText));
this.showSoftInput();
return;
}
......
app/src/main/res/layout/item_replenishment.xml
View file @ bfb3b8bc
......@@ -73,10 +73,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/all_padding"
android:paddingBottom="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding"
android:paddingStart="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingEnd="@dimen/all_padding"
android:paddingBottom="@dimen/dp_4"
android:text="@{status}"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="@id/ll_boss"
......@@ -101,9 +101,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingStart="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{date}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -230,8 +230,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginRight="@dimen/all_padding"
android:gravity="end"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
......@@ -241,25 +241,32 @@
<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" />
android:padding="@dimen/dp_4"
android:text="@string/cart_product_count"
android:textColor="@color/black" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="@dimen/dp_4"
android:text="件"
android:text=":"
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
android:id="@+id/ll_price"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_padding"
android:layout_marginTop="@dimen/all_margin"
android:layout_marginEnd="@dimen/all_padding"
android:gravity="end"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="@id/ll_cut"
......
app/src/main/res/layout/item_replenishment_detail.xml
View file @ bfb3b8bc
......@@ -20,6 +20,8 @@
android:id="@+id/img_goods"
android:layout_width="65dp"
android:layout_height="65dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:placeholderImage="@mipmap/icon_goods_default" />
<TextView
......@@ -27,8 +29,8 @@
style="@style/other_select_blacktext_style"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginStart="@dimen/all_bounced_padding"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:text=""
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/img_goods"
......@@ -38,11 +40,11 @@
android:id="@+id/tv_goods_code_hint"
style="@style/other_select_smallstyle"
android:layout_width="wrap_content"
android:layout_height="28dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_padding"
android:text="@string/sku_barcode"
app:layout_constraintTop_toBottomOf="@id/tv_goods_name"
tools:layout_editor_absoluteX="97dp" />
app:layout_constraintStart_toStartOf="@id/tv_goods_name"
app:layout_constraintTop_toBottomOf="@id/tv_goods_name" />
<TextView
android:id="@+id/tv_goods_code"
......@@ -96,6 +98,40 @@
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
android:id="@+id/linearLayout"
android:layout_width="wrap_content"
......@@ -103,9 +139,8 @@
android:layout_marginEnd="@dimen/all_padding"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="@id/tv_price_hint"
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 @@
android:id="@+id/et_count"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_marginBottom="@dimen/dp_4"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginBottom="@dimen/dp_4"
android:layout_weight="1"
android:background="@drawable/selector_edit_frame_blue_background"
android:gravity="center"
......@@ -154,65 +189,6 @@
tools:layout_editor_absoluteY="97dp" />
</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>
......
app/src/main/res/values-en/strings.xml
View file @ bfb3b8bc
......@@ -326,7 +326,7 @@
<string name="ing_dialog_title">System reminder</string>
<!--货币-->
<string name="money_rmb">￥</string>
<string name="money_rmb">$</string>
<!--星期-->
<string name="week_mon">Monday</string>
......
app/src/main/res/values-en/strings_chen.xml
View file @ bfb3b8bc
......@@ -27,6 +27,7 @@
<string name="replenishment_tv_replenishmentDetail">Order details</string>
<string name="replenishment_toast_noNeedDo">Stock is normal</string>
<string name="replenishment_tv_amt">Amount</string>
<string name="replenishment_tv_shop">Shop</string>
<!--盘点界面-->
......@@ -73,6 +74,6 @@
<string name="ticket_default_lostVip">Lost Vip</string>
<string name="bale_toast_noSearch">not find</string>
</resources>
app/src/main/res/values-zh/strings_chen.xml
View file @ bfb3b8bc
......@@ -27,6 +27,8 @@
<string name="replenishment_tv_replenishmentDetail">定货详情</string>
<string name="replenishment_toast_noNeedDo">库存正常，无需补货</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 @@
<string name="replenishment_tv_replenishmentDetail">定货详情</string>
<string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
<string name="replenishment_tv_amt">金额</string>
<string name="replenishment_tv_shop">定货方</string>
<!--盘点界面-->
......@@ -73,6 +74,9 @@
<string name="ticket_default_lostVip">流失会员</string>
<string name="bale_toast_noSearch">没有搜到当前商品，请重新输入</string>
</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