Commit 110ea964 authored by zhang_z's avatar zhang_z

修改BUG;

parent 36b28d50
<component name="ProjectDictionaryState">
<dictionary name="Eurus">
<words>
<w>baseinfo</w>
</words>
</dictionary>
</component>
\ No newline at end of file
...@@ -304,7 +304,8 @@ public class SsskuPresenter extends SsskuContract.Presenter { ...@@ -304,7 +304,8 @@ public class SsskuPresenter extends SsskuContract.Presenter {
mView.showLoadingDialog(); mView.showLoadingDialog();
mCompositeDisposable.add( mCompositeDisposable.add(
ApiFactory.Sssku.querySssku(mPageNum, "", mSkuGrpId) ApiFactory.Sssku.querySssku(mPageNum, "", mSkuGrpId)
.doOnSubscribe(subscription -> mView.dismissLoadingDialog()) .doOnSubscribe(subscription -> mView.showLoadingDialog())
.doFinally(() -> mView.dismissLoadingDialog())
.subscribe(ssskuPager -> { .subscribe(ssskuPager -> {
if (mPageNum == 1 && mSkuGrpId == 0L) if (mPageNum == 1 && mSkuGrpId == 0L)
mView.loadSsskuCount(ssskuPager.getTotalRow()); mView.loadSsskuCount(ssskuPager.getTotalRow());
......
...@@ -101,16 +101,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -101,16 +101,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mLoadingDialog); mLoadingDialog);
} else if (nowtype == 1) { } else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId(); 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, mPresenter.sendTickerBefor(null, null, null, tickerId,
mLoadingDialog); mLoadingDialog);
return; 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); long tempServerId = SendTickerC.getServerId(tempLevelId);
//选择 当月下月以及流失会员 //选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() && if (tempLevelId == SendTickerC.getVipType(mContext).get(i).getId() &&
tempServerId != -1) { tempServerId != -1) {
mPresenter.sendTickerBefor(tempServerId + "", null, mPresenter.sendTickerBefor(tempServerId + "", null,
null, tickerId, null, tickerId,
...@@ -203,16 +203,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -203,16 +203,16 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mLoadingDialog); mLoadingDialog);
} else if (nowtype == 1) { } else if (nowtype == 1) {
Long tempLevelId = levelList.get(nowVipGroupId).getId(); 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, mPresenter.sendTicker(null, null, null, tickerId,
mLoadingDialog); mLoadingDialog);
return; 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); long tempServerId = SendTickerC.getServerId(tempLevelId);
//选择 当月下月以及流失会员 //选择 当月下月以及流失会员
if (tempLevelId == SendTickerC.getVipType().get(i).getId() && if (tempLevelId == SendTickerC.getVipType(mContext).get(i).getId() &&
tempServerId != -1) { tempServerId != -1) {
mPresenter.sendTicker(tempServerId + "", null, mPresenter.sendTicker(tempServerId + "", null,
null, tickerId, null, tickerId,
...@@ -234,15 +234,15 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter, ...@@ -234,15 +234,15 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
mViewBinding.llAll.setVisibility(View.VISIBLE); mViewBinding.llAll.setVisibility(View.VISIBLE);
RealmResults<Level> levels = DBFactory.getRealm().where(Level.class).findAll(); RealmResults<Level> levels = DBFactory.getRealm().where(Level.class).findAll();
levelList = new ArrayList<>(); levelList = new ArrayList<>();
SendTickerC.getVipType().get(0).setSelect(true); SendTickerC.getVipType(mContext).get(0).setSelect(true);
levelList.add(SendTickerC.getVipType().get(0)); levelList.add(SendTickerC.getVipType(mContext).get(0));
for (int i = 0; i < levels.size(); i++) { for (int i = 0; i < levels.size(); i++) {
levels.get(i).setSelect(false); levels.get(i).setSelect(false);
levelList.add(levels.get(i)); levelList.add(levels.get(i));
} }
for (int i = 1; i < SendTickerC.getVipType().size(); i++) { for (int i = 1; i < SendTickerC.getVipType(mContext).size(); i++) {
SendTickerC.getVipType().get(i).setSelect(false); SendTickerC.getVipType(mContext).get(i).setSelect(false);
levelList.add(SendTickerC.getVipType().get(i)); levelList.add(SendTickerC.getVipType(mContext).get(i));
} }
mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName()); mViewBinding.tvSelect.setText(levelList.get(nowVipGroupId).getVipLevelName());
mViewBinding.vipType.setAdapter(vipGroupAdapter); mViewBinding.vipType.setAdapter(vipGroupAdapter);
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<string name="replenishment_hint_supplierName">Please enter the supplier name</string> <string name="replenishment_hint_supplierName">Please enter the supplier name</string>
<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>
<!--盘点界面--> <!--盘点界面-->
...@@ -68,7 +69,7 @@ ...@@ -68,7 +69,7 @@
<string name="ticket_tv_sendSuc">Successful issue</string> <string name="ticket_tv_sendSuc">Successful issue</string>
<string name="ticket_default_allVip">All vip</string> <string name="ticket_default_allVip">All vip</string>
<string name="ticket_default_monthBirthday">Birthday of this month</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> <string name="ticket_default_lostVip">Lost Vip</string>
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<string name="replenishment_hint_supplierName">请输入供货商名称</string> <string name="replenishment_hint_supplierName">请输入供货商名称</string>
<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>
<!--盘点界面--> <!--盘点界面-->
...@@ -72,6 +73,4 @@ ...@@ -72,6 +73,4 @@
<string name="ticket_default_lostVip">流失会员</string> <string name="ticket_default_lostVip">流失会员</string>
</resources> </resources>
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
<string name="replenishment_hint_supplierName">请输入供货商名称</string> <string name="replenishment_hint_supplierName">请输入供货商名称</string>
<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>
<!--盘点界面--> <!--盘点界面-->
......
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