Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos

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

@@ -60,15 +60,16 @@ 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/";
 
         /**
          * 开发平台（开发人员使用）
          */
-        private static final String URL_DEMO = "http://demo.51zzd.cn:8080/";
+        private static final String URL_DEMO = "http://demo.51zzd.cn/";
 
         /**
          * 生产平台

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/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 -> {