Merge remote-tracking branch 'origin/master'

app/src/main/java/com/xingdata/zzdpos/C.java

@@ -60,8 +60,9 @@ public class C {
     public static final class URL {
         /**
          * 测试环境（客户演示使用）
-         * sn:test2018 设备型号 AECRC10 （pos）
-         * sn:test2019 设备型号 X990   （收银机）
+         * sn:test2018 设备型号 X990 （pos）
+         * <p>
+         * sn:test2019 设备型号 AECRC10  （收银机）
          */
         private static final String URL_TEST = "http://121.40.56.52:80/";
 

app/src/main/java/com/xingdata/zzdpos/api/ApiFactory.java

@@ -529,19 +529,28 @@ public final class ApiFactory {
             return run(Api.getInstance().service.queryOtherShop(keycode, pageNumber, pageSize));
         }
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum,
-                                                                                    String keyword, Long skuGrpId) {
-            return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE,
-                    skuGrpId, keyword));
+        public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword, Long skuGrpId) {
+            String mKeyword;
+            try {
+                mKeyword = String.valueOf(Long.valueOf(keyword));
+            } catch (NumberFormatException e) {
+                mKeyword = keyword;
+            }
+            return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, skuGrpId, mKeyword));
         }
 
         public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(String wd) {
             return run(Api.getInstance().service.querySssku(wd));
         }
 
-        public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum,
-                                                                                    String keyword) {
-            return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, keyword));
+        public static Observable<Pager<com.xingdata.zzdpos.model.Sssku>> querySssku(int pageNum, String keyword) {
+            String mKeyword;
+            try {
+                mKeyword = String.valueOf(Long.valueOf(keyword));
+            } catch (NumberFormatException e) {
+                mKeyword = keyword;
+            }
+            return run(Api.getInstance().service.querySssku(pageNum, C.PRODUCT.PAGE_SIZE, mKeyword));
         }
 
         public static Observable<com.xingdata.zzdpos.model.Sssku> update(com.xingdata.zzdpos

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/settle/SettleActivity.java

@@ -126,6 +126,7 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 
     @Override
     public void showPayFragment(Saleorder saleorder) {
+        if (TimeUtils.getNowMills() - mTime < 750) return;
         switch (saleorder.getPayType()) {
             case C.PAY_CHANNEL.CASH:
                 this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
@@ -140,7 +141,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
 //                mPresenter.payInBank();
                 break;
             case C.PAY_CHANNEL.ALI:
-                if (TimeUtils.getNowMills() - mTime < 1000) return;
                 this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
                 mViewBinding.tvTitle.setText(R.string.settle_channel_ali);
                 mScanFragment.setOnScanCompletedListener(barcode -> {
@@ -151,7 +151,6 @@ public class SettleActivity extends BaseActivity<SettlePresenter, ActivitySettle
                 this.start(mScanFragment);
                 break;
             case C.PAY_CHANNEL.WECHAT:
-                if (TimeUtils.getNowMills() - mTime < 1000) return;
                 this.showTitleBarByTitleMode(C.TITLE_MODE.TEXT);
                 mViewBinding.tvTitle.setText(R.string.settle_channel_wechat);
                 mScanFragment.setOnScanCompletedListener(barcode -> {

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"