8.8 1.新訂單提示音BUG修復 2、外送接單支付方式顯示字段修改

Signed-off-by: Wyh <1239658231>

8.8 1.新訂單提示音BUG修復 2、外送接單支付方式顯示字段修改
Signed-off-by: Wyh <1239658231>
d258cdd8 · Wyh · 04a91a6f · d258cdd8 · d258cdd8 · d258cdd8
Commit d258cdd8 authored Aug 08, 2020 by Wyh
9 changed files
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/print/bean/OrderDetails.kt
@@ -77,8 +77,8 @@ class OrderDetails {
        var isDelete: Int = 1 //默認為1，為0是第三方物流,其他則是本店配送
        var payTime: String? = null
        var payType: Int = 0//1:積分支付;2:支付寶;3:财付通;4:微信支付;5:貨到付款;6:其他支付
-        var payName: String? = null
+//        var payName: String? = null
-        var payAmount: Double = 0.0
+//        var payAmount: Double = 0.0
 //
 //        var payType2: Int = 0//1:積分支付;2:支付寶;3:财付通;4:微信支付;5:貨到付款;6:其他支付
 //        var payName2: String? = null

--- a/gradle.properties
+++ b/gradle.properties
@@ -26,4 +26,5 @@ QMUI_LINT_VERSION = 1.1.0
 QMUI_SKIN_MAKER_VERSION = 0.0.1
 POM_GIT_URL=https://github.com/Tencent/QMUI_Android/
 POM_SITE_URL=https://qmuiteam.com/android
+android.injected.testOnly=false
--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/service/GetInfoUpdateService.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/service/GetInfoUpdateService.kt
@@ -280,12 +280,14 @@ class GetInfoUpdateService : Service() {
    private var lastSoundTime: Long = 0L
    fun initSoundPool(resId: Int) {
        val nowTime = System.currentTimeMillis()//當前時間減去上次播放的時間，如果超過五秒，那麼才會再次播放提示聲
-        if (resId == R.raw.newordervocal && nowTime - lastSoundTime > 5000) {
+        if (resId == R.raw.newordervocal) {
+            if (nowTime - lastSoundTime > 5000) {
                Log.e("eee", "間隔時間" + (nowTime - lastSoundTime))
                putTimeLog("現在時間：$nowTime 上次播放時間：$lastSoundTime")
                putTimeLog("新訂單播放：$nowTime")
                lastSoundTime = nowTime
                OtherOrderUtils.initSoundPool(this, resId)
+            }
        } else {
            lastSoundTime = nowTime
            OtherOrderUtils.initSoundPool(this, resId)

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OrderDetailsActivity.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OrderDetailsActivity.kt
@@ -156,9 +156,21 @@ class OrderDetailsActivity : BaseActivity() {
                        tv_order_state.setTextColor(ContextCompat.getColor(this@OrderDetailsActivity, R.color.order_state0_color))
                    }
                }
-                if (orderDetails.orderPayType == 2 && orderDetails.payName != null) {
+//                if (orderDetails.orderPayType == 2 && orderDetails.payName != null) {
-                    binding.patMethod = orderDetails.payName
+//                    binding.patMethod = orderDetails.payName
+//                }
+                if (orderDetails.orderPayType == 2 && orderDetails.payMultiple != null) {
+                    val sb = StringBuilder()
+                    for (value in orderDetails.payMultiple!!) {
+                        sb.append(value.payName)
+                        sb.append(",")
                    }
+                    if (sb.isNotEmpty()) {
+                        sb.deleteCharAt(sb.length - 1)
+                    }
+                    binding.patMethod = sb.toString()
+                }
                binding.orderStatus = type + orderStatusText
                rv_food.layoutManager = LinearLayoutManager(this@OrderDetailsActivity)

--- a/print-module/src/main/java/com/joe/print/mvp/model/bean/PrintInfoBean.java
+++ b/print-module/src/main/java/com/joe/print/mvp/model/bean/PrintInfoBean.java
@@ -345,7 +345,8 @@ public class PrintInfoBean {
        } else if (data.getOrderPayType() == 0) {
            payType = "店內支付";
        } else if (data.getOrderPayType() == 2) {
-            payType = "在線支付:" + data.getPayName();
+//            payType = "在線支付:" + data.getPayName();
+            payType = "在線支付";
        }
        printInfoBeans.add(new PrintInfoBean(new String[]{payType}, new Boolean[]{true}, new Double[]{2d}));

--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java
@@ -161,7 +161,7 @@ public class PrintOtherOrder extends PrinterRoot {
        layout.addView(getTakeawayLargeAmount(mContext, "總金額：", MONETARY_UNIT + data.getTOTAL_AMOUNT()));
        layout.addView(getLine(mContext));
-        if (data.getPayMultiple() != null) {
+        if (data.getPayMultiple() != null && data.getPayMultiple().size() > 0) {
            for (OrderDetails.DataBean.PayMultiple payMultiple : data.getPayMultiple()) {
                if (!TextUtil.isEmptyOrNullOrUndefined(payMultiple.getPayName())) {
                    layout.addView(getTakeawayLargeAmount(mContext, payMultiple.getPayName(), MONETARY_UNIT + payMultiple.getAmount()));

--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java
@@ -126,19 +126,19 @@ public class PrintOtherOrderClosing extends PrinterRoot {
        if (data.getOrderPayType() == 1) {
            //貨到付款
            setText(view, R.id.tv_pay_type, "貨到付款");
-            if (data.getPayName() != null) {
+//            if (data.getPayName() != null) {
-                //支付金額
+//                //支付金額
-                setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
+//                setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
-            } else {
+//            } else {
                setIsShow(view, R.id.tv_pay_amount_text, false);
                setIsShow(view, R.id.tv_pay_amount_line, false);
-            }
+//            }
        } else if (data.getOrderPayType() == 0) {
            setText(view, R.id.tv_pay_type, "店內支付");
        } else if (data.getOrderPayType() == 2) {
            setText(view, R.id.tv_pay_type, "在線支付");
 //            setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()));
-            setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + data.getPayAmount());
+//            setText(view, R.id.tv_pay_amount_text, data.getPayName() + "：" + amountUnit + data.getPayAmount());
        }
        if (data.getPayTime() != null) {
            tvOrderClosing.setText("結賬時間：" + data.getPayTime());

--- a/print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
@@ -500,8 +500,16 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
        } else if (data.getOrderPayType() == 0) {
            payType = "店內支付";
        } else if (data.getOrderPayType() == 2) {
-            if (!TextUtil.isEmptyOrNullOrUndefined(data.getPayName())) {
+            if (data.getPayMultiple() != null) {
-                payType = "在線支付：" + data.getPayName();
+                StringBuilder payName = new StringBuilder();
+                for (OrderDetails.DataBean.PayMultiple payMultiple : data.getPayMultiple()) {
+                    payName.append(payMultiple.getPayName());
+                    payName.append(",");
+                }
+                if (payName.length() > 0) {
+                    payName.deleteCharAt(payName.length() - 1);
+                }
+                payType = "在線支付：" + payName.toString();
            } else {
                payType = "在線支付";
            }

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/adapter/TableAdapter.java
@@ -2,46 +2,31 @@ package com.gingersoft.gsa.cloud.table.mvp.ui.adapter;
 import android.content.Context;
 import android.graphics.Color;
-import android.graphics.drawable.GradientDrawable;
-import android.graphics.drawable.StateListDrawable;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.FrameLayout;
-import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
-import com.gingersoft.gsa.cloud.aspectj.SingleClick;
+import androidx.core.content.ContextCompat;
-import com.gingersoft.gsa.cloud.aspectj.XClickUtil;
+import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
 import com.gingersoft.gsa.cloud.base.common.bean.TableItem;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.table.R;
 import com.gingersoft.gsa.cloud.table.R2;
-import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
-import com.gingersoft.gsa.cloud.table.mvp.presenter.TablePresenter;
 import com.gingersoft.gsa.cloud.ui.view.TriangleLabelView;
 import com.jess.arms.base.BaseHolder;
 import com.jess.arms.base.DefaultAdapter;
-import com.jess.arms.utils.ArmsUtils;
-import com.qmuiteam.qmui.alpha.QMUIAlphaLinearLayout;
 import com.qmuiteam.qmui.alpha.QMUIAlphaRelativeLayout;
-import com.qmuiteam.qmui.alpha.QMUIAlphaTextView;
 import com.qmuiteam.qmui.layout.QMUIConstraintLayout;
-import com.qmuiteam.qmui.layout.QMUILinearLayout;
-import com.qmuiteam.qmui.layout.QMUIRelativeLayout;
 import com.qmuiteam.qmui.util.QMUIDisplayHelper;
-import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
-import androidx.core.content.ContextCompat;
 import butterknife.BindView;
 /**