Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/adapter/VipAdapter.java

@@ -21,6 +21,8 @@ public class VipAdapter extends BaseAdapter<Vip, ItemSettleVipBinding> {
         mViewBinding.setPhone(ConvertUtil.longToString(item.getVipMobile()));
         if (item.getVipDefDiscount() < 100 && item.getVipDefDiscount() > 0) {
             mViewBinding.setDisRate(String.valueOf((double) item.getVipDefDiscount() / 10));
+        } else if (item.getVipDefDiscount() == 100) {
+            mViewBinding.setDisRate("无折扣");
         }
         switch (item.getVipLevel()) {
             case 1:

app/src/main/java/com/xingdata/zzdpos/ui/sendticke/fragment/SendTickerFragment.java

@@ -172,6 +172,8 @@ public class SendTickerFragment extends BaseFragment<SendTicketPresenter,
             if (nowVip.getVipDefDiscount() < 100 && nowVip.getVipDefDiscount() > 0) {
                 mViewBinding.setDisRate(String.valueOf((double) nowVip.getVipDefDiscount() /
                         10));
+            } else if (nowVip.getVipDefDiscount() == 100) {
+                mViewBinding.setDisRate("无折扣");
             }
             switch (nowVip.getVipLevel()) {
                 case 1:

app/src/main/java/com/xingdata/zzdpos/ui/vip/adapter/VipTruleAdapter.java

@@ -23,6 +23,7 @@ public class VipTruleAdapter extends BaseAdapter<Ticket, ItemVipMscardItemBindin
     private String shopName;
     
 
+
     public VipTruleAdapter(Context mContext, @Nullable List<Ticket> data) {
         super(R.layout.item_vip_mscard_item, data);
         this.mContext = mContext;
@@ -31,12 +32,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);

app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java

@@ -57,8 +57,8 @@ public final class SystemUtil {
                 e.printStackTrace();
             }
         }
-        return "test2018";
 //        return deviceSN;
+        return "test2019";
     }
 
     /**

app/src/main/res/layout/dialog_ticket_add_setting.xml

@@ -311,7 +311,7 @@
                             android:textColor="@color/black_baozheng"
                             android:textSize="@dimen/et_textsize"/>
 
-                        <EditText
+                        <TextView
                             android:id="@+id/et_ticket_count"
                             style="@style/dialog_edit"
                             android:layout_width="0dp"
@@ -321,7 +321,8 @@
                             android:digits="1234567890"
                             android:ems="5"
                             android:inputType="phone|number"
-                            android:maxLength="2"/>
+                            android:maxLength="2"
+                            android:text="1"/>
 
                         <TextView
                             android:layout_width="0dp"

app/src/main/res/layout/fragment_send_ticker.xml

@@ -118,7 +118,7 @@
                         android:layout_marginEnd="@dimen/all_spacing"
                         android:drawablePadding="@dimen/all_bounced_spacing"
                         android:drawableRight="@mipmap/drop_down"
-                        android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
+                        android:text="@{@string/settle_vip_dis_rate_hint + disRate }"
                         android:textColor="@color/black_zhangfei"
                         android:textSize="@dimen/all_caption_size"
                         app:layout_constraintBottom_toTopOf="parent"

app/src/main/res/layout/item_settle_vip.xml

@@ -75,7 +75,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginEnd="@dimen/all_spacing"
-            android:text="@{@string/settle_vip_dis_rate_hint + disRate + @string/settle_vip_dis_rate}"
+            android:text="@{@string/settle_vip_dis_rate_hint + disRate }"
             android:textColor="@color/black_zhangfei"
             android:textSize="@dimen/all_caption_size"
             app:layout_constraintBottom_toTopOf="parent"