Skip to content

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

修改BUG;

parent 36b28d50
Show whitespace changes
Inline Side-by-side
Showing with 162 additions and 153 deletions
.idea/dictionaries/Eurus.xml 0 → 100644
View file @ 110ea964
<component name="ProjectDictionaryState">
<dictionary name="Eurus">
<words>
<w>baseinfo</w>
</words>
</dictionary>
</component>
\ No newline at end of file
app/src/main/java/com/xingdata/zzdpos/ui/manage/sssku/SsskuPresenter.java
View file @ 110ea964
......@@ -304,7 +304,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
mView.showLoadingDialog();
mCompositeDisposable.add(
ApiFactory.Sssku.querySssku(mPageNum, "", mSkuGrpId)
.doOnSubscribe(subscription -> mView.dismissLoadingDialog())
.doOnSubscribe(subscription -> mView.showLoadingDialog())
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(ssskuPager -> {
if (mPageNum == 1 && mSkuGrpId == 0L)
mView.loadSsskuCount(ssskuPager.getTotalRow());
......
app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java
View file @ 110ea964
......@@ -101,16 +101,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mLoadingDialog);
} else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId();
if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
if (tempLevelId == SendTickerC.getVipType(mContext).get(0).getId()) {
//选择全部会员
mPresenter.sendTickerBefor(null, null, null, tickerId,
mLoadingDialog);
return;
}
for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
long tempServerId = SendTickerC.getServerId(tempLevelId);
//选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
if (tempLevelId == SendTickerC.getVipType(mContext).get(i).getId() &&
tempServerId != -1) {
mPresenter.sendTickerBefor(tempServerId + "", null,
null, tickerId,
......@@ -203,16 +203,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mLoadingDialog);
} else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId();
if (tempLevelId == SendTickerC.getVipType().get(0).getId()) {
if (tempLevelId == SendTickerC.getVipType(mContext).get(0).getId()) {
//选择全部会员
mPresenter.sendTicker(null, null, null, tickerId,
mLoadingDialog);
return;
}
for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
long tempServerId = SendTickerC.getServerId(tempLevelId);
//选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() &&
if (tempLevelId == SendTickerC.getVipType(mContext).get(i).getId() &&
tempServerId != -1) {
mPresenter.sendTicker(tempServerId + "", null,
null, tickerId,
......@@ -234,15 +234,15 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mViewBinding.llAll.setVisibility(View.VISIBLE);
RealmResults<Level> levels = DBFactory.getRealm().where(Level.class).findAll();
levelList = new ArrayList<>();
SendTickerC.getVipType().get(0).setSelect(true);
levelList.add(SendTickerC.getVipType().get(0));
SendTickerC.getVipType(mContext).get(0).setSelect(true);
levelList.add(SendTickerC.getVipType(mContext).get(0));
for (int i = 0; i < levels.size(); i++) {
levels.get(i).setSelect(false);
levelList.add(levels.get(i));
}
for (int i = 1; i < SendTickerC.getVipType().size(); i++) {
SendTickerC.getVipType().get(i).setSelect(false);
levelList.add(SendTickerC.getVipType().get(i));
for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
SendTickerC.getVipType(mContext).get(i).setSelect(false);
levelList.add(SendTickerC.getVipType(mContext).get(i));
}
mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName());
mViewBinding.vipType.setAdapter(vipGroupAdapter);
......
app/src/main/res/layout/fragment_replenishement_detail.xml
View file @ 110ea964
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<layout 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">
<data>
......@@ -60,8 +61,7 @@
type="String" />
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white_caocao"
......@@ -107,9 +107,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding"
android:paddingBottom="@dimen/all_padding"
android:text="供货方"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
......@@ -147,8 +147,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding"
android:visibility="gone"
app:layout_constraintTop_toTopOf="@id/view_line_left_1">
......@@ -168,9 +168,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{supplierName}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -193,9 +193,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{supplierAddress}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -218,9 +218,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{supplierTel}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -234,9 +234,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:paddingBottom="@dimen/all_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingTop="@dimen/all_padding"
android:paddingBottom="@dimen/all_padding"
android:text="定货方"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low"
......@@ -269,8 +269,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding"
android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/tv_shop_title">
......@@ -292,9 +292,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{shopName}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -319,9 +319,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{shopAddress}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -346,9 +346,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{shopTel}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -370,8 +370,8 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop"
......@@ -385,9 +385,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@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" />
......@@ -399,8 +399,8 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingEnd="@dimen/all_bounced_padding"
android:paddingStart="@dimen/all_bounced_padding"
android:paddingEnd="@dimen/all_bounced_padding"
android:visibility="@{isShowSupplier? View.VISIBLE: View.GONE}"
app:layout_constraintEnd_toEndOf="@id/ll_shop"
app:layout_constraintStart_toStartOf="@id/ll_shop"
......@@ -414,9 +414,9 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingBottom="@dimen/dp_4"
android:paddingLeft="@dimen/all_padding"
android:paddingTop="@dimen/dp_4"
android:paddingBottom="@dimen/dp_4"
android:text="@{no}"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size_low" />
......@@ -457,10 +457,10 @@
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:paddingRight="@dimen/all_padding"
android:paddingBottom="@dimen/dp_4"
android:text="@{finallyPrice}"
android:textColor="@color/reddeep"
android:textSize="@dimen/big_big_text_size" />
......@@ -550,10 +550,10 @@
android:layout_width="match_parent"
android:layout_height="30dp"
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_marginTop="@dimen/padding_small"
android:layout_marginEnd="@dimen/all_bounced_padding"
android:layout_marginBottom="@dimen/padding_small"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint"
android:inputType="number"
......@@ -572,8 +572,8 @@
android:id="@+id/ll_bottom"
android:layout_width="match_parent"
android:layout_height="@dimen/layout_statistics_bottom_height"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_alignParentBottom="true"
android:background="@color/white_caocao"
app:layout_constraintBottom_toBottomOf="parent">
......@@ -582,7 +582,7 @@
style="@style/button_passive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="取消"
android:text="@string/all_cancel"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
......@@ -594,7 +594,7 @@
style="@style/button_positive"
android:layout_width="@dimen/button1_width"
android:layout_height="@dimen/button1_height"
android:text="定货提交"
android:text="@string/settle_complete"
android:textSize="@dimen/all_text_size"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/btn_cancel"
......
app/src/main/res/values-en/strings_chen.xml
View file @ 110ea964
......@@ -26,6 +26,7 @@
<string name="replenishment_hint_supplierName">Please enter the supplier name</string>
<string name="replenishment_tv_replenishmentDetail">Order details</string>
<string name="replenishment_toast_noNeedDo">Stock is normal</string>
<string name="replenishment_tv_amt">Amount</string>
<!--盘点界面-->
......@@ -68,7 +69,7 @@
<string name="ticket_tv_sendSuc">Successful issue</string>
<string name="ticket_default_allVip">All vip</string>
<string name="ticket_default_monthBirthday">Birthday of this month</string>
<string name="ticket_default_nextMonthBirthday">Next month's birthday</string>
<string name="ticket_default_nextMonthBirthday">Next month\'s birthday</string>
<string name="ticket_default_lostVip">Lost Vip</string>
......
app/src/main/res/values-zh/strings_chen.xml
View file @ 110ea964
......@@ -26,6 +26,7 @@
<string name="replenishment_hint_supplierName">请输入供货商名称</string>
<string name="replenishment_tv_replenishmentDetail">定货详情</string>
<string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
<string name="replenishment_tv_amt">金额</string>
<!--盘点界面-->
......@@ -72,6 +73,4 @@
<string name="ticket_default_lostVip">流失会员</string>
</resources>
app/src/main/res/values/strings_chen.xml
View file @ 110ea964
......@@ -26,6 +26,7 @@
<string name="replenishment_hint_supplierName">请输入供货商名称</string>
<string name="replenishment_tv_replenishmentDetail">定货详情</string>
<string name="replenishment_toast_noNeedDo">库存正常，无需补货</string>
<string name="replenishment_tv_amt">金额</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