Commit d16ddfaa authored by 姜敏's avatar 姜敏

更改线的粗细

parent c8ec1a0c
......@@ -63,12 +63,12 @@ public class C {
* sn:test2018 设备型号 AECRC10 (pos)
* sn:test2019 设备型号 X990 (收银机)
*/
private static final String URL_TEST = "http://121.40.56.52:8080/";
private static final String URL_TEST = "http://121.40.56.52:80/";
/**
* 开发平台(开发人员使用)
*/
private static final String URL_DEMO = "http://demo.51zzd.cn:8080/";
private static final String URL_DEMO = "http://demo.51zzd.cn/";
/**
* 生产平台
......
......@@ -31,12 +31,12 @@ public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBindin
@Override
protected void convert(ItemVipMscardItemBinding mViewBinding, Ticket item) {
mViewBinding.truleName.setText(ConvertUtil.fenToYuanNoZero(item.getTicketValAmt()));
mViewBinding.truleMoney.setText("满"+ConvertUtil.fenToYuanNoZero(item.getTicketValAmt())+"元使用");
mViewBinding.truleMoney.setText("满" + ConvertUtil.fenToYuanNoZero(item.getTruleOrderAmt()) + "元使用");
mViewBinding.truleValidity.setText(mContext.getString(R.string.vip_mscard_period_of_validity, StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd"), StringUtil.format(new Date(item.getTicketExp()), "yyyy.MM.dd")));
// mViewBinding.truleCondition.setText(ConvertUtil.fenToYuanNoPoint(item.getTruleOrderAmt()));
if (item.getTruleStatus()!=null&&item.getUsedFlag()!=null&&item.getTruleStatus().toString().equals("0")&&item.getUsedFlag().toString().equals("1")) {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.return_ticket_one);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.return_ticket_two);
if (item.getTruleStatus() != null && item.getUsedFlag() != null && item.getTruleStatus().toString().equals("0") && item.getUsedFlag().toString().equals("1")) {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.bg_return_ticket01);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.bg_return_ticket02);
} else {
mViewBinding.truleBgLeft.setBackgroundResource(R.mipmap.bg_return_ticket03);
mViewBinding.truleBgRight.setBackgroundResource(R.mipmap.bg_return_ticket04);
......
......@@ -57,8 +57,8 @@ public final class SystemUtil {
e.printStackTrace();
}
}
return "test2018";
// return deviceSN;
return "test2019";
}
/**
......
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