Commit aa4dfbdd authored by zhang_z's avatar zhang_z

无码商品;

parent e26eafe0
...@@ -35,6 +35,11 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym ...@@ -35,6 +35,11 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
ToastUtils.showShort(msg); ToastUtils.showShort(msg);
} }
@Override
public void setSettleMode(int settleMode) {
mPaymentFragment.setSettleMode(settleMode);
}
@Override @Override
public void showSettle(Long amt) { public void showSettle(Long amt) {
Intent intent = new Intent(PaymentActivity.this, SettleActivity.class); Intent intent = new Intent(PaymentActivity.this, SettleActivity.class);
......
...@@ -15,6 +15,13 @@ interface PaymentContract { ...@@ -15,6 +15,13 @@ interface PaymentContract {
*/ */
void showMsg(String msg); void showMsg(String msg);
/**
* 根据收款模式设置页面
*
* @param settleMode 收款模式
*/
void setSettleMode(int settleMode);
/** /**
* 显示结算页面 * 显示结算页面
* *
......
...@@ -10,6 +10,7 @@ public class PaymentPresenter extends PaymentContract.Presenter { ...@@ -10,6 +10,7 @@ public class PaymentPresenter extends PaymentContract.Presenter {
@Override @Override
public void onAttached() { public void onAttached() {
mSettleMode = getIntent().getIntExtra(C.SP_KEY.SETTLE_MODE, C.SETTLE_MODE.PAYMENT); mSettleMode = getIntent().getIntExtra(C.SP_KEY.SETTLE_MODE, C.SETTLE_MODE.PAYMENT);
mView.setSettleMode(mSettleMode);
} }
@Override @Override
......
...@@ -29,4 +29,13 @@ public class PaymentFragment extends BaseFragment<PaymentPresenter, FragmentPaym ...@@ -29,4 +29,13 @@ public class PaymentFragment extends BaseFragment<PaymentPresenter, FragmentPaym
if (result > 0) mPresenter.clickSettle(result); if (result > 0) mPresenter.clickSettle(result);
}); });
} }
/**
* 根据收款模式设置页面
*
* @param settleMode 收款模式
*/
public void setSettleMode(int settleMode) {
mCalculatorView.setSettleMode(settleMode);
}
} }
...@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.payment.view; ...@@ -4,6 +4,7 @@ package com.xingdata.zzdpos.ui.payment.view;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.xingdata.zzdpos.C;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.base.BasePresenter; import com.xingdata.zzdpos.base.BasePresenter;
...@@ -20,6 +21,8 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie ...@@ -20,6 +21,8 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie
private String mValue; private String mValue;
private String mLast; private String mLast;
private int mSettleMode;
private OnResultChangeListener mOnResultChangeListener; private OnResultChangeListener mOnResultChangeListener;
private onSettleClickListener mOnSettleClickListener; private onSettleClickListener mOnSettleClickListener;
...@@ -38,6 +41,10 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie ...@@ -38,6 +41,10 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie
void onSettleClick(Long result); void onSettleClick(Long result);
} }
public void setSettleMode(int settleMode) {
this.mSettleMode = settleMode;
}
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.view_calculator; return R.layout.view_calculator;
...@@ -85,6 +92,14 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie ...@@ -85,6 +92,14 @@ public class CalculatorView<P extends BasePresenter> extends BaseFragment<P, Vie
} }
}; };
mViewBinding.setOnClick(mOnClickListener); mViewBinding.setOnClick(mOnClickListener);
switch (mSettleMode) {
case C.SETTLE_MODE.PAYMENT:
mViewBinding.setText(getString(R.string.inputer_settle));
break;
case C.SETTLE_MODE.STORE:
mViewBinding.setText(getString(R.string.inputer_confirm));
break;
}
} }
/** /**
......
...@@ -6,6 +6,11 @@ ...@@ -6,6 +6,11 @@
<variable <variable
name="onClick" name="onClick"
type="android.view.View.OnClickListener" /> type="android.view.View.OnClickListener" />
<variable
name="text"
type="String" />
</data> </data>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
...@@ -277,7 +282,7 @@ ...@@ -277,7 +282,7 @@
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
android:gravity="center" android:gravity="center"
android:onClickListener="@{onClick}" android:onClickListener="@{onClick}"
android:text="@string/inputer_settle" android:text="@{text}"
android:textColor="@color/white_caocao" android:textColor="@color/white_caocao"
android:textSize="@dimen/all_sub_title_size" android:textSize="@dimen/all_sub_title_size"
app:layout_constraintBottom_toBottomOf="@id/tv_0" app:layout_constraintBottom_toBottomOf="@id/tv_0"
......
...@@ -539,6 +539,7 @@ ...@@ -539,6 +539,7 @@
<string name="inputer_del">退格</string> <string name="inputer_del">退格</string>
<string name="inputer_clear">清空</string> <string name="inputer_clear">清空</string>
<string name="inputer_settle">收\n款</string> <string name="inputer_settle">收\n款</string>
<string name="inputer_confirm">确\n认</string>
<string name="inputer_add">+</string> <string name="inputer_add">+</string>
<string name="inputer_sub">-</string> <string name="inputer_sub">-</string>
<string name="inputer_mul">×</string> <string name="inputer_mul">×</string>
...@@ -741,6 +742,4 @@ ...@@ -741,6 +742,4 @@
<string name="search_clear">清空</string> <string name="search_clear">清空</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