Merge remote-tracking branch 'origin/master'

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

@@ -788,22 +788,12 @@ public final class ApiFactory {
 
     public static class Recard {
         public static Observable<Boolean> checkPwd(Long vipId, String cardNo, String pwd) {
-            return run(Api.getInstance().service.checkPwd(vipId, cardNo, EncryptUtils
-                    .encryptMD5ToString(pwd)));
+            return run(Api.getInstance().service.checkPwd(vipId, cardNo, EncryptUtils.encryptMD5ToString(pwd)));
         }
 
         public static Observable<Vip> fullVip(Long vipId, Long amtPay, Long amtSend) {
             return run(Api.getInstance().service.fullVip(vipId, amtPay, amtSend));
         }
-
-//        public static Observable<Pager<VipRechargeOrder>> queryCard(Long vipId) {
-//            return Api.getInstance().service.queryRecharge(vipId,0,10)
-//                    .onErrorReturn(new ErrorFilter<>())
-//                    .map(new ResultFilter<>())
-//                    .subscribeOn(Schedulers.io())
-//                    .observeOn(AndroidSchedulers.mainThread())
-//                    .retryWhen(new RetryHelper(3));
-//        }
     }
 
     public static class Ms {

app/src/main/java/com/xingdata/zzdpos/ui/scan/ScanFragment.java

@@ -15,8 +15,7 @@ import me.dm7.barcodescanner.core.IViewFinder;
 import me.dm7.barcodescanner.core.ViewFinderView;
 import me.dm7.barcodescanner.zxing.ZXingScannerView;
 
-public class ScanFragment<P extends BasePresenter> extends BaseFragment<P,
-        FragmentStoreScanBinding> {
+public class ScanFragment<P extends BasePresenter> extends BaseFragment<P, FragmentStoreScanBinding> {
 
     private ZXingScannerView mScannerView;
     private ZXingScannerView.ResultHandler mResultHandler;
@@ -125,8 +124,6 @@ public class ScanFragment<P extends BasePresenter> extends BaseFragment<P,
             this.setLaserColor(themeColor);
             this.setLaserEnabled(true);
         }
-
-
     }
 
     public void setTitle(String titleStr) {

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreActivity.java

@@ -4,6 +4,9 @@ import android.animation.Keyframe;
 import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.content.Intent;
+import android.media.Ringtone;
+import android.media.RingtoneManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.view.MotionEvent;
 import android.view.View;
@@ -195,6 +198,14 @@ public class StoreActivity extends BaseActivity<StorePresenter, ActivityStoreBin
         mScanFragment.resetScanner();
     }
 
+    @Override
+    public void startAlarm(boolean result) {
+        Uri notification = RingtoneManager.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
+        if (notification == null) return;
+        Ringtone r = RingtoneManager.getRingtone(mContext, notification);
+        r.play();
+    }
+
 
     /**
      * 执行抖动动画

app/src/main/java/com/xingdata/zzdpos/ui/store/StoreContract.java

@@ -132,6 +132,13 @@ interface StoreContract {
          * 重置扫描器
          */
         void resetScanner();
+
+        /**
+         * 播放提示音
+         *
+         * @param result 提示音
+         */
+        void startAlarm(boolean result);
     }
 
     abstract class Presenter extends BasePresenter<View> {

app/src/main/java/com/xingdata/zzdpos/ui/store/StorePresenter.java

@@ -355,11 +355,14 @@ public class StorePresenter extends StoreContract.Presenter {
             mView.showSearchFragment(barcode);
         } else if (ssskus.size() == 1 && usskus.size() == 0) {
             this.clickAddSku(ssskus.get(0), 1);
+            mView.startAlarm(true);
         } else if (ssskus.size() == 0 && usskus.size() == 1) {
             this.clickAddSku(usskus.get(0), 1);
+            mView.startAlarm(true);
         } else {
             mView.showMsg("没有找到此商品~");
             mView.resetScanner();
+            mView.startAlarm(false);
         }
         mView.dismissLoadingDialog();
     }

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

@@ -555,6 +555,11 @@
                         android:background="@color/gray_huanggai"
                         app:layout_constraintBottom_toBottomOf="parent" />
                 </android.support.constraint.ConstraintLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/all_margin" />
+
             </LinearLayout>
 
         </android.support.v4.widget.NestedScrollView>