Skip to content

T
TangKuPos
Commit 90ab1f01 authored by 陈前's avatar 陈前
Browse files
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
parents 546cf125 d0dab3f5
Hide whitespace changes
Inline Side-by-side
Showing with 1327 additions and 719 deletions
app/src/main/AndroidManifest.xml
View file @ 90ab1f01
...@@ -57,6 +57,11 @@ ...@@ -57,6 +57,11 @@
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket" android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" /> android:theme="@style/AppTheme" />
<activity
android:name=".ui.sendTicke.SendTicketActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:label="@string/title_activity_ticket"
android:theme="@style/AppTheme" />
<activity <activity
android:name=".ui.settle.SettleActivity" android:name=".ui.settle.SettleActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
......
app/src/main/java/com/xingdata/zzdpos/ui/login/LoginActivity.java
View file @ 90ab1f01
...@@ -23,6 +23,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean; ...@@ -23,6 +23,7 @@ import com.xingdata.zzdpos.ui.login.fragment.bean.LoginReturnBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity; import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.payment.PaymentActivity; import com.xingdata.zzdpos.ui.payment.PaymentActivity;
import com.xingdata.zzdpos.ui.splash.SplashActivity; import com.xingdata.zzdpos.ui.splash.SplashActivity;
import com.xingdata.zzdpos.view.PopupWindowDownList; import com.xingdata.zzdpos.view.PopupWindowDownList;
...@@ -138,7 +139,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin ...@@ -138,7 +139,7 @@ public class LoginActivity extends BaseActivity<LoginPresenter, ActivityLoginBin
promptDialog.dismiss(); promptDialog.dismiss();
//如果sn已经绑定款台，则直接跳转主页 //如果sn已经绑定款台，则直接跳转主页
if (loginReturnBean.getBindSN()) { if (loginReturnBean.getBindSN()) {
startActivity(new Intent(LoginActivity.this, MainActivity.class)); startActivity(new Intent(LoginActivity.this, ReturnTicketActivity.class));
LoginActivity.this.finish(); LoginActivity.this.finish();
return; return;
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketActivity.java
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.marketing.ticket; package com.xingdata.zzdpos.ui.marketing.ticket;
import android.support.v7.widget.GridLayoutManager;
import android.text.Html;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.blankj.utilcode.util.LogUtils; import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
...@@ -13,18 +8,10 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding; ...@@ -13,18 +8,10 @@ import com.xingdata.zzdpos.databinding.ActivityReturnTicketBinding;
import com.xingdata.zzdpos.model.Pager; import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule; import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.adapter.ReturnTicketAdapter;
import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
import com.xingdata.zzdpos.util.OnClickListener;
import com.xingdata.zzdpos.util.RecyclerViewUtil;
import java.util.ArrayList;
public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter, public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
ActivityReturnTicketBinding> ActivityReturnTicketBinding>
implements ReturnTicketContract.View { implements ReturnTicketContract.View {
ReturnTicketAdapter returnTicketAdapter;
LoadingDialog loadingDialog = new LoadingDialog(); LoadingDialog loadingDialog = new LoadingDialog();
@Override @Override
...@@ -34,49 +21,7 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter, ...@@ -34,49 +21,7 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("优惠券规则"); loadRootFragment(R.id.frg, mPresenter.tickerIndexFragment);
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(ReturnTicketActivity.class);
}
});
mViewBinding.btnGroup.setText(Html.fromHtml(
getResources().
getString(R.string
.tv_ticket_count, "<font color='#1f7bdb'><big> " + "0" + " " +
"</big></font>")));
final int SPACING = mContext.getResources().getDimensionPixelOffset(R.dimen
.vip_message_item_spacing);
returnTicketAdapter = new
ReturnTicketAdapter(new ArrayList<>(), mPresenter);
mViewBinding.rcTicket.setAdapter(returnTicketAdapter);
mViewBinding.rcTicket.setLayoutManager(new
GridLayoutManager(ReturnTicketActivity.this,
4));
mViewBinding.rcTicket.addItemDecoration(new RecyclerViewUtil.GridSpacingItemDecoration(4,
SPACING, true));
mViewBinding.setOnClickListener(view ->
{
switch (view.getId()) {
case R.id.btn_add: {
mPresenter.ticketAddDialog = new TicketAddDialog();
mPresenter.ticketAddDialog.show(this);
}
break;
default: {
}
break;
}
});
} }
...@@ -89,45 +34,27 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter, ...@@ -89,45 +34,27 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
@Override @Override
public void addSucc(LoadingDialog loadingDialog) { public void addSucc(LoadingDialog loadingDialog) {
if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) { // if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
mPresenter.ticketAddDialog.dismiss(); // mPresenter.ticketAddDialog.dismiss();
} // }
pop();
mPresenter.truleQuery(loadingDialog); mPresenter.truleQuery(loadingDialog);
} }
@Override @Override
public void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog) { public void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog) {
closeLoading(loadingDialog); mPresenter.tickerIndexFragment.truleQuerySucc(trulePager, loadingDialog);
if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
0) {
mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
}
if (trulePager != null && trulePager.getList() != null) {
mViewBinding.tvEmpty.setVisibility(View.GONE);
returnTicketAdapter.setNewData(trulePager.getList());
mViewBinding.btnGroup.setText(Html.fromHtml(getResources().getString(R.string
.tv_ticket_count,
"<font color='#1f7bdb'><big> " + trulePager.getList().size() + " " +
"</big></font>")));
}
} }
@Override @Override
public void truleUpdateSucc(LoadingDialog loadingDialog) { public void truleUpdateSucc(LoadingDialog loadingDialog) {
if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) { // if (mPresenter.ticketAddDialog != null && mPresenter.ticketAddDialog.isShowing) {
mPresenter.ticketAddDialog.dismiss(); // mPresenter.ticketAddDialog.dismiss();
} // }
pop();
mPresenter.truleQuery(loadingDialog); mPresenter.truleQuery(loadingDialog);
} }
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
@Override @Override
protected void onResume() { protected void onResume() {
...@@ -136,4 +63,9 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter, ...@@ -136,4 +63,9 @@ public class ReturnTicketActivity extends BaseActivity<ReturnTicketPresenter,
mPresenter.truleQuery(loadingDialog); mPresenter.truleQuery(loadingDialog);
} }
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
} }
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/ReturnTicketPresenter.java
View file @ 90ab1f01
...@@ -5,7 +5,8 @@ import android.support.annotation.Nullable; ...@@ -5,7 +5,8 @@ import android.support.annotation.Nullable;
import com.xingdata.zzdpos.api.ApiFactory; import com.xingdata.zzdpos.api.ApiFactory;
import com.xingdata.zzdpos.model.Trule; import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog; import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerAddFragment;
import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerIndexFragment;
/** /**
...@@ -13,8 +14,8 @@ import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog; ...@@ -13,8 +14,8 @@ import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog;
*/ */
public class ReturnTicketPresenter extends ReturnTicketContract.Presenter { public class ReturnTicketPresenter extends ReturnTicketContract.Presenter {
public TicketAddDialog ticketAddDialog; public TickerIndexFragment tickerIndexFragment = new TickerIndexFragment();
public TickerAddFragment tickerAddFragment = new TickerAddFragment();
@Override @Override
public void onAttached() { public void onAttached() {
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/adapter/ReturnTicketAdapter.java
View file @ 90ab1f01
...@@ -4,14 +4,13 @@ import android.support.annotation.Nullable; ...@@ -4,14 +4,13 @@ import android.support.annotation.Nullable;
import android.view.View; import android.view.View;
import com.blankj.utilcode.util.TimeUtils; import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseAdapter; import com.xingdata.zzdpos.base.BaseAdapter;
import com.xingdata.zzdpos.databinding.ItemReturnTicketBinding; import com.xingdata.zzdpos.databinding.ItemReturnTicketBinding;
import com.xingdata.zzdpos.model.Trule; import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter; import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.ui.marketing.ticket.dialog.TicketAddDialog; import com.xingdata.zzdpos.ui.marketing.ticket.fragment.TickerAddFragment;
import com.xingdata.zzdpos.util.ConvertUtil; import com.xingdata.zzdpos.util.ConvertUtil;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
...@@ -19,19 +18,24 @@ import java.util.List; ...@@ -19,19 +18,24 @@ import java.util.List;
public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBinding> { public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBinding> {
ReturnTicketPresenter mPersenter; ReturnTicketPresenter mPersenter;
ReturnTicketActivity returnTicketActivity;
public ReturnTicketAdapter(@Nullable List<Trule> data, ReturnTicketPresenter mPersenter) { public ReturnTicketAdapter(@Nullable List<Trule> data, ReturnTicketPresenter mPersenter,
ReturnTicketActivity returnTicketActivity) {
super(R.layout.item_return_ticket, data); super(R.layout.item_return_ticket, data);
this.mPersenter = mPersenter; this.mPersenter = mPersenter;
this.returnTicketActivity = returnTicketActivity;
} }
@Override @Override
protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) { protected void convert(ItemReturnTicketBinding mViewBinding, Trule item) {
mViewBinding.tvTicket.setText("优\n惠\n券");
// mViewBinding.tvSend.setText("发\n券"); // mViewBinding.tvSend.setText("发\n券");
mViewBinding.tvSend.setText("\n"); // mViewBinding.tvSend.setText("\n");
mViewBinding.tvTicketMoney.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())); mViewBinding.tvTicketMoney.setText(mContext.getResources().getString(R.string.tv_money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvTicketMoneys.setText(mContext.getResources().getString(R.string.money,
ConvertUtil.fenToYuanNoPoint(item.getTruleValAmt())));
mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule, mViewBinding.tvRule.setText(mContext.getResources().getString(R.string.tv_rule,
ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()))); ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt())));
mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date, mViewBinding.tvDate.setText(mContext.getResources().getString(R.string.tv_date,
...@@ -39,16 +43,16 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind ...@@ -39,16 +43,16 @@ public class ReturnTicketAdapter extends BaseAdapter<Trule, ItemReturnTicketBind
mViewBinding.clSend.setOnClickListener(new View.OnClickListener() { mViewBinding.clSend.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
ToastUtils.showLong("发券"); // ToastUtils.showLong("发券");
} }
}); });
mViewBinding.clItem.setOnClickListener(new View.OnClickListener() { mViewBinding.clItem.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View view) { public void onClick(View view) {
mPersenter.ticketAddDialog = new TicketAddDialog(); mPersenter.tickerAddFragment = new TickerAddFragment();
mPersenter.ticketAddDialog.setNowType(2); mPersenter.tickerAddFragment.setNowType(2);
mPersenter.ticketAddDialog.editTicketData(item); mPersenter.tickerAddFragment.editTicketData(item);
mPersenter.ticketAddDialog.show((BaseActivity) mContext); returnTicketActivity.start(mPersenter.tickerAddFragment);
} }
}); });
......
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/dialog/TicketAddDialog.java
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.marketing.ticket.dialog; //package com.xingdata.zzdpos.ui.marketing.ticket.dialog;
//
import android.annotation.SuppressLint; //import android.annotation.SuppressLint;
import android.app.DatePickerDialog; //import android.app.DatePickerDialog;
import android.content.Context; //import android.content.Context;
import android.text.Editable; //import android.text.Editable;
import android.text.TextUtils; //import android.text.TextUtils;
import android.text.TextWatcher; //import android.text.TextWatcher;
import android.view.View; //import android.view.View;
import android.view.inputmethod.InputMethodManager; //import android.view.inputmethod.InputMethodManager;
import android.widget.DatePicker; //import android.widget.DatePicker;
import android.widget.TextView; //import android.widget.TextView;
//
import com.blankj.utilcode.util.TimeUtils; //import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils; //import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; //import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; //import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseDialog; //import com.xingdata.zzdpos.base.BaseDialog;
import com.xingdata.zzdpos.databinding.DialogTicketAddSettingBinding; //import com.xingdata.zzdpos.databinding.DialogTicketAddSettingBinding;
import com.xingdata.zzdpos.model.Trule; //import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; //import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter; //import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.util.ConvertUtil; //import com.xingdata.zzdpos.util.ConvertUtil;
//
import java.text.SimpleDateFormat; //import java.text.SimpleDateFormat;
import java.util.Calendar; //import java.util.Calendar;
//
/** ///**
* 积分获取设置界面 // * 积分获取设置界面
*/ // */
public class TicketAddDialog extends BaseDialog<ReturnTicketPresenter, //public class TicketAddDialog extends BaseDialog<ReturnTicketPresenter,
DialogTicketAddSettingBinding> { // DialogTicketAddSettingBinding> {
LoadingDialog loadingDialog = new LoadingDialog(); // LoadingDialog loadingDialog = new LoadingDialog();
//0：正常 1暂停 // //0：正常 1暂停
private byte nowStatus = 1; // private byte nowStatus = 1;
//当前编辑的对象 // //当前编辑的对象
private Trule trule = new Trule(); // private Trule trule = new Trule();
//1为新增，2为更新 // //1为新增，2为更新
private int nowType = 1; // private int nowType = 1;
//
@Override // @Override
public int getLayoutId() { // public int getLayoutId() {
return R.layout.dialog_ticket_add_setting; // return R.layout.dialog_ticket_add_setting;
} // }
//
@Override // @Override
protected boolean isShowTitle() { // protected boolean isShowTitle() {
return true; // return true;
} // }
//
@Override // @Override
public int getTitle() { // public int getTitle() {
return R.string.return_ticket_title; // return R.string.return_ticket_title;
} // }
//
@SuppressLint("SetTextI18n") // @SuppressLint("SetTextI18n")
@Override // @Override
public void initView() { // public void initView() {
hintKbTwo(); // hintKbTwo();
mViewBinding.etTicketMoney.addTextChangedListener(mTextWatcher); // mViewBinding.etTicketMoney.addTextChangedListener(mTextWatcher);
mViewBinding.etRuleMoney.addTextChangedListener(mTextWatcher); // mViewBinding.etRuleMoney.addTextChangedListener(mTextWatcher);
mViewBinding.etTicketCount.addTextChangedListener(mTextWatcher); // mViewBinding.etTicketCount.addTextChangedListener(mTextWatcher);
if (nowType == 2) { // if (nowType == 2) {
setTitle("编辑优惠券"); // setTitle("编辑优惠券");
mViewBinding.tvIntegralRuleName.setText(trule.getTruleName()); // mViewBinding.tvIntegralRuleName.setText(trule.getTruleName());
if (trule.getTruleStatus() == 1) { // if (trule.getTruleStatus() == 1) {
mViewBinding.rbSuspended.setChecked(true); // mViewBinding.rbSuspended.setChecked(true);
} else if (trule.getTruleStatus() == 0) { // } else if (trule.getTruleStatus() == 0) {
mViewBinding.rbStart.setChecked(true); // mViewBinding.rbStart.setChecked(true);
} // }
//
mViewBinding.etTicketMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleValAmt // mViewBinding.etTicketMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleValAmt
())); // ()));
mViewBinding.tvDate.setText(TimeUtils.millis2String(trule.getTruleExp(), new // mViewBinding.tvDate.setText(TimeUtils.millis2String(trule.getTruleExp(), new
SimpleDateFormat("yyyy-mm-dd"))); // SimpleDateFormat("yyyy-mm-dd")));
mViewBinding.etRuleMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleOrderAmt // mViewBinding.etRuleMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleOrderAmt
())); // ()));
mViewBinding.etTicketCount.setText(trule.getTruleUseNum() + ""); // mViewBinding.etTicketCount.setText(trule.getTruleUseNum() + "");
} // }
mViewBinding.setOnClickListener(view -> { // mViewBinding.setOnClickListener(view -> {
hintKbTwo(); // hintKbTwo();
switch (view.getId()) { // switch (view.getId()) {
case R.id.tv_date: { // case R.id.tv_date: {
showDialogPick(mViewBinding.tvDate); // showDialogPick(mViewBinding.tvDate);
//
} // }
break; // break;
case R.id.rb_suspended: { // case R.id.rb_suspended: {
//暂停 // //暂停
nowStatus = 1; // nowStatus = 1;
} // }
break; // break;
case R.id.rb_start: { // case R.id.rb_start: {
//启用 // //启用
nowStatus = 0; // nowStatus = 0;
//
} // }
break; // break;
default: { // default: {
//
} // }
break; // break;
} // }
}); // });
} // }
//
//
public void editTicketData(Trule trule) { // public void editTicketData(Trule trule) {
this.trule = trule; // this.trule = trule;
} // }
//
@Override // @Override
public void onConfirmClick(View view) { // public void onConfirmClick(View view) {
//
if (isNull()) { // if (isNull()) {
//
if (Integer.parseInt(mViewBinding.etRuleMoney.getText().toString()) <= Integer // if (Integer.parseInt(mViewBinding.etRuleMoney.getText().toString()) <= Integer
.parseInt(mViewBinding.etTicketMoney.getText().toString())) { // .parseInt(mViewBinding.etTicketMoney.getText().toString())) {
ToastUtils.showLong("可用金额需大于优惠券面值 "); // ToastUtils.showLong("可用金额需大于优惠券面值 ");
return; // return;
} // }
loadingDialog.show((BaseActivity) mContext); // loadingDialog.show((BaseActivity) mContext);
if (nowType == 1) { // if (nowType == 1) {
mPresenter.add(getUiData(), loadingDialog); // mPresenter.add(getUiData(), loadingDialog);
} else if (nowType == 2) { // } else if (nowType == 2) {
mPresenter.truleUpdate(getUiData(), loadingDialog); // mPresenter.truleUpdate(getUiData(), loadingDialog);
} // }
} else { // } else {
ToastUtils.showLong("输入数据不能null"); // ToastUtils.showLong("输入数据不能null");
} // }
super.onConfirmClick(view); // super.onConfirmClick(view);
} // }
//
private Trule getUiData() { // private Trule getUiData() {
mViewBinding.tvIntegralRuleName.setText(mViewBinding.etTicketMoney.getText().toString() + // mViewBinding.tvIntegralRuleName.setText(mViewBinding.etTicketMoney.getText().toString() +
"元优惠券"); // "元优惠券");
trule.setTruleName(mViewBinding.tvIntegralRuleName.getText().toString()); // trule.setTruleName(mViewBinding.tvIntegralRuleName.getText().toString());
//0：正常 1暂停 默认0 // //0：正常 1暂停 默认0
trule.setTruleStatus(nowStatus); // trule.setTruleStatus(nowStatus);
trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString // trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString
())); // ()));
trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString(), new // trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString(), new
SimpleDateFormat("yyyy-mm-dd"))); // SimpleDateFormat("yyyy-mm-dd")));
trule.setTruleOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etRuleMoney.getText().toString // trule.setTruleOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etRuleMoney.getText().toString
())); // ()));
if (!mViewBinding.etTicketCount.getText().toString().equals("")) { // if (!mViewBinding.etTicketCount.getText().toString().equals("")) {
trule.setTruleUseNum(Byte.parseByte(mViewBinding.etTicketCount.getText().toString())); // trule.setTruleUseNum(Byte.parseByte(mViewBinding.etTicketCount.getText().toString()));
} else { // } else {
trule.setTruleUseNum((byte) 1); // trule.setTruleUseNum((byte) 1);
} // }
return trule; // return trule;
} // }
//
/** // /**
* 判断用户输入数据是否为null // * 判断用户输入数据是否为null
* // *
* @return 输入为null返回false 反之返回true // * @return 输入为null返回false 反之返回true
*/ // */
private boolean isNull() { // private boolean isNull() {
return !(TextUtils.isEmpty(mViewBinding.etTicketMoney.getText().toString()) // return !(TextUtils.isEmpty(mViewBinding.etTicketMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.tvDate.getText().toString()) // || TextUtils.isEmpty(mViewBinding.tvDate.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etRuleMoney.getText().toString()) // || TextUtils.isEmpty(mViewBinding.etRuleMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etTicketCount.getText().toString())); // || TextUtils.isEmpty(mViewBinding.etTicketCount.getText().toString()));
} // }
//
//
//将两个选择时间的dialog放在该函数中 // //将两个选择时间的dialog放在该函数中
private void showDialogPick(final View btn) { // private void showDialogPick(final View btn) {
//获取Calendar对象，用于获取当前时间 // //获取Calendar对象，用于获取当前时间
final Calendar calendar = Calendar.getInstance(); // final Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR); // int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH); // int month = calendar.get(Calendar.MONTH);
int day = calendar.get(Calendar.DAY_OF_MONTH); // int day = calendar.get(Calendar.DAY_OF_MONTH);
//实例化DatePickerDialog对象 // //实例化DatePickerDialog对象
DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new // DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new
DatePickerDialog.OnDateSetListener() { // DatePickerDialog.OnDateSetListener() {
//选择完日期后会调用该回调函数 // //选择完日期后会调用该回调函数
@Override // @Override
public void onDateSet(DatePicker view, int year, int monthOfYear, int // public void onDateSet(DatePicker view, int year, int monthOfYear, int
dayOfMonth) { // dayOfMonth) {
//因为monthOfYear会比实际月份少一月所以这边要加1 // //因为monthOfYear会比实际月份少一月所以这边要加1
((TextView) btn).setText(year + "-" + (monthOfYear + 1) + "-" + dayOfMonth); // ((TextView) btn).setText(year + "-" + (monthOfYear + 1) + "-" + dayOfMonth);
} // }
}, year, month, day); // }, year, month, day);
//弹出选择日期对话框 // //弹出选择日期对话框
datePickerDialog.show(); // datePickerDialog.show();
} // }
//
/** // /**
* 显示软键盘，Dialog使用 // * 显示软键盘，Dialog使用
*/ // */
public void hintKbTwo() { // public void hintKbTwo() {
View view = getDialog().getCurrentFocus(); // View view = getDialog().getCurrentFocus();
if (view == null) { // if (view == null) {
return; // return;
} // }
if (view instanceof TextView) { // if (view instanceof TextView) {
InputMethodManager mInputMethodManager = (InputMethodManager) getContext() // InputMethodManager mInputMethodManager = (InputMethodManager) getContext()
.getSystemService(Context.INPUT_METHOD_SERVICE); // .getSystemService(Context.INPUT_METHOD_SERVICE);
mInputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager // mInputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager
.RESULT_UNCHANGED_SHOWN); // .RESULT_UNCHANGED_SHOWN);
} // }
} // }
//
private TextWatcher mTextWatcher = new TextWatcher() { // private TextWatcher mTextWatcher = new TextWatcher() {
//
@Override // @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { // public void onTextChanged(CharSequence s, int start, int before, int count) {
//
} // }
//
@Override // @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { // public void beforeTextChanged(CharSequence s, int start, int count, int after) {
//
} // }
//
@Override // @Override
public void afterTextChanged(Editable s) { // public void afterTextChanged(Editable s) {
String text = s.toString(); // String text = s.toString();
int len = s.toString().length(); // int len = s.toString().length();
if (len == 1 && text.equals("0")) { // if (len == 1 && text.equals("0")) {
s.clear(); // s.clear();
} // }
} // }
}; // };
//
public void setNowType(int type) { // public void setNowType(int type) {
trule = new Trule(); // trule = new Trule();
this.nowType = type; // this.nowType = type;
} // }
//
@Override // @Override
public void dismiss() { // public void dismiss() {
hintKbTwo(); // hintKbTwo();
super.dismiss(); // super.dismiss();
} // }
//
} //}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerAddFragment.java 0 → 100644
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.marketing.ticket.fragment;
import android.app.DatePickerDialog;
import android.content.Context;
import android.text.Editable;
import android.text.TextUtils;
import android.text.TextWatcher;
import android.view.View;
import android.view.inputmethod.InputMethodManager;
import android.widget.DatePicker;
import android.widget.TextView;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.DialogTicketAddSettingBinding;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.util.ConvertUtil;
import com.xingdata.zzdpos.util.OnClickListener;
import java.text.SimpleDateFormat;
import java.util.Calendar;
public class TickerAddFragment extends BaseFragment<ReturnTicketPresenter,
DialogTicketAddSettingBinding> {
LoadingDialog loadingDialog = new LoadingDialog();
//0：正常 1暂停
private byte nowStatus = 1;
//当前编辑的对象
private Trule trule = new Trule();
//1为新增，2为更新
private int nowType = 1;
@Override
public int getLayoutId() {
return R.layout.dialog_ticket_add_setting;
}
@Override
public void initView() {
mViewBinding.icTitles.tvTitle.setText("新增优惠券");
mViewBinding.icTitles.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
hintKbTwo();
mViewBinding.etTicketMoney.addTextChangedListener(mTextWatcher);
mViewBinding.etRuleMoney.addTextChangedListener(mTextWatcher);
mViewBinding.etTicketCount.addTextChangedListener(mTextWatcher);
if (nowType == 2) {
mViewBinding.icTitles.tvTitle.setText("编辑优惠券");
mViewBinding.tvIntegralRuleName.setText(trule.getTruleName());
if (trule.getTruleStatus() == 1) {
mViewBinding.rbSuspended.setChecked(true);
} else if (trule.getTruleStatus() == 0) {
mViewBinding.rbStart.setChecked(true);
}
mViewBinding.etTicketMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleValAmt
()));
mViewBinding.tvDate.setText(TimeUtils.millis2String(trule.getTruleExp(), new
SimpleDateFormat("yyyy-mm-dd")));
mViewBinding.etRuleMoney.setText(ConvertUtil.fenToYuanNoPoint(trule.getTruleOrderAmt
()));
mViewBinding.etTicketCount.setText(trule.getTruleUseNum() + "");
}
mViewBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View view) {
hintKbTwo();
switch (view.getId()) {
case R.id.tv_date: {
showDialogPick(mViewBinding.tvDate);
}
break;
case R.id.rb_suspended: {
//暂停
nowStatus = 1;
}
break;
case R.id.rb_start: {
//启用
nowStatus = 0;
}
break;
case R.id.btn_add:{
if (isNull()) {
if (Integer.parseInt(mViewBinding.etRuleMoney.getText().toString()) <= Integer
.parseInt(mViewBinding.etTicketMoney.getText().toString())) {
ToastUtils.showLong("可用金额需大于优惠券面值 ");
return;
}
loadingDialog.show((BaseActivity) mContext);
if (nowType == 1) {
mPresenter.add(getUiData(), loadingDialog);
} else if (nowType == 2) {
mPresenter.truleUpdate(getUiData(), loadingDialog);
}
} else {
ToastUtils.showLong("输入数据不能null");
}
}
break;
default: {
}
break;
}
}
});
}
public void editTicketData(Trule trule) {
this.trule = trule;
}
private Trule getUiData() {
mViewBinding.tvIntegralRuleName.setText(mViewBinding.etTicketMoney.getText().toString() +
"元优惠券");
trule.setTruleName(mViewBinding.tvIntegralRuleName.getText().toString());
//0：正常 1暂停 默认0
trule.setTruleStatus(nowStatus);
trule.setTruleValAmt(ConvertUtil.yuanToFen(mViewBinding.etTicketMoney.getText().toString
()));
trule.setTruleExp(TimeUtils.string2Millis(mViewBinding.tvDate.getText().toString(), new
SimpleDateFormat("yyyy-mm-dd")));
trule.setTruleOrderAmt(ConvertUtil.yuanToFen(mViewBinding.etRuleMoney.getText().toString
()));
if (!mViewBinding.etTicketCount.getText().toString().equals("")) {
trule.setTruleUseNum(Byte.parseByte(mViewBinding.etTicketCount.getText().toString()));
} else {
trule.setTruleUseNum((byte) 1);
}
return trule;
}
/**
* 判断用户输入数据是否为null
*
* @return 输入为null返回false 反之返回true
*/
private boolean isNull() {
return !(TextUtils.isEmpty(mViewBinding.etTicketMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.tvDate.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etRuleMoney.getText().toString())
|| TextUtils.isEmpty(mViewBinding.etTicketCount.getText().toString()));
}
//将两个选择时间的dialog放在该函数中
private void showDialogPick(final View btn) {
//获取Calendar对象，用于获取当前时间
final Calendar calendar = Calendar.getInstance();
int year = calendar.get(Calendar.YEAR);
int month = calendar.get(Calendar.MONTH);
int day = calendar.get(Calendar.DAY_OF_MONTH);
//实例化DatePickerDialog对象
DatePickerDialog datePickerDialog = new DatePickerDialog(mContext, new
DatePickerDialog.OnDateSetListener() {
//选择完日期后会调用该回调函数
@Override
public void onDateSet(DatePicker view, int year, int monthOfYear, int
dayOfMonth) {
//因为monthOfYear会比实际月份少一月所以这边要加1
((TextView) btn).setText(year + "-" + (monthOfYear + 1) + "-" + dayOfMonth);
}
}, year, month, day);
//弹出选择日期对话框
datePickerDialog.show();
}
/**
* 显示软键盘，Dialog使用
*/
public void hintKbTwo() {
View view = getActivity().getCurrentFocus();
if (view == null) {
return;
}
if (view instanceof TextView) {
InputMethodManager mInputMethodManager = (InputMethodManager) getContext()
.getSystemService(Context.INPUT_METHOD_SERVICE);
mInputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), InputMethodManager
.RESULT_UNCHANGED_SHOWN);
}
}
private TextWatcher mTextWatcher = new TextWatcher() {
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void afterTextChanged(Editable s) {
String text = s.toString();
int len = s.toString().length();
if (len == 1 && text.equals("0")) {
s.clear();
}
}
};
public void setNowType(int type) {
trule = new Trule();
this.nowType = type;
}
}
app/src/main/java/com/xingdata/zzdpos/ui/marketing/ticket/fragment/TickerIndexFragment.java 0 → 100644
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.marketing.ticket.fragment;
import android.support.v7.widget.LinearLayoutManager;
import android.text.Html;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentTickerMainBinding;
import com.xingdata.zzdpos.model.Pager;
import com.xingdata.zzdpos.model.Trule;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketActivity;
import com.xingdata.zzdpos.ui.marketing.ticket.ReturnTicketPresenter;
import com.xingdata.zzdpos.ui.marketing.ticket.adapter.ReturnTicketAdapter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
public class TickerIndexFragment extends BaseFragment<ReturnTicketPresenter,
FragmentTickerMainBinding> {
ReturnTicketAdapter returnTicketAdapter;
LoadingDialog loadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.fragment_ticker_main;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("优惠券规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(ReturnTicketActivity.class);
}
});
mViewBinding.btnGroup.setText(Html.fromHtml(
getResources().getString(R.string.tv_ticket_count, "<font color='#1f7bdb'><big> "
+ "0" + " " + "</big></font>")));
returnTicketAdapter = new ReturnTicketAdapter(new ArrayList<>(), mPresenter,
(ReturnTicketActivity) getActivity());
mViewBinding.rcTicket.setAdapter(returnTicketAdapter);
LinearLayoutManager linearLayoutManager = new LinearLayoutManager(getActivity());
linearLayoutManager.setOrientation(LinearLayoutManager.VERTICAL);
mViewBinding.rcTicket.setLayoutManager(linearLayoutManager);
mViewBinding.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View view) {
switch (view.getId()) {
case R.id.btn_add: {
// mPresenter.ticketAddDialog = new TicketAddDialog();
// mPresenter.ticketAddDialog.show(this);
mPresenter.tickerAddFragment = new TickerAddFragment();
start(mPresenter.tickerAddFragment);
}
break;
default: {
}
break;
}
}
});
}
public void truleQuerySucc(Pager<Trule> trulePager, LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
if (trulePager == null || trulePager.getList() == null || trulePager.getList().size() <=
0) {
mViewBinding.tvEmpty.setVisibility(View.VISIBLE);
}
if (trulePager != null && trulePager.getList() != null) {
mViewBinding.tvEmpty.setVisibility(View.GONE);
returnTicketAdapter.setNewData(trulePager.getList());
mViewBinding.btnGroup.setText(Html.fromHtml(getResources().getString(R.string
.tv_ticket_count,
"<font color='#1f7bdb'><big> " + trulePager.getList().size() + " " +
"</big></font>")));
}
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketActivity.java 0 → 100644
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.sendTicke;
import com.blankj.utilcode.util.LogUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivitySendTicketBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
public class SendTicketActivity extends BaseActivity<SendTicketPresenter,
ActivitySendTicketBinding>
implements SendTicketContract.View {
LoadingDialog loadingDialog = new LoadingDialog();
@Override
public int getLayoutId() {
return R.layout.activity_send_ticket;
}
@Override
public void initView() {
loadRootFragment(R.id.fragment, mPresenter.sendTickerIndexFragment);
}
@Override
public void error(String errorMsg, LoadingDialog loadingDialog) {
closeLoading(loadingDialog);
LogUtils.e(errorMsg);
ToastUtils.showLong(errorMsg);
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketContract.java 0 → 100644
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.sendTicke;
import com.xingdata.zzdpos.base.BasePresenter;
import com.xingdata.zzdpos.base.BaseView;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
/**
* Created by Administrator on 2017/11/24.
*/
public interface SendTicketContract {
interface View extends BaseView {
void error(String errorMsg, LoadingDialog loadingDialog);
}
abstract class Presenter extends BasePresenter<View> {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/SendTicketPresenter.java 0 → 100644
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.sendTicke;
import com.xingdata.zzdpos.ui.sendTicke.fragment.SendTickerIndexFragment;
/**
* Created by Administrator on 2017/11/24.
*/
public class SendTicketPresenter extends SendTicketContract.Presenter {
public SendTickerIndexFragment sendTickerIndexFragment = new SendTickerIndexFragment();
@Override
public void onAttached() {
}
}
app/src/main/java/com/xingdata/zzdpos/ui/sendTicke/fragment/SendTickerIndexFragment.java 0 → 100644
View file @ 90ab1f01
package com.xingdata.zzdpos.ui.sendTicke.fragment;
import android.view.View;
import com.blankj.utilcode.util.ActivityUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSendTickerMainBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.marketing.integral.IntegralActivity;
import com.xingdata.zzdpos.ui.sendTicke.SendTicketPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
public class SendTickerIndexFragment extends BaseFragment<SendTicketPresenter,
FragmentSendTickerMainBinding> {
@Override
public int getLayoutId() {
return R.layout.fragment_send_ticker_main;
}
@Override
public void initView() {
mViewBinding.icTitle.tvTitle.setText("积分规则");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
ActivityUtils.finishActivity(IntegralActivity.class);
}
});
}
private void closeLoading(LoadingDialog loadingDialog) {
if (loadingDialog != null) {
loadingDialog.dismiss();
}
}
}
app/src/main/res/layout/activity_return_ticket.xml
View file @ 90ab1f01
...@@ -15,98 +15,15 @@ ...@@ -15,98 +15,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/appBack" android:background="@color/appBack"
tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity"> tools:context="com.xingdata.zzdhd.ui.manager.ticket.ReturnTicketActivity">
<FrameLayout
<include android:id="@+id/frg"
android:id="@+id/ic_title"
layout="@layout/title_appback"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@id/ll_menu"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="@integer/all_top_weight"/>
<LinearLayout
android:id="@+id/ll_menu"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="@dimen/all_margin"
android:paddingRight="@dimen/all_margin"
app:layout_constraintBottom_toBottomOf="@id/rc_ticket"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ic_title"
app:layout_constraintVertical_weight="2.5">
<TextView
android:id="@+id/btn_group"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing"
android:layout_weight="1.2"
android:background="@color/transparent"
android:drawablePadding="@dimen/all_spacing"
android:drawableStart="@mipmap/login_phone"
android:foreground="?android:attr/selectableItemBackground"
android:padding="@dimen/fragment_store_item_spacing"
android:text="共 2 种优惠券"
android:textColor="@color/menu_back"
android:textSize="@dimen/all_text_size"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="7.5"/>
<Button
android:id="@+id/btn_add"
android:layout_width="0dp"
android:layout_height="@dimen/fragment_store_et_height"
android:layout_weight="1"
android:background="@drawable/selector_navy_blue"
android:drawableLeft="@mipmap/bindingcounter_addcounter_befor"
android:onClick="@{OnClickListener}"
android:paddingLeft="5dp"
android:text="添加优惠券"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rc_ticket"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="@dimen/all_margin_big"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_menu" app:layout_constraintTop_toTopOf="parent"></FrameLayout>
app:layout_constraintVertical_weight="22">
</android.support.v7.widget.RecyclerView>
<TextView
android:id="@+id/tv_empty"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/appBack"
android:drawableTop="@mipmap/icon_things_null"
android:gravity="center"
android:padding="100dp"
android:text="@string/empty_other_select"
android:textColor="@color/white_half"
android:textSize="@dimen/all_text_size_big"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_menu"
app:layout_constraintVertical_weight="22"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/activity_send_ticket.xml 0 → 100644
View file @ 90ab1f01
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="android.view.View.OnClickListener"/>
</data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/appBack"
android:orientation="vertical">
<FrameLayout
android:id="@+id/fragment"
style="@style/xuline_margin"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
android:background="@color/appBack"/>
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/dialog_integral_exchange_setting.xml
View file @ 90ab1f01
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/gary1" android:background="@color/gray1"
android:paddingLeft="@dimen/all_margin" android:paddingLeft="@dimen/all_margin"
android:paddingRight="@dimen/all_margin"></View> android:paddingRight="@dimen/all_margin"></View>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
...@@ -207,7 +207,7 @@ ...@@ -207,7 +207,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -253,7 +253,7 @@ ...@@ -253,7 +253,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_integral_get_setting.xml
View file @ 90ab1f01
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
...@@ -147,7 +147,7 @@ ...@@ -147,7 +147,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -220,7 +220,7 @@ ...@@ -220,7 +220,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -291,7 +291,7 @@ ...@@ -291,7 +291,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
...@@ -347,7 +347,7 @@ ...@@ -347,7 +347,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
...@@ -396,7 +396,7 @@ ...@@ -396,7 +396,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
...@@ -508,7 +508,7 @@ ...@@ -508,7 +508,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -554,7 +554,7 @@ ...@@ -554,7 +554,7 @@
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding" android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding" android:layout_marginRight="@dimen/all_padding"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -646,7 +646,7 @@ ...@@ -646,7 +646,7 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width" android:layout_height="@dimen/all_line_width"
android:background="@color/gary1"></View> android:background="@color/gray1"></View>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/dialog_ticket_add_setting.xml
View file @ 90ab1f01
...@@ -5,289 +5,325 @@ ...@@ -5,289 +5,325 @@
<variable <variable
name="OnClickListener" name="OnClickListener"
type="android.view.View.OnClickListener"></variable> type="com.xingdata.zzdpos.util.OnClickListener"></variable>
</data> </data>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:background="@color/store_back"
android:focusable="true"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/store_back"
android:gravity="center" android:focusable="true"
android:padding="@dimen/all_padding"> android:orientation="vertical">
<TextView <include
android:layout_width="0dp" android:id="@+id/ic_titles"
android:layout_height="wrap_content" layout="@layout/title"/>
android:layout_weight="1"
android:paddingStart="@dimen/all_margin"
android:text="活动名称:"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/>
<TextView <TextView
android:id="@+id/tv_integral_rule_name" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="?attr/actionBarSize"
android:layout_height="wrap_content" android:background="@color/gray_zhouyu"
android:layout_weight="1" android:gravity="left|center_vertical"
android:focusable="true" android:paddingLeft="@dimen/all_padding"
android:maxLines="1" android:text="基本信息"
android:singleLine="true" android:textColor="@color/black_baozheng"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/> android:textSize="@dimen/text_secondary_title"/>
</LinearLayout>
<View <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gary1"
android:paddingLeft="@dimen/all_margin"
android:paddingRight="@dimen/all_margin"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center"
android:padding="@dimen/all_padding">
<TextView
android:id="@+id/tv_status"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="@dimen/all_margin"
android:text="启用状态:"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/>
<RadioGroup
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:background="@color/white"
android:checkedButton="@id/rb_suspended" android:gravity="center"
android:orientation="horizontal"> android:padding="@dimen/all_padding">
<RadioButton <TextView
android:id="@+id/rb_suspended"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin" android:layout_weight="2"
android:layout_marginRight="@dimen/all_margin" android:text="活动名称:"
android:layout_weight="1" android:textColor="@color/black_baozheng"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:onClick="@{OnClickListener}"
android:text="暂停 "
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
<RadioButton <TextView
android:id="@+id/rb_start" android:id="@+id/tv_integral_rule_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_margin" android:layout_weight="5"
android:layout_marginRight="@dimen/all_margin" android:focusable="true"
android:layout_weight="1" android:maxLines="1"
android:background="@drawable/selector_checkbox_bg" android:singleLine="true"
android:button="@null" android:textColor="@color/black_baozheng"
android:onClick="@{OnClickListener}" android:textSize="@dimen/text_secondary_title"/>
android:text="启用 " </LinearLayout>
android:textSize="@dimen/et_textsize"/>
</RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gary1"
android:paddingLeft="@dimen/all_margin"
android:paddingRight="@dimen/all_margin"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:padding="@dimen/all_padding"
android:paddingBottom="@dimen/all_margin"
android:paddingLeft="@dimen/all_margin"
android:paddingRight="@dimen/all_margin"
android:paddingTop="@dimen/all_margin_big">
<TextView <View
android:id="@+id/tv_vip_level" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="@dimen/all_line_width"
android:layout_height="match_parent" android:layout_marginLeft="@dimen/all_padding"
android:layout_weight="1" android:layout_marginRight="@dimen/all_padding"
android:paddingStart="@dimen/all_margin" android:background="@color/gray1"></View>
android:text="规则设置:"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_weight="4" android:background="@color/white"
android:orientation="vertical"> android:gravity="center"
android:padding="@dimen/all_padding">
<LinearLayout <TextView
android:layout_width="match_parent" android:id="@+id/tv_status"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_weight="1"
android:padding="@dimen/all_padding"> android:text="启用状态:"
android:textColor="@color/black_baozheng"
<TextView android:textSize="@dimen/et_textsize"/>
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingStart="@dimen/all_margin"
android:text="优惠券面值:"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/>
<EditText
android:id="@+id/et_ticket_money"
style="@style/dialog_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="2"
android:digits="1234567890"
android:ems="5"
android:inputType="number"
android:maxLength="5"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingLeft="@dimen/all_padding"
android:text="元"
android:textColor="@color/black"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout <RadioGroup
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:layout_weight="1"
android:padding="@dimen/all_padding"> android:checkedButton="@id/rb_suspended"
android:orientation="horizontal">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingStart="@dimen/all_margin"
android:text="券有效期:"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/>
<TextView
android:id="@+id/tv_date" <RadioButton
style="@style/dialog_edit" android:id="@+id/rb_suspended"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_marginLeft="@dimen/all_margin"
android:layout_weight="2" android:layout_marginRight="@dimen/all_margin"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:onClick="@{OnClickListener}" android:onClick="@{OnClickListener}"
android:paddingBottom="2dp" android:text="暂停 "
android:paddingTop="2dp"/> android:textSize="@dimen/et_textsize"/>
<TextView <RadioButton
android:id="@+id/rb_start"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:layout_marginLeft="@dimen/all_margin"
android:layout_marginRight="@dimen/all_margin"
android:layout_weight="1"
android:background="@drawable/selector_checkbox_bg"
android:button="@null"
android:onClick="@{OnClickListener}"
android:text="启用 "
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </RadioGroup>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<TextView
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/gray_zhouyu"
android:gravity="left|center_vertical"
android:paddingLeft="@dimen/all_padding"
android:text="规则设置"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="horizontal" android:background="@color/white"
android:padding="@dimen/all_padding"> android:gravity="center"
android:orientation="horizontal"
>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingStart="@dimen/all_margin"
android:text="订单金额满:"
android:textColor="@color/black"
android:textSize="@dimen/text_secondary_title"/>
<EditText
android:id="@+id/et_rule_money"
style="@style/dialog_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="2"
android:digits="1234567890"
android:ems="5"
android:inputType="phone|number"
android:maxLength="5"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingLeft="@dimen/all_padding"
android:text="元可用"
android:textColor="@color/black"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="horizontal" android:layout_weight="4"
android:padding="@dimen/all_padding"> android:orientation="vertical">
<TextView <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:orientation="horizontal"
android:paddingStart="@dimen/all_margin" android:padding="@dimen/all_padding">
android:text="每单使用:"
android:textColor="@color/black" <TextView
android:textSize="@dimen/text_secondary_title"/> android:layout_width="0dp"
android:layout_height="wrap_content"
<EditText android:layout_weight="2"
android:id="@+id/et_ticket_count" android:text="优惠券面值:"
style="@style/dialog_edit" android:textColor="@color/black_baozheng"
android:layout_width="0dp" android:textSize="@dimen/et_textsize"/>
<EditText
android:id="@+id/et_ticket_money"
style="@style/dialog_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="3"
android:digits="1234567890"
android:ems="5"
android:inputType="number"
android:maxLength="5"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingLeft="@dimen/all_padding"
android:text="元"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:orientation="horizontal"
android:layout_weight="2" android:padding="@dimen/all_padding">
android:digits="1234567890"
android:ems="5" <TextView
android:inputType="phone|number" android:layout_width="0dp"
android:maxLength="2"/> android:layout_height="wrap_content"
android:layout_weight="2"
<TextView android:text="券有效期:"
android:layout_width="0dp" android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
<TextView
android:id="@+id/tv_date"
style="@style/dialog_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="3"
android:onClick="@{OnClickListener}"
android:paddingBottom="2dp"
android:paddingTop="2dp"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="2" android:orientation="horizontal"
android:paddingLeft="@dimen/all_padding" android:padding="@dimen/all_padding">
android:text="张"
android:textColor="@color/black" <TextView
android:textSize="@dimen/et_textsize"/> android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="订单金额满:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
<EditText
android:id="@+id/et_rule_money"
style="@style/dialog_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="3"
android:digits="1234567890"
android:ems="5"
android:inputType="phone|number"
android:maxLength="5"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingLeft="@dimen/all_padding"
android:text="元可用"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"></View>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/all_padding">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="每单使用:"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
<EditText
android:id="@+id/et_ticket_count"
style="@style/dialog_edit"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_weight="3"
android:digits="1234567890"
android:ems="5"
android:inputType="phone|number"
android:maxLength="2"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:paddingLeft="@dimen/all_padding"
android:text="张"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="@dimen/all_line_width"
android:background="@color/gray1"></View>
</LinearLayout> </LinearLayout>
<Button
</LinearLayout> android:id="@+id/btn_add"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/all_margin"
android:background="@color/red_guanyu"
android:onClick="@{OnClickListener}"
android:text="确定"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_send_ticker_main.xml 0 → 100644
View file @ 90ab1f01
<?xml version="1.0" encoding="utf-8"?>
<layout
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"></variable>
</data>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/gray_zhouyu">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:id="@+id/ll_one"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="@dimen/all_margin"
app:layout_constraintTop_toBottomOf="@+id/ic_title">
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/bg_return_ticker_logo"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:paddingLeft="@dimen/all_padding"
android:text="按单独会员发券"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/right"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_all"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_marginTop="@dimen/all_padding"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="@dimen/all_margin"
app:layout_constraintTop_toBottomOf="@+id/ll_one">
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/bg_return_ticker_logo"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5"
android:paddingLeft="@dimen/all_padding"
android:text="按会员类别发券"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_three_title"/>
<ImageView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@mipmap/right"/>
</LinearLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_ticker_main.xml 0 → 100644
View file @ 90ab1f01
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="OnClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"></variable>
</data>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout
android:id="@+id/btn_add"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@drawable/singleline_white_gray"
android:gravity="center"
android:onClick="@{OnClickListener}"
android:orientation="horizontal"
app:layout_constraintBottom_toTopOf="@id/ll_menu"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ic_title">
<ImageView
android:id="@+id/iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/but_add"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/all_padding"
android:text="添加获取规则"
android:textColor="@color/red_guanyu"
android:textSize="@dimen/text_three_title"/>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_menu"
android:layout_width="0dp"
android:layout_height="6dp"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
android:paddingLeft="@dimen/all_margin"
android:paddingRight="@dimen/all_margin"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/rc_ticket"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/btn_add"
app:layout_constraintVertical_weight="2.5">
<TextView
android:id="@+id/btn_group"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/all_spacing"
android:layout_weight="1.2"
android:background="@color/transparent"
android:drawablePadding="@dimen/all_spacing"
android:drawableStart="@mipmap/login_phone"
android:foreground="?android:attr/selectableItemBackground"
android:padding="@dimen/fragment_store_item_spacing"
android:text="共 2 种优惠券"
android:textColor="@color/menu_back"
android:textSize="@dimen/all_text_size"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="7.5"/>
<Button
android:layout_width="0dp"
android:layout_height="@dimen/fragment_store_et_height"
android:layout_weight="1"
android:background="@drawable/selector_navy_blue"
android:drawableLeft="@mipmap/bindingcounter_addcounter_befor"
android:onClick="@{OnClickListener}"
android:paddingLeft="5dp"
android:text="添加优惠券"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<android.support.v7.widget.RecyclerView
android:id="@+id/rc_ticket"
android:layout_width="0dp"
android:layout_height="0dp"
android:padding="@dimen/all_padding"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_menu"
app:layout_constraintVertical_weight="22">
</android.support.v7.widget.RecyclerView>
<TextView
android:id="@+id/tv_empty"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@color/appBack"
android:drawableTop="@mipmap/icon_things_null"
android:gravity="center"
android:padding="100dp"
android:text="@string/empty_other_select"
android:textColor="@color/white_half"
android:textSize="@dimen/all_text_size_big"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/ll_menu"
app:layout_constraintVertical_weight="22"/>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/item_return_ticket.xml
View file @ 90ab1f01
...@@ -12,18 +12,20 @@ ...@@ -12,18 +12,20 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:orientation="horizontal"> android:orientation="horizontal">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_item" android:id="@+id/cl_item"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_weight="2.3">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:src="@mipmap/return_ticket_one"/> android:background="@mipmap/return_ticket_one"/>
<LinearLayout <LinearLayout
android:id="@+id/ll_top" android:id="@+id/ll_top"
...@@ -36,41 +38,32 @@ ...@@ -36,41 +38,32 @@
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_weight="2.5"> app:layout_constraintVertical_weight="4">
<TextView <ImageView
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="￥" android:layout_gravity="right"
android:textColor="@color/white" android:layout_weight="1.8"
android:textSize="@dimen/et_textsize"/> android:src="@mipmap/bg_return_ticker_logo"/>
<TextView <TextView
android:id="@+id/tv_ticket_money" android:id="@+id/tv_ticket_money"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_padding" android:layout_weight="5"
android:gravity="center" android:gravity="center"
android:text="20" android:text="@string/tv_money"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="45sp" android:textSize="@dimen/text_secondary_title"
android:textStyle="bold"/> android:textStyle="bold"/>
<TextView
android:id="@+id/tv_ticket"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/all_padding"
android:text="优惠券"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
...@@ -78,48 +71,70 @@ ...@@ -78,48 +71,70 @@
app:layout_constraintTop_toBottomOf="@id/ll_top" app:layout_constraintTop_toBottomOf="@id/ll_top"
app:layout_constraintVertical_weight="2"> app:layout_constraintVertical_weight="2">
<TextView
android:id="@+id/tv_rule"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:text="@string/tv_rule"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<TextView <TextView
android:id="@+id/tv_date" android:id="@+id/tv_date"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="@dimen/all_padding"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_vertical"
android:paddingLeft="@dimen/all_margin"
android:text="@string/tv_date" android:text="@string/tv_date"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_text_mini"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/cl_send" android:id="@+id/cl_send"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_weight="1">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:src="@mipmap/return_ticket_two"/> android:background="@mipmap/return_ticket_two"
/>
<TextView <TextView
android:id="@+id/tv_send" android:id="@+id/tv_ticket_moneys"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="0dp"
android:text="发券" android:gravity="center"
android:text="@string/money"
android:textColor="@color/white"
android:textSize="@dimen/text_primary_title_smile"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/vw_line"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<View
android:id="@+id/vw_line"
android:layout_width="0dp"
android:layout_height="@dimen/all_line_width"
android:layout_marginLeft="@dimen/all_padding"
android:layout_marginRight="@dimen/all_padding"
android:background="@color/gray1"
app:layout_constraintBottom_toTopOf="@id/tv_rule"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_ticket_moneys"></View>
<TextView
android:id="@+id/tv_rule"
android:layout_width="0dp"
android:layout_height="0dp"
android:gravity="center"
android:text="@string/tv_rule"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent" app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toBottomOf="@+id/vw_line"/>
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/values/colors.xml
View file @ 90ab1f01
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<color name="taobao_black">#333333</color> <color name="taobao_black">#333333</color>
<color name="offline_down_size">#777777</color> <color name="offline_down_size">#777777</color>
<color name="gary">#898989</color> <color name="gary">#898989</color>
<color name="gary1">#B1B1B1</color> <color name="gray1">#e6e6e6</color>
<color name="gray_lite">#c5c5c5</color> <color name="gray_lite">#c5c5c5</color>
<color name="title">#233142</color> <color name="title">#233142</color>
<color name="title1">#223852</color> <color name="title1">#223852</color>
......
app/src/main/res/values/dimens.xml
View file @ 90ab1f01
...@@ -32,6 +32,8 @@ ...@@ -32,6 +32,8 @@
<dimen name="edit_border">0.5dp</dimen> <dimen name="edit_border">0.5dp</dimen>
<!--一级标题--> <!--一级标题-->
<dimen name="text_primary_title">28sp</dimen> <dimen name="text_primary_title">28sp</dimen>
<!--一级标题-->
<dimen name="text_primary_title_smile">25sp</dimen>
<!--二级标题--> <!--二级标题-->
<dimen name="text_secondary_title">20sp</dimen> <dimen name="text_secondary_title">20sp</dimen>
<!--三级标题--> <!--三级标题-->
......
app/src/main/res/values/strings.xml
View file @ 90ab1f01
...@@ -413,15 +413,16 @@ ...@@ -413,15 +413,16 @@
<string name="integral_exchange_title">积分兑换规则</string> <string name="integral_exchange_title">积分兑换规则</string>
<!--优惠券--> <!--优惠券-->
<string name="return_ticket_title">新增优惠券</string> <string name="return_ticket_title">新增优惠券</string>
<string name="tv_rule">全场满%s元可用</string> <string name="tv_rule">满%s可用</string>
<string name="tv_date">有效期：%s</string> <string name="tv_money">%s 元优惠券</string>
<string name="tv_date">有效期至： %s</string>
<string name="tv_ticket_count"> 共 %s 种优惠券</string> <string name="tv_ticket_count"> 共 %s 种优惠券</string>
<!--商品组合--> <!--商品组合-->
<string name="bale_select_title">请选择商品</string> <string name="bale_select_title">请选择商品</string>
<string name="bale_title">新增优惠券</string> <string name="bale_title">新增优惠券</string>
<string name="tv_bale_count"> 共 %s 个组合</string> <string name="tv_bale_count"> 共 %s 个组合</string>
<string name="tv_bale_edit_count"> 共 %s 件</string> <string name="tv_bale_edit_count"> 共 %s 件</string>
<string name="money"> ￥ %s </string> <string name="money">￥ %s </string>
<!--会员管理--> <!--会员管理-->
<string name="adv_plan"> 晋级标准：消费金额满 %s</string> <string name="adv_plan"> 晋级标准：消费金额满 %s</string>
<string name="level_Number">共有 %s个会员等级</string> <string name="level_Number">共有 %s个会员等级</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