7.29 1.心跳斷開提示圖標和聲音 2.獲取不到訂單時提示音 3.出現問題推送給相應人員 4.每日營業報表打印功能

Signed-off-by: Wyh <1239658231>

7.29 1.心跳斷開提示圖標和聲音 2.獲取不到訂單時提示音 3.出現問題推送給相應人員 4.每日營業報表打印功能
Signed-off-by: Wyh <1239658231>
6bdf3095 · Wyh · 183a3d74 · 6bdf3095 · 6bdf3095 · 6bdf3095
Commit 6bdf3095 authored Jul 29, 2020 by Wyh
81 changed files
--- a/base-module/build.gradle
+++ b/base-module/build.gradle
@@ -100,13 +100,13 @@ dependencies {
    api 'cn.yipianfengye.android:zxing-library:2.2'
 //    // 斜角标签
 //    api 'com.github.poqiao:BeveLabelView:1.0.3'
-    compile "androidx.core:core-ktx:+"
+    api "androidx.core:core-ktx:+"
    implementation 'org.projectlombok:lombok:1.18.8'
    annotationProcessor 'org.projectlombok:lombok:1.18.8'
    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api "com.github.huangyanbin:SmartTable:2.2.0"
 }
 repositories {
    mavenCentral()

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/FoodAdapter.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/adapter/print/FoodAdapter.java
 package com.gingersoft.gsa.cloud.base.adapter.print;
+import android.graphics.Typeface;
+import android.text.TextPaint;
+import android.text.style.StyleSpan;
+import android.widget.TextView;
 import androidx.annotation.Nullable;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.viewholder.BaseViewHolder;
 import com.gingersoft.gsa.cloud.base.R;
 import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
+import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
+import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import java.util.List;
@@ -14,21 +21,88 @@ import java.util.List;
 */
 public class FoodAdapter extends BaseQuickAdapter<OrderDetail, BaseViewHolder> {
+    private int foodFontSize = 24;
+    private int modifierFontSize = 24;
+    private int foodIsBold = 2;
+    private int modifierIsBold = 2;
+    private int foodIsItalic = 2;
+    private int modifierIsItalic = 2;
+    private int numberIsFlip = 2;//熱敏打印沒有顏色，翻轉用不了
+    public FoodAdapter(@Nullable List<OrderDetail> data, PrinterDeviceBean deviceBean) {
+        super(R.layout.print_item_food, data);
+        try {
+            this.foodFontSize = Integer.parseInt(deviceBean.getFoodFont()) * 2;
+            this.modifierFontSize = Integer.parseInt(deviceBean.getModifierFont()) * 2;
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+        }
+        this.foodIsBold = deviceBean.getFoodIsBold();
+        this.modifierIsBold = deviceBean.getModifierIsBold();
+        this.foodIsItalic = deviceBean.getFoodIsItalic();
+        this.modifierIsItalic = deviceBean.getModifierIsItalic();
+        this.numberIsFlip = deviceBean.getNumberIsFlip();
+    }
    public FoodAdapter(@Nullable List<OrderDetail> data) {
        super(R.layout.print_item_food, data);
    }
    @Override
    protected void convert(BaseViewHolder helper, OrderDetail item) {
+        TextView tvFoodName = helper.getView(R.id.tv_food_name);
+        TextView tvNum = helper.getView(R.id.tv_food_quantity);
+        TextView tvPrice = helper.getView(R.id.tv_food_price);
+        boolean isBold, isItalic;
        if (item.getItemType() == 2) {
            //細項，縮進
            helper.setText(R.id.tv_food_name, "\u3000" + item.getProductName());
+            tvFoodName.setTextSize(modifierFontSize);
+            tvNum.setTextSize(modifierFontSize);
+            tvPrice.setTextSize(modifierFontSize);
+            isBold = modifierIsBold == 1;
+            isItalic = modifierIsItalic == 1;
        } else if (item.getItemType() == 3) {
            //細項，縮進
            helper.setText(R.id.tv_food_name, "\u3000\u3000" + item.getProductName());
+            tvFoodName.setTextSize(modifierFontSize);
+            tvNum.setTextSize(modifierFontSize);
+            tvPrice.setTextSize(modifierFontSize);
+            isBold = modifierIsBold == 1;
+            isItalic = modifierIsItalic == 1;
        } else {
            helper.setText(R.id.tv_food_name, item.getProductName());
+            tvFoodName.setTextSize(foodFontSize);
+            tvNum.setTextSize(foodFontSize);
+            tvPrice.setTextSize(foodFontSize);
+            isBold = foodIsBold == 1;
+            isItalic = foodIsItalic == 1;
+        }
+        if (isBold && isItalic) {
+            tvFoodName.setTypeface(null, Typeface.BOLD_ITALIC);
+            tvNum.setTypeface(null, Typeface.BOLD_ITALIC);
+            tvPrice.setTypeface(null, Typeface.BOLD_ITALIC);
+        } else if (isBold) {
+            tvFoodName.setTypeface(null, Typeface.BOLD);
+            tvNum.setTypeface(null, Typeface.BOLD);
+            tvPrice.setTypeface(null, Typeface.BOLD);
+        } else if (isItalic) {
+            tvFoodName.setTypeface(null, Typeface.ITALIC);
+            tvNum.setTypeface(null, Typeface.ITALIC);
+            tvPrice.setTypeface(null, Typeface.ITALIC);
+        } else {
+            tvFoodName.setTypeface(null, Typeface.NORMAL);
+            tvNum.setTypeface(null, Typeface.NORMAL);
+            tvPrice.setTypeface(null, Typeface.NORMAL);
        }
+//        tvFoodName.setTypeface(null, Typeface.BOLD_ITALIC);
+//        tvFoodName.setTypeface(null, Typeface.BOLD);
+//        tvFoodName.setTypeface(null, Typeface.ITALIC);
+//        tvFoodName.setTypeface(null, Typeface.NORMAL);
        helper.setText(R.id.tv_food_quantity, String.valueOf(item.getNumber()));
        helper.setText(R.id.tv_food_price, "$" + item.getPrice());
    }

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java
@@ -2,6 +2,8 @@ package com.gingersoft.gsa.cloud.base.application;
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.content.res.Configuration;
 import android.os.Build;
 import android.os.RemoteException;
@@ -377,6 +379,19 @@ public class GsaCloudApplication extends BaseApplication {
        return (String) SPUtils.get(context, UserConstans.gsPosShopId, "");
    }
+    public static String getAppName() {
+        try {
+            PackageManager packageManager = mAppContext.getPackageManager();
+            PackageInfo packageInfo = packageManager.getPackageInfo(
+                    mAppContext.getPackageName(), 0);
+            int labelRes = packageInfo.applicationInfo.labelRes;
+            return mAppContext.getResources().getString(labelRes);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
    public static void setLoginToken(Context context, String token) {
        SPUtils.put(context, UserConstans.token, token);
    }

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/OrderDetail.java
 package com.gingersoft.gsa.cloud.base.common.bean;
+import android.view.View;
+import android.widget.LinearLayout;
 import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
 import com.gingersoft.gsa.cloud.database.bean.ComboItem;
@@ -66,8 +69,10 @@ public class OrderDetail implements Serializable {
    private int ComboLevel = 0;
    //套餐食品是否自動跟餐
    private boolean isComboAuto = false;
-    /**動態的最大選中數*/
+    /**
-    private String currentMaxNumber= "";
+     * 動態的最大選中數
+     */
+    private String currentMaxNumber = "";
    //"food" or "discount" or "modifiy"
    private int prop = FOOD_PROP;
    /**
@@ -223,6 +228,7 @@ public class OrderDetail implements Serializable {
     * 是否打印价格
     */
    private long ktShowPrice;
    public OrderDetail() {
    }
@@ -675,6 +681,81 @@ public class OrderDetail implements Serializable {
    }
    /**
+     * @param type             是食品清單還是賬單 0清單  1賬單
+     * @param productnameBeans 訂單食品項
+     * @return
+     */
+    public static List<OrderDetail> productMameBeanToOrderDetail(int type, List<OrderDetails.DataBean.PRODUCTNAMEBean> productnameBeans) {
+        List<OrderDetail> orderDetailList = new ArrayList<>();
+        if (productnameBeans != null) {
+            for (OrderDetails.DataBean.PRODUCTNAMEBean productnameBean : productnameBeans) {
+                if (!(productnameBean.getPrintToBill() == 0 && Double.valueOf(productnameBean.getPRICE()) == 0)
+                        || isPrint(productnameBean.getPrintTo(), type)) {
+                    //食品金額不為0的不打印
+                    //或者printTo成立
+                    //打印
+                    orderDetailList.add(getOrderDetailByProductnameBean(productnameBean.getPRODUCT_NAME(), Integer.parseInt(productnameBean.getNum()), Double.valueOf(productnameBean.getPRICE()), 1));
+                    if (productnameBean.getChild() != null) {
+                        for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX childBeanX : productnameBean.getChild()) {
+                            if (childBeanX != null) {
+                                orderDetailList.add(getOrderDetailByProductnameBean(childBeanX.getPRODUCT_NAME(), Integer.parseInt(childBeanX.getNum()), Double.valueOf(childBeanX.getPRICE()), 2));
+                                if (childBeanX.getChild() != null) {
+                                    for (OrderDetails.DataBean.PRODUCTNAMEBean.ChildBeanX.ChildBean childBean : childBeanX.getChild()) {
+                                        orderDetailList.add(getOrderDetailByProductnameBean(childBean.getPRODUCT_NAME(), Integer.parseInt(childBean.getNum()), Double.valueOf(childBean.getPRICE()), 3));
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        return orderDetailList;
+    }
+    /**
+     * 是否打印
+     *
+     * @param printTo
+     * @param type
+     * @return
+     */
+    private static boolean isPrint(int printTo, int type) {
+        if (printTo == 0) {
+            //清單和賬單都打印
+            return true;
+        } else if (printTo == 1) {
+            //食品清单不打印 账单不打印
+            return false;
+        } else if (printTo == 2) {
+            //食品清单打印 账单不打印
+            return type == 0;
+        } else if (printTo == 3) {
+            //食品清单不打印 账单打印
+            return type == 1;
+        }
+        return true;
+    }
+    /**
+     * @param foodName
+     * @param foodNum
+     * @param foodPrice
+     * @param itemType  1主食品，2細項，3二級細項
+     * @return
+     */
+    private static OrderDetail getOrderDetailByProductnameBean(String foodName, int foodNum, double foodPrice, int itemType) {
+        OrderDetail orderDetail = new OrderDetail();
+        orderDetail.setProductName(foodName);
+        orderDetail.setNumber(foodNum);
+        orderDetail.setPrice(foodPrice);
+        orderDetail.setItemType(itemType);
+        return orderDetail;
+    }
+    /**
     * 已送單食品轉換
     *
     * @param orderList

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableBean.java
@@ -161,6 +161,165 @@ public class TableBean {
            this.tableNumber = dataBean.tableNumber;
        }
+        public long getId() {
+            return id;
+        }
+        public void setId(long id) {
+            this.id = id;
+        }
+        public String getTableName() {
+            return tableName;
+        }
+        public void setTableName(String tableName) {
+            this.tableName = tableName;
+        }
+        public int getRestaurantId() {
+            return restaurantId;
+        }
+        public void setRestaurantId(int restaurantId) {
+            this.restaurantId = restaurantId;
+        }
+        public Long getOrderId() {
+            return orderId;
+        }
+        public void setOrderId(Long orderId) {
+            this.orderId = orderId;
+        }
+        public String getQrCode() {
+            return qrCode;
+        }
+        public void setQrCode(String qrCode) {
+            this.qrCode = qrCode;
+        }
+        public int getSeatCount() {
+            return seatCount;
+        }
+        public void setSeatCount(int seatCount) {
+            this.seatCount = seatCount;
+        }
+        public Integer getMaxSeatCount() {
+            return maxSeatCount;
+        }
+        public void setMaxSeatCount(Integer maxSeatCount) {
+            this.maxSeatCount = maxSeatCount;
+        }
+        public Integer getMinSeatCount() {
+            return minSeatCount;
+        }
+        public void setMinSeatCount(Integer minSeatCount) {
+            this.minSeatCount = minSeatCount;
+        }
+        public String getCreateTime() {
+            return createTime;
+        }
+        public void setCreateTime(String createTime) {
+            this.createTime = createTime;
+        }
+        public String getCreateBy() {
+            return createBy;
+        }
+        public void setCreateBy(String createBy) {
+            this.createBy = createBy;
+        }
+        public String getQrCodeImg() {
+            return qrCodeImg;
+        }
+        public void setQrCodeImg(String qrCodeImg) {
+            this.qrCodeImg = qrCodeImg;
+        }
+        public int getPosTableId() {
+            return posTableId;
+        }
+        public void setPosTableId(int posTableId) {
+            this.posTableId = posTableId;
+        }
+        public long getServiceCharge() {
+            return serviceCharge;
+        }
+        public void setServiceCharge(long serviceCharge) {
+            this.serviceCharge = serviceCharge;
+        }
+        public long getMemberId() {
+            return memberId;
+        }
+        public void setMemberId(long memberId) {
+            this.memberId = memberId;
+        }
+        public int getStatus() {
+            return status;
+        }
+        public void setStatus(int status) {
+            this.status = status;
+        }
+        public int getPerson() {
+            return person;
+        }
+        public void setPerson(int person) {
+            this.person = person;
+        }
+        public int getUseStatus() {
+            return useStatus;
+        }
+        public void setUseStatus(int useStatus) {
+            this.useStatus = useStatus;
+        }
+        public int getSort() {
+            return sort;
+        }
+        public void setSort(int sort) {
+            this.sort = sort;
+        }
+        public int getType() {
+            return type;
+        }
+        public void setType(int type) {
+            this.type = type;
+        }
+        public String getTableNumber() {
+            return tableNumber;
+        }
+        public void setTableNumber(String tableNumber) {
+            this.tableNumber = tableNumber;
+        }
    }
    public static TableBean.DataBean splitTableTransformTable(TableBean.DataBean mainTable, TableExtBean.DataBean dataBean) {

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableExtBean.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/common/bean/TableExtBean.java
@@ -31,6 +31,92 @@ public class TableExtBean {
        private String deviceName;
        private String tableNumber;
+        public long getId() {
+            return id;
        }
+        public void setId(long id) {
+            this.id = id;
+        }
+        public long getTableId() {
+            return tableId;
+        }
+        public void setTableId(long tableId) {
+            this.tableId = tableId;
+        }
+        public long getOrderId() {
+            return orderId;
+        }
+        public void setOrderId(long orderId) {
+            this.orderId = orderId;
+        }
+        public int getInUse() {
+            return inUse;
+        }
+        public void setInUse(int inUse) {
+            this.inUse = inUse;
+        }
+        public int getTableStatus() {
+            return tableStatus;
+        }
+        public void setTableStatus(int tableStatus) {
+            this.tableStatus = tableStatus;
+        }
+        public long getUpdateTime() {
+            return updateTime;
+        }
+        public void setUpdateTime(long updateTime) {
+            this.updateTime = updateTime;
+        }
+        public long getCreateTime() {
+            return createTime;
+        }
+        public void setCreateTime(long createTime) {
+            this.createTime = createTime;
+        }
+        public String getDeviceName() {
+            return deviceName;
+        }
+        public void setDeviceName(String deviceName) {
+            this.deviceName = deviceName;
+        }
+        public String getTableNumber() {
+            return tableNumber;
+        }
+        public void setTableNumber(String tableNumber) {
+            this.tableNumber = tableNumber;
+        }
+    }
+    public TableBean.DataBean getRestaurantTable() {
+        return restaurantTable;
+    }
+    public void setRestaurantTable(TableBean.DataBean restaurantTable) {
+        this.restaurantTable = restaurantTable;
+    }
+    public List<DataBean> getRestaurantTableExtList() {
+        return restaurantTableExtList;
+    }
+    public void setRestaurantTableExtList(List<DataBean> restaurantTableExtList) {
+        this.restaurantTableExtList = restaurantTableExtList;
+    }
 }
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/AidlUtil.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/AidlUtil.java
@@ -164,10 +164,10 @@ public class AidlUtil {
     *打印图片
     */
    public void printBitmap(Bitmap bitmap, InnerResultCallbcak mInnerResultCallbcak) {
-        if (sunmiPrinterService == null) {
+//        if (sunmiPrinterService == null) {
-            Toast.makeText(context, LanguageUtils.get_language_system(context, "server.disconnected", "未連接上打印機!"), Toast.LENGTH_LONG).show();
+//            Toast.makeText(context, LanguageUtils.get_language_system(context, "server.disconnected", "未連接上打印機!"), Toast.LENGTH_LONG).show();
-            return;
+//            return;
-        }
+//        }
        try {
            sunmiPrinterService.setAlignment(1, null);
@@ -182,10 +182,10 @@ public class AidlUtil {
     *打印图片
     */
    public void printBitmaps(List<Bitmap> bitmaps, int paperWidth, InnerResultCallbcak mInnerResultCallbcak) {
-        if (sunmiPrinterService == null) {
+//        if (sunmiPrinterService == null) {
-            Toast.makeText(context, LanguageUtils.get_language_system(context, "server.disconnected", "未連接上打印機!"), Toast.LENGTH_LONG).show();
+//            Toast.makeText(context, LanguageUtils.get_language_system(context, "server.disconnected", "未連接上打印機!"), Toast.LENGTH_LONG).show();
-            return;
+//            return;
-        }
+//        }
        try {
            sunmiPrinterService.setAlignment(1, null);

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/okhttpUtils/OkHttp3Utils.java
@@ -67,7 +67,7 @@ public class OkHttp3Utils {
                @Override
                public void onFailure(Call call, IOException e) {
-                    emitter.onError(e);
+//                    emitter.onError(e);
                    emitter.onComplete();
                    call.cancel();
                }
@@ -95,7 +95,7 @@ public class OkHttp3Utils {
                @Override
                public void onFailure(Call call, IOException e) {
-                    emitter.onError(e);
+//                    emitter.onError(e);
                    emitter.onComplete();
                    call.cancel();
                }
@@ -148,7 +148,7 @@ public class OkHttp3Utils {
                @Override
                public void onFailure(Call call, IOException e) {
-                    emitter.onError(e);
+//                    emitter.onError(e);
                    emitter.onComplete();
                    call.cancel();
                }
@@ -200,7 +200,7 @@ public class OkHttp3Utils {
                @Override
                public void onFailure(Call call, IOException e) {
-                    emitter.onError(e);
+//                    emitter.onError(e);
                    emitter.onComplete();
                    call.cancel();
                }

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/constans/AppConstans.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/constans/AppConstans.java
@@ -5,6 +5,10 @@ package com.gingersoft.gsa.cloud.constans;
 */
 public class AppConstans {
+    public static final String RP_HEART_ERROR = "RP_HD";//心跳斷開錯誤碼
+    public static final String RP_ORDER_LIST_ERROR = "RP_OL";//訂單列表錯誤碼
    public static final String SECRETKEY_VALUES = "2309485937845783";
    public static final String APP_TYPE = "9";

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/constans/HttpsConstans.java
@@ -36,7 +36,7 @@ public class HttpsConstans {
    //--------------------------------------------其他全局----------------------------------------------------------------------------
    private static String HTTP_ADDRESS_URL_FORMAL = "https://m.ricepon.com:8444";//正式服務器
    private static String HTTP_ADDRESS_URL_SZ = "http://gingersoft.tpddns.cn:58201";//深圳測試
-    private static String HTTP_ADDRESS_URL_HK = "http://a.ricepon.com:58201";//香港測試
+    private static String HTTP_ADDRESS_URL_HK = "https://a.ricepon.com:58201";//香港測試
    private static String PATH = "/ricepon-cloud-gsa/api/";//路徑

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/PrinterDeviceBean.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/database/bean/PrinterDeviceBean.java
@@ -47,6 +47,10 @@ public class PrinterDeviceBean implements Serializable {
     */
    private Long flyPrinterDeviceId2;
+    private int foodComplexion;//食品顔色 0 黑色 2 紅色
+    private int modifierComplexion;//細項顔色  0 黑色 2 紅色
    private int foodIsBold;//食品是否加粗 0預設 1是 2否
    private String foodFont;//食品字體大小 0預設
@@ -72,8 +76,9 @@ public class PrinterDeviceBean implements Serializable {
        this.paperSpecification = paperSpecification;
    }
-    @Generated(hash = 23385471)
+    @Generated(hash = 1569426879)
-    public PrinterDeviceBean(Long id, Long dbid, String name, Integer restaurantId, String ip, Long uid, Integer port, Integer type, Long printerModelId, String paperSpecification, int lineFontStop, String printerName, String model, String noteContent, Long printerDeviceDefaultId, int printerDeviceType, Long flyPrinterDeviceId, Long flyPrinterDeviceId2, int foodIsBold, String foodFont, int foodIsItalic, int modifierIsBold, String modifierFont, int modifierIsItalic, int numberIsFlip) {
+    public PrinterDeviceBean(Long id, Long dbid, String name, Integer restaurantId, String ip, Long uid, Integer port, Integer type, Long printerModelId, String paperSpecification, int lineFontStop, String printerName, String model, String noteContent, Long printerDeviceDefaultId, int printerDeviceType, Long flyPrinterDeviceId, Long flyPrinterDeviceId2, int foodComplexion, int modifierComplexion, int foodIsBold, String foodFont, int foodIsItalic, int modifierIsBold, String modifierFont,
+            int modifierIsItalic, int numberIsFlip) {
        this.id = id;
        this.dbid = dbid;
        this.name = name;
@@ -92,6 +97,8 @@ public class PrinterDeviceBean implements Serializable {
        this.printerDeviceType = printerDeviceType;
        this.flyPrinterDeviceId = flyPrinterDeviceId;
        this.flyPrinterDeviceId2 = flyPrinterDeviceId2;
+        this.foodComplexion = foodComplexion;
+        this.modifierComplexion = modifierComplexion;
        this.foodIsBold = foodIsBold;
        this.foodFont = foodFont;
        this.foodIsItalic = foodIsItalic;
@@ -308,5 +315,19 @@ public class PrinterDeviceBean implements Serializable {
        this.printerDeviceType = printerDeviceType;
    }
+    public int getFoodComplexion() {
+        return foodComplexion;
+    }
+    public void setFoodComplexion(int foodComplexion) {
+        this.foodComplexion = foodComplexion;
+    }
+    public int getModifierComplexion() {
+        return modifierComplexion;
+    }
+    public void setModifierComplexion(int modifierComplexion) {
+        this.modifierComplexion = modifierComplexion;
+    }
 }
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/PrinterDeviceBeanDao.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/PrinterDeviceBeanDao.java
@@ -42,13 +42,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
        public final static Property PrinterDeviceType = new Property(15, int.class, "printerDeviceType", false, "PRINTER_DEVICE_TYPE");
        public final static Property FlyPrinterDeviceId = new Property(16, Long.class, "flyPrinterDeviceId", false, "FLY_PRINTER_DEVICE_ID");
        public final static Property FlyPrinterDeviceId2 = new Property(17, Long.class, "flyPrinterDeviceId2", false, "FLY_PRINTER_DEVICE_ID2");
-        public final static Property FoodIsBold = new Property(18, int.class, "foodIsBold", false, "FOOD_IS_BOLD");
+        public final static Property FoodComplexion = new Property(18, int.class, "foodComplexion", false, "FOOD_COMPLEXION");
-        public final static Property FoodFont = new Property(19, String.class, "foodFont", false, "FOOD_FONT");
+        public final static Property ModifierComplexion = new Property(19, int.class, "modifierComplexion", false, "MODIFIER_COMPLEXION");
-        public final static Property FoodIsItalic = new Property(20, int.class, "foodIsItalic", false, "FOOD_IS_ITALIC");
+        public final static Property FoodIsBold = new Property(20, int.class, "foodIsBold", false, "FOOD_IS_BOLD");
-        public final static Property ModifierIsBold = new Property(21, int.class, "modifierIsBold", false, "MODIFIER_IS_BOLD");
+        public final static Property FoodFont = new Property(21, String.class, "foodFont", false, "FOOD_FONT");
-        public final static Property ModifierFont = new Property(22, String.class, "modifierFont", false, "MODIFIER_FONT");
+        public final static Property FoodIsItalic = new Property(22, int.class, "foodIsItalic", false, "FOOD_IS_ITALIC");
-        public final static Property ModifierIsItalic = new Property(23, int.class, "modifierIsItalic", false, "MODIFIER_IS_ITALIC");
+        public final static Property ModifierIsBold = new Property(23, int.class, "modifierIsBold", false, "MODIFIER_IS_BOLD");
-        public final static Property NumberIsFlip = new Property(24, int.class, "numberIsFlip", false, "NUMBER_IS_FLIP");
+        public final static Property ModifierFont = new Property(24, String.class, "modifierFont", false, "MODIFIER_FONT");
+        public final static Property ModifierIsItalic = new Property(25, int.class, "modifierIsItalic", false, "MODIFIER_IS_ITALIC");
+        public final static Property NumberIsFlip = new Property(26, int.class, "numberIsFlip", false, "NUMBER_IS_FLIP");
    }
@@ -82,13 +84,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
                "\"PRINTER_DEVICE_TYPE\" INTEGER NOT NULL ," + // 15: printerDeviceType
                "\"FLY_PRINTER_DEVICE_ID\" INTEGER," + // 16: flyPrinterDeviceId
                "\"FLY_PRINTER_DEVICE_ID2\" INTEGER," + // 17: flyPrinterDeviceId2
-                "\"FOOD_IS_BOLD\" INTEGER NOT NULL ," + // 18: foodIsBold
+                "\"FOOD_COMPLEXION\" INTEGER NOT NULL ," + // 18: foodComplexion
-                "\"FOOD_FONT\" TEXT," + // 19: foodFont
+                "\"MODIFIER_COMPLEXION\" INTEGER NOT NULL ," + // 19: modifierComplexion
-                "\"FOOD_IS_ITALIC\" INTEGER NOT NULL ," + // 20: foodIsItalic
+                "\"FOOD_IS_BOLD\" INTEGER NOT NULL ," + // 20: foodIsBold
-                "\"MODIFIER_IS_BOLD\" INTEGER NOT NULL ," + // 21: modifierIsBold
+                "\"FOOD_FONT\" TEXT," + // 21: foodFont
-                "\"MODIFIER_FONT\" TEXT," + // 22: modifierFont
+                "\"FOOD_IS_ITALIC\" INTEGER NOT NULL ," + // 22: foodIsItalic
-                "\"MODIFIER_IS_ITALIC\" INTEGER NOT NULL ," + // 23: modifierIsItalic
+                "\"MODIFIER_IS_BOLD\" INTEGER NOT NULL ," + // 23: modifierIsBold
-                "\"NUMBER_IS_FLIP\" INTEGER NOT NULL );"); // 24: numberIsFlip
+                "\"MODIFIER_FONT\" TEXT," + // 24: modifierFont
+                "\"MODIFIER_IS_ITALIC\" INTEGER NOT NULL ," + // 25: modifierIsItalic
+                "\"NUMBER_IS_FLIP\" INTEGER NOT NULL );"); // 26: numberIsFlip
    }
    /** Drops the underlying database table. */
@@ -182,21 +186,23 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
        if (flyPrinterDeviceId2 != null) {
            stmt.bindLong(18, flyPrinterDeviceId2);
        }
-        stmt.bindLong(19, entity.getFoodIsBold());
+        stmt.bindLong(19, entity.getFoodComplexion());
+        stmt.bindLong(20, entity.getModifierComplexion());
+        stmt.bindLong(21, entity.getFoodIsBold());
        String foodFont = entity.getFoodFont();
        if (foodFont != null) {
-            stmt.bindString(20, foodFont);
+            stmt.bindString(22, foodFont);
        }
-        stmt.bindLong(21, entity.getFoodIsItalic());
+        stmt.bindLong(23, entity.getFoodIsItalic());
-        stmt.bindLong(22, entity.getModifierIsBold());
+        stmt.bindLong(24, entity.getModifierIsBold());
        String modifierFont = entity.getModifierFont();
        if (modifierFont != null) {
-            stmt.bindString(23, modifierFont);
+            stmt.bindString(25, modifierFont);
        }
-        stmt.bindLong(24, entity.getModifierIsItalic());
+        stmt.bindLong(26, entity.getModifierIsItalic());
-        stmt.bindLong(25, entity.getNumberIsFlip());
+        stmt.bindLong(27, entity.getNumberIsFlip());
    }
    @Override
@@ -284,21 +290,23 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
        if (flyPrinterDeviceId2 != null) {
            stmt.bindLong(18, flyPrinterDeviceId2);
        }
-        stmt.bindLong(19, entity.getFoodIsBold());
+        stmt.bindLong(19, entity.getFoodComplexion());
+        stmt.bindLong(20, entity.getModifierComplexion());
+        stmt.bindLong(21, entity.getFoodIsBold());
        String foodFont = entity.getFoodFont();
        if (foodFont != null) {
-            stmt.bindString(20, foodFont);
+            stmt.bindString(22, foodFont);
        }
-        stmt.bindLong(21, entity.getFoodIsItalic());
+        stmt.bindLong(23, entity.getFoodIsItalic());
-        stmt.bindLong(22, entity.getModifierIsBold());
+        stmt.bindLong(24, entity.getModifierIsBold());
        String modifierFont = entity.getModifierFont();
        if (modifierFont != null) {
-            stmt.bindString(23, modifierFont);
+            stmt.bindString(25, modifierFont);
        }
-        stmt.bindLong(24, entity.getModifierIsItalic());
+        stmt.bindLong(26, entity.getModifierIsItalic());
-        stmt.bindLong(25, entity.getNumberIsFlip());
+        stmt.bindLong(27, entity.getNumberIsFlip());
    }
    @Override
@@ -327,13 +335,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
            cursor.getInt(offset + 15), // printerDeviceType
            cursor.isNull(offset + 16) ? null : cursor.getLong(offset + 16), // flyPrinterDeviceId
            cursor.isNull(offset + 17) ? null : cursor.getLong(offset + 17), // flyPrinterDeviceId2
-            cursor.getInt(offset + 18), // foodIsBold
+            cursor.getInt(offset + 18), // foodComplexion
-            cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19), // foodFont
+            cursor.getInt(offset + 19), // modifierComplexion
-            cursor.getInt(offset + 20), // foodIsItalic
+            cursor.getInt(offset + 20), // foodIsBold
-            cursor.getInt(offset + 21), // modifierIsBold
+            cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21), // foodFont
-            cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22), // modifierFont
+            cursor.getInt(offset + 22), // foodIsItalic
-            cursor.getInt(offset + 23), // modifierIsItalic
+            cursor.getInt(offset + 23), // modifierIsBold
-            cursor.getInt(offset + 24) // numberIsFlip
+            cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24), // modifierFont
+            cursor.getInt(offset + 25), // modifierIsItalic
+            cursor.getInt(offset + 26) // numberIsFlip
        );
        return entity;
    }
@@ -358,13 +368,15 @@ public class PrinterDeviceBeanDao extends AbstractDao<PrinterDeviceBean, Long> {
        entity.setPrinterDeviceType(cursor.getInt(offset + 15));
        entity.setFlyPrinterDeviceId(cursor.isNull(offset + 16) ? null : cursor.getLong(offset + 16));
        entity.setFlyPrinterDeviceId2(cursor.isNull(offset + 17) ? null : cursor.getLong(offset + 17));
-        entity.setFoodIsBold(cursor.getInt(offset + 18));
+        entity.setFoodComplexion(cursor.getInt(offset + 18));
-        entity.setFoodFont(cursor.isNull(offset + 19) ? null : cursor.getString(offset + 19));
+        entity.setModifierComplexion(cursor.getInt(offset + 19));
-        entity.setFoodIsItalic(cursor.getInt(offset + 20));
+        entity.setFoodIsBold(cursor.getInt(offset + 20));
-        entity.setModifierIsBold(cursor.getInt(offset + 21));
+        entity.setFoodFont(cursor.isNull(offset + 21) ? null : cursor.getString(offset + 21));
-        entity.setModifierFont(cursor.isNull(offset + 22) ? null : cursor.getString(offset + 22));
+        entity.setFoodIsItalic(cursor.getInt(offset + 22));
-        entity.setModifierIsItalic(cursor.getInt(offset + 23));
+        entity.setModifierIsBold(cursor.getInt(offset + 23));
-        entity.setNumberIsFlip(cursor.getInt(offset + 24));
+        entity.setModifierFont(cursor.isNull(offset + 24) ? null : cursor.getString(offset + 24));
+        entity.setModifierIsItalic(cursor.getInt(offset + 25));
+        entity.setNumberIsFlip(cursor.getInt(offset + 26));
     }
    @Override

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/intercept/LoggingInterceptor.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/intercept/LoggingInterceptor.java
 package com.gingersoft.gsa.cloud.globalconfig.applyOptions.intercept;
-import android.util.Log;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
 import java.io.IOException;
@@ -15,7 +13,7 @@ import okhttp3.ResponseBody;
 public class LoggingInterceptor implements Interceptor {
    @Override
-    public Response intercept(Chain chain) throws IOException {
+    public Response intercept(Chain chain) throws IOException, NullPointerException {
        //这个chain里面包含了request和response，所以你要什么都可以从这里拿
        Request request = chain.request();
        long t1 = System.nanoTime();//请求发起的时间

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrintDataMaker.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrintDataMaker.java
@@ -20,4 +20,6 @@ import java.util.List;
 public interface PrintDataMaker {
    List<byte[]> getPrintData();
+    String getPrjIds();
 }
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrintExecutor.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrintExecutor.java
@@ -32,8 +32,10 @@ public class PrintExecutor {
    private PrintSocketHolder holder;
    private int mReconnectTimes = 0;
    private int time = 0;
+    private String prjIds;
    private PrintSocketHolder.OnStateChangedListener listener;
    private OnPrintResultListener mListener;
+    private OnPrjPrintResultListener onPrjPrintResultListener;
    public PrintExecutor(BluetoothDevice device) {
        holder = new PrintSocketHolder(device);
@@ -52,6 +54,7 @@ public class PrintExecutor {
        if (mReconnectTimes == 0) {
            holder.onPrinterStateChanged(PrintSocketHolder.STATE_0);
            List<byte[]> data = maker.getPrintData();
+            prjIds = maker.getPrjIds();
            if (!holder.isSocketPrepared()) {
                int prepare = holder.prepareSocket();
                if (prepare != PrintSocketHolder.ERROR_0)
@@ -61,6 +64,7 @@ public class PrintExecutor {
        } else {
            holder.onPrinterStateChanged(PrintSocketHolder.STATE_0);
            List<byte[]> data = maker.getPrintData();
+            prjIds = maker.getPrjIds();
            if (holder.isSocketPrepared()) {
                if (sendData(data))
                    return PrintSocketHolder.ERROR_0;
@@ -132,15 +136,6 @@ public class PrintExecutor {
    }
    /**
-     * 设置打印类型
-     *
-     * @param type 打印类型
-     */
-//    public void setType(int type) {
-//        this.type = type;
-//    }
-    /**
     * 设置状态监听
     *
     * @param listener 监听
@@ -171,6 +166,17 @@ public class PrintExecutor {
        void onResult(int errorCode, PrinterDeviceBean printerDeviceBean);
    }
+    /**
+     * PRJ打印結果回調
+     */
+    public interface OnPrjPrintResultListener {
+        void onResult(int errorCode, String ids);
+    }
+    public void setOnPrjPrintResultListener(OnPrjPrintResultListener onPrjPrintResultListener) {
+        this.onPrjPrintResultListener = onPrjPrintResultListener;
+    }
    private class PrintTask extends AsyncTask<PrintDataMaker, Integer, Integer> implements
            PrintSocketHolder.OnStateChangedListener {
@@ -214,6 +220,9 @@ public class PrintExecutor {
            try {
                if (mListener != null)
                    mListener.onResult(errorCode, holder.getPrinterDeviceBean());
+                if(onPrjPrintResultListener != null){
+                    onPrjPrintResultListener.onResult(errorCode, prjIds);
+                }
            } catch (Exception e) {
                e.printStackTrace();
            }

--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrinterWriter.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/print/PrinterWriter.java
@@ -632,6 +632,17 @@ public abstract class PrinterWriter {
    }
    /**
+     * 输出并换行
+     *
+     * @throws IOException 异常
+     */
+    public void printLineFeed(int n) throws IOException {
+        for (int i = 0; i < n; i++) {
+            write(PrinterUtils.printLineFeed());
+        }
+    }
+    /**
     * 进纸切割
     *
     * @throws IOException 异常

--- 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
@@ -116,6 +116,12 @@ class OrderDetails {
            var PRODUCT_NAME: String? = null
            var child: List<ChildBeanX>? = null
            var printseting: String? = null
+            var printToBill: Int = 1 //當金額=0時，是否打印在賬單上   0 否 1 是
+            //0食品清单打印 账单打印
+            //1食品清单不打印 账单不打印
+            //2食品清单打印 账单不打印
+            //3食品清单不打印 账单打印
+            var PrintTo: Int = 0
            class ChildBeanX : Serializable {
                /**

--- a/base-module/src/main/res/drawable-xhdpi/ic_heart_disconnect.png
+++ b/base-module/src/main/res/drawable-xhdpi/ic_heart_disconnect.png
--- a/base-module/src/main/res/layout/base_print_bill_adapter_item_bill.xml
+++ b/base-module/src/main/res/layout/base_print_bill_adapter_item_bill.xml
@@ -18,6 +18,7 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="0.3"
+        android:layout_gravity="bottom"
        android:gravity="right"
        style="@style/Print_text_style" />
 </LinearLayout>
\ No newline at end of file
--- a/base-module/src/main/res/layout/include_horizontal_color_black_one_dividing_line.xml
+++ b/base-module/src/main/res/layout/include_horizontal_color_black_one_dividing_line.xml
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/horizontal_dividing_line"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/dp_1"
+    android:background="@color/black" />
--- a/base-module/src/main/res/layout/include_vertical_color_black_one_dividing_line.xml
+++ b/base-module/src/main/res/layout/include_vertical_color_black_one_dividing_line.xml
+<?xml version="1.0" encoding="utf-8"?>
+<View xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/vertical_dividing_line"
+    android:layout_width="@dimen/dp_1"
+    android:layout_height="match_parent"
+    android:background="@color/black"
+    android:orientation="vertical" />
--- a/base-module/src/main/res/layout/print_item_food.xml
+++ b/base-module/src/main/res/layout/print_item_food.xml
@@ -10,7 +10,6 @@
        style="@style/Print_text_style"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="0.5" />
    <TextView
@@ -19,7 +18,7 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_weight="0.2"
+        android:layout_gravity="bottom"
        android:gravity="right" />
    <TextView
@@ -27,7 +26,7 @@
        style="@style/Print_text_style"
        android:layout_width="0dp"
        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
        android:layout_weight="0.3"
        android:gravity="right" />
 </LinearLayout>
\ No newline at end of file
--- a/base-module/src/main/res/values/ids.xml
+++ b/base-module/src/main/res/values/ids.xml
@@ -23,4 +23,6 @@
    <item name="topbar_right_change_button" type="id"/>
    <item name="layout_for_test" type="id"/>
+    <item name="topbar_heart_disconnect" type="id"/>
 </resources>
\ No newline at end of file
--- a/config.gradle
+++ b/config.gradle
@@ -7,8 +7,8 @@ ext {
            targetSdkVersion : 28,
            //正式版:    1.0.3  3
            //內部測試版:1.1.7  17
-            versionCode      : 17,
+            versionCode      : 18,
-            versionName      : "1.1.7"
+            versionName      : "1.1.8"
    ]
    version = [

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/BusinessBean.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/model/bean/BusinessBean.java
@@ -4,6 +4,7 @@ package com.gingersoft.gsa.cloud.main.mvp.model.bean;
 * Created by Wyh on 2020/2/24.
 */
 public class BusinessBean {
    private String projectName;
    private String amount;

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/BusinessReportPresenter.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/presenter/BusinessReportPresenter.java
@@ -118,7 +118,7 @@ public class BusinessReportPresenter extends BasePresenter<BusinessReportContrac
                });
    }
-    private String[] itemNames = new String[]{"項目銷售總金額($)", "折扣($)", "服務費($)", "賬單小數($)", "簽單($)", "營業金額淨值($)", "貼士($)", "堂食總金額數($)", "外賣總金額數($)", "單數", "平均每單($)", "人數", "平均每人($)","送貨費($)","餐盒費($)"};
+    private String[] itemNames = new String[]{"項目銷售總金額($)", "折扣($)", "服務費($)", "賬單小數($)", "簽單($)", "營業金額淨值($)", "貼士($)", "堂食總金額數($)", "外賣總金額數($)", "單數", "平均每單消費金額($)", "人數", "平均每人消費金額($)","送貨費($)","餐盒費($)"};
    private void loadAdapterInfo(BusinessDetailsBean.DataBean dataBean) {
        //底部信息默認顯示今天的數據

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
@@ -253,9 +253,9 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
            functions.add(new Function((long) 138, 150, 5, "餐檯模式", R.drawable.ic_dining_table_mode, 0));
        }
        functions.add(new Function((long) 139, 150, 5, "外送/自取", R.drawable.ic_delivery_mode, 0));
-        functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 0));
+//        functions.add(new Function((long) 140, 150, 5, "外賣模式", R.drawable.ic_outsourcing_model_close, 0));
-        functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
+//        functions.add(new Function((long) 141, 150, 5, "預點餐模式", R.drawable.ic_pre_order_mode_close, 1));
+        if (BuildConfig.DEBUG) {
            functions.add(new Function((long) 151, 0, 5, "管理", 0, 0));
            functions.add(new Function((long) 142, 151, 5, "賬單管理", R.drawable.ic_meals_menu_management, 0));
            functions.add(new Function((long) 143, 151, 5, "餐檯管理", R.drawable.ic_dining_table_management, 0));
@@ -263,7 +263,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
            functions.add(new Function((long) 145, 151, 5, "支付管理", R.drawable.ic_pay_management_close, 1));
            functions.add(new Function((long) 146, 151, 5, "折扣管理", R.drawable.ic_discount_management_close, 1));
            functions.add(new Function((long) 147, 151, 5, "沽清管理", R.drawable.ic_sell_off_manger, 0));
+        }
 //        functions.add(new Function((long) 152, 0, 5, "員工", 0, 0));
 //        functions.add(new Function((long) 147, 152, 5, "員工管理", R.drawable.ic_staff_management_close, 1));
 //        functions.add(new Function((long) 148, 152, 5, "權限管理", R.drawable.ic_authority_management_close, 1));

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/BusinessInfoAdapter.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/adapter/BusinessInfoAdapter.java
@@ -14,8 +14,10 @@ import java.util.List;
 */
 public class BusinessInfoAdapter extends BaseQuickAdapter<BusinessBean, BaseViewHolder> {
-    public BusinessInfoAdapter(@Nullable List<BusinessBean> data) {
+    public BusinessInfoAdapter(int layout,@Nullable List<BusinessBean> data) {
-        super(R.layout.report_business_info_item, data);
+//        super(R.layout.report_business_info_item, data);
+        super(layout, data);
    }
    @Override

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/BusinessReportFragment.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/fragment/BusinessReportFragment.java
@@ -6,18 +6,26 @@ import android.os.Message;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
 import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
+import com.billy.cc.core.component.CC;
+import com.bin.david.form.core.SmartTable;
+import com.bin.david.form.data.column.Column;
+import com.bin.david.form.data.table.TableData;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
+import com.gingersoft.gsa.cloud.base.utils.PrintTransitUtils;
 import com.gingersoft.gsa.cloud.base.utils.time.TimePickerUtils;
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
+import com.gingersoft.gsa.cloud.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.main.R;
 import com.gingersoft.gsa.cloud.main.R2;
 import com.gingersoft.gsa.cloud.main.di.component.DaggerBusinessReportComponent;
@@ -25,7 +33,9 @@ import com.gingersoft.gsa.cloud.main.mvp.contract.BusinessReportContract;
 import com.gingersoft.gsa.cloud.main.mvp.model.bean.BusinessBean;
 import com.gingersoft.gsa.cloud.main.mvp.model.bean.MainBusinessBean;
 import com.gingersoft.gsa.cloud.main.mvp.presenter.BusinessReportPresenter;
+import com.gingersoft.gsa.cloud.main.mvp.ui.activity.SettlementActivity;
 import com.gingersoft.gsa.cloud.main.mvp.ui.adapter.BusinessInfoAdapter;
+import com.gingersoft.gsa.cloud.main.mvp.ui.view.DividerGridItemDecoration;
 import com.gingersoft.gsa.cloud.ui.AAChartCore.AAChartCoreLib.AAChartConfiger.AAChartModel;
 import com.gingersoft.gsa.cloud.ui.AAChartCore.AAChartCoreLib.AAChartConfiger.AAChartView;
 import com.gingersoft.gsa.cloud.ui.AAChartCore.AAChartCoreLib.AAChartConfiger.AASeriesElement;
@@ -37,10 +47,10 @@ import com.gingersoft.gsa.cloud.ui.view.TriangleView;
 import com.jess.arms.base.BaseFragment;
 import com.jess.arms.di.component.AppComponent;
 import com.jess.arms.utils.ArmsUtils;
+import com.qmuiteam.qmui.alpha.QMUIAlphaButton;
 import java.text.ParseException;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -81,8 +91,14 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
    TriangleView triangleView;
    @BindView(R2.id.iv_end_time_triangle)
    TriangleView endTimeTriangleView;
+    //    @BindView(R2.id.table_business)
+//    SmartTable mTableBusiness;
+    @BindView(R2.id.btn_print_business)
+    QMUIAlphaButton btnPintBusiness;
    private BusinessInfoAdapter businessInfoAdapter;
+    private BusinessInfoAdapter printBusinessInfoAdapter;
    //查詢多少天的數據
    private int manyDay = 7;
@@ -248,7 +264,7 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
        Object[][] stopsArr = {
                {0.00, "#018EF2"},
        };//颜色字符串设置支持十六进制类型和 rgba 类型
-        Map linearGradientColor = AAGradientColor.linearGradient(
+        Map<String, Object> linearGradientColor = AAGradientColor.linearGradient(
                AALinearGradientDirection.ToLeft,
                stopsArr
        );//颜色字符串设置支持十六进制类型和 rgba 类型
@@ -285,24 +301,61 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
    @Override
    public void loadAdapter(List<BusinessBean> businessBeans) {
+//        Column<String> column1 = new Column<>("姓名", "name");
+//        Column<Integer> column2 = new Column<>("年龄", "age");
+//        Column<Long> column3 = new Column<>("更新时间", "time");
+//        Column<String> column4 = new Column<>("头像", "portrait");
+//        //如果是多层，可以通过.来实现多级查询
+//        Column<String> column5 = new Column<>("班级", "class.className");
+//        //组合列
+//        Column totalColumn1 = new Column("组合列名",column1,column2);
+//        //表格数据 datas是需要填充的数据
+//
+//
+//        final TableData<BusinessBean> tableData = new TableData<>("表格名", businessBeans, column3);
+//
+//        mTableBusiness.setTableData(tableData);
+        businessBeans.add(0, new BusinessBean("餐廳名稱", GsaCloudApplication.getBrandName(mContext) + "," + GsaCloudApplication.getRestaurantName(mContext)));
        if (businessInfoAdapter == null) {
-            mBusinessDetails.setLayoutManager(new GridLayoutManager(mContext, 3) {
+            mBusinessDetails.setLayoutManager(new LinearLayoutManager(mContext) {
                @Override
                public boolean canScrollVertically() {
                    return false;
                }
            });
-            businessInfoAdapter = new BusinessInfoAdapter(businessBeans);
+            printBusinessInfoAdapter = new BusinessInfoAdapter(R.layout.report_business_info_item_print, businessBeans);
+            businessInfoAdapter = new BusinessInfoAdapter(R.layout.report_business_info_item_two, businessBeans);
            mBusinessDetails.setAdapter(businessInfoAdapter);
        } else {
+            printBusinessInfoAdapter.setNewInstance(businessBeans);
            businessInfoAdapter.setNewInstance(businessBeans);
        }
    }
-    @OnClick({R2.id.tv_start_time, R2.id.iv_start_time_triangle, R2.id.tv_end_time, R2.id.iv_end_time_triangle})
+    @OnClick({R2.id.btn_print_business, R2.id.tv_start_time, R2.id.iv_start_time_triangle, R2.id.tv_end_time, R2.id.iv_end_time_triangle})
    @Override
    public void onClick(View v) {
        int viewId = v.getId();
+        if (viewId == R.id.btn_print_business) {
+            //打印
+            View view = View.inflate(mContext, R.layout.layout_print_business, null);
+            RecyclerView recyclerView = view.findViewById(R.id.rv_print_business_details);
+            recyclerView.setLayoutManager(new LinearLayoutManager(mContext));
+            recyclerView.setAdapter(printBusinessInfoAdapter);
+            //清機成功，打印
+            PrintTransitUtils.getInstance().setPrintView(view);
+            CC.obtainBuilder("Component.Print")
+                    .addParam(PrintConstans.PRINT_TYPE, 4)//清機打印
+                    .setActionName("printActivity")
+                    .build()
+                    .callAsyncCallbackOnMainThread((cc, result) -> {
+                        //打印完之後，清除view
+                        PrintTransitUtils.getInstance().setPrintView(null);
+                    });
+        } else if (viewId == R.id.tv_start_time || viewId == R.id.iv_start_time_triangle || viewId == R.id.tv_end_time || viewId == R.id.iv_end_time_triangle) {
            try {
                String time = null;
                Calendar startTime = Calendar.getInstance();
@@ -315,7 +368,7 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
                    time = mTvStartTime.getText().toString();
                    endTime.setTime(TimeUtils.DATE_FORMAT_DATE.parse(mTvEndTime.getText().toString()));
-            } else if (viewId == R.id.tv_end_time || viewId == R.id.iv_end_time_triangle) {
+                } else {
                    endTimeTriangleView.toggle();
                    time = mTvEndTime.getText().toString();
                    startTime.setTime(TimeUtils.DATE_FORMAT_DATE.parse(mTvStartTime.getText().toString()));
@@ -369,7 +422,10 @@ public class BusinessReportFragment extends BaseFragment<BusinessReportPresenter
                e.printStackTrace();
            }
        }
+    }
    private String startTime;
    private void getInfo() {
        startTime = TimeUtils.getDatebyDate(mTvStartTime.getText().toString(), -1);
        String endTime = TimeUtils.getDatebyDate(mTvEndTime.getText().toString(), 1);

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/DividerGridItemDecoration.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/DividerGridItemDecoration.java
+package com.gingersoft.gsa.cloud.main.mvp.ui.view;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.StaggeredGridLayoutManager;
+public class DividerGridItemDecoration extends RecyclerView.ItemDecoration {
+    private static final int[] ATTRS = new int[]{android.R.attr.listDivider};
+    private Drawable mDivider;
+    public DividerGridItemDecoration(Context context) {
+        final TypedArray a = context.obtainStyledAttributes(ATTRS);
+        mDivider = a.getDrawable(0);
+        a.recycle();
+    }
+    @Override
+    public void onDraw(Canvas c, RecyclerView parent, RecyclerView.State state) {
+        drawHorizontal(c, parent);
+        drawVertical(c, parent);
+    }
+    private int getSpanCount(RecyclerView parent) {
+        // 列数
+        int spanCount = -1;
+        RecyclerView.LayoutManager layoutManager = parent.getLayoutManager();
+        if (layoutManager instanceof GridLayoutManager) {
+            spanCount = ((GridLayoutManager) layoutManager).getSpanCount();
+        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+            spanCount = ((StaggeredGridLayoutManager) layoutManager)
+                    .getSpanCount();
+        }
+        return spanCount;
+    }
+    public void drawHorizontal(Canvas c, RecyclerView parent) {
+        int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                    .getLayoutParams();
+            final int left = child.getLeft() - params.leftMargin;
+            final int right = child.getRight() + params.rightMargin
+                    + mDivider.getIntrinsicWidth();
+            final int top = child.getBottom() + params.bottomMargin;
+            final int bottom = top + mDivider.getIntrinsicHeight();
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+    public void drawVertical(Canvas c, RecyclerView parent) {
+        final int childCount = parent.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            final View child = parent.getChildAt(i);
+            final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child
+                    .getLayoutParams();
+            final int top = child.getTop() - params.topMargin;
+            final int bottom = child.getBottom() + params.bottomMargin;
+            final int left = child.getRight() + params.rightMargin;
+            final int right = left + mDivider.getIntrinsicWidth();
+            mDivider.setBounds(left, top, right, bottom);
+            mDivider.draw(c);
+        }
+    }
+    private boolean isLastColum(RecyclerView parent, int pos, int spanCount,
+                                int childCount) {
+        RecyclerView.LayoutManager layoutManager = parent.getLayoutManager();
+        if (layoutManager instanceof GridLayoutManager) {
+            if ((pos + 1) % spanCount == 0)// 如果是最后一列，则不需要绘制右边
+            {
+                return true;
+            }
+        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+            int orientation = ((StaggeredGridLayoutManager) layoutManager)
+                    .getOrientation();
+            if (orientation == StaggeredGridLayoutManager.VERTICAL) {
+                if ((pos + 1) % spanCount == 0)// 如果是最后一列，则不需要绘制右边
+                {
+                    return true;
+                }
+            } else {
+                childCount = childCount - childCount % spanCount;
+                if (pos >= childCount)// 如果是最后一列，则不需要绘制右边
+                    return true;
+            }
+        }
+        return false;
+    }
+    private boolean isLastRaw(RecyclerView parent, int pos, int spanCount,
+                              int childCount) {
+        RecyclerView.LayoutManager layoutManager = parent.getLayoutManager();
+        if (layoutManager instanceof GridLayoutManager) {
+            childCount = childCount - childCount % spanCount;
+            if (pos >= childCount)// 如果是最后一行，则不需要绘制底部
+                return true;
+        } else if (layoutManager instanceof StaggeredGridLayoutManager) {
+            int orientation = ((StaggeredGridLayoutManager) layoutManager)
+                    .getOrientation();
+            // StaggeredGridLayoutManager 且纵向滚动
+            if (orientation == StaggeredGridLayoutManager.VERTICAL) {
+                childCount = childCount - childCount % spanCount;
+                // 如果是最后一行，则不需要绘制底部
+                if (pos >= childCount)
+                    return true;
+            } else
+            // StaggeredGridLayoutManager 且横向滚动
+            {
+                // 如果是最后一行，则不需要绘制底部
+                if ((pos + 1) % spanCount == 0) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+    @Override
+    public void getItemOffsets(Rect outRect, int itemPosition,
+                               RecyclerView parent) {
+        int spanCount = getSpanCount(parent);
+        int childCount = parent.getAdapter().getItemCount();
+        if (isLastRaw(parent, itemPosition, spanCount, childCount))// 如果是最后一行，则不需要绘制底部
+        {
+            outRect.set(0, 0, mDivider.getIntrinsicWidth(), 0);
+        } else if (isLastColum(parent, itemPosition, spanCount, childCount))// 如果是最后一列，则不需要绘制右边
+        {
+            outRect.set(0, 0, 0, mDivider.getIntrinsicHeight());
+        } else {
+            outRect.set(0, 0, mDivider.getIntrinsicWidth(),
+                    mDivider.getIntrinsicHeight());
+        }
+    }
+}
--- a/main-module/src/main/res/layout/fragment_business_report.xml
+++ b/main-module/src/main/res/layout/fragment_business_report.xml
@@ -57,10 +57,10 @@
                    <com.gingersoft.gsa.cloud.ui.view.TriangleView
                        android:id="@+id/iv_start_time_triangle"
-                        android:paddingLeft="@dimen/dp_2"
                        android:layout_width="@dimen/dp_10"
-                        app:trv_direction="bottom"
+                        android:layout_height="@dimen/dp_5"
-                        android:layout_height="@dimen/dp_5" />
+                        android:paddingLeft="@dimen/dp_2"
+                        app:trv_direction="bottom" />
                    <TextView
                        android:layout_width="wrap_content"
@@ -81,10 +81,10 @@
                    <com.gingersoft.gsa.cloud.ui.view.TriangleView
                        android:id="@+id/iv_end_time_triangle"
-                        android:layout_marginLeft="@dimen/dp_2"
                        android:layout_width="@dimen/dp_8"
-                        app:trv_direction="bottom"
+                        android:layout_height="@dimen/dp_5"
-                        android:layout_height="@dimen/dp_5" />
+                        android:layout_marginLeft="@dimen/dp_2"
+                        app:trv_direction="bottom" />
                </LinearLayout>
                <com.gingersoft.gsa.cloud.ui.AAChartCore.AAChartCoreLib.AAChartConfiger.AAChartView
@@ -134,14 +134,45 @@
                    android:focusableInTouchMode="true"
                    android:text="餐廳名稱"
                    android:textColor="#3c3c3c"
-                    android:textSize="@dimen/dp_16" />
+                    android:textSize="@dimen/dp_16"
+                    android:visibility="gone" />
-                <include layout="@layout/include_horizontal_color_ccc_dividing_line" />
+                <!--                <include layout="@layout/include_horizontal_color_ccc_dividing_line" />-->
+                <!--                <com.bin.david.form.core.SmartTable-->
+                <!--                    android:id="@+id/table_business"-->
+                <!--                    android:layout_width="match_parent"-->
+                <!--                    android:layout_height="match_parent"-->
+                <!--                    />-->
                <androidx.recyclerview.widget.RecyclerView
                    android:id="@+id/rv_business_details"
                    android:layout_width="match_parent"
-                    android:layout_height="match_parent" />
+                    android:layout_height="match_parent"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10" />
+                <View
+                    android:id="@+id/horizontal_dividing_line"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/dp_0_5"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:background="@color/color_ccc" />
+                <com.qmuiteam.qmui.alpha.QMUIAlphaButton
+                    android:id="@+id/btn_print_business"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginTop="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:layout_marginBottom="@dimen/dp_10"
+                    android:background="@drawable/shape_app_btn"
+                    android:text="打印"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/dp_16" />
            </LinearLayout>
        </com.lihang.ShadowLayout>

--- a/main-module/src/main/res/layout/layout_print_business.xml
+++ b/main-module/src/main/res/layout/layout_print_business.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/layout_print_business"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/dp_10"
+    android:layout_marginRight="@dimen/dp_10"
+    android:orientation="vertical">
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_margin="@dimen/dp_10"
+        android:text="每日營業報表"
+        android:textColor="@color/black"
+        android:textSize="@dimen/dp_30"
+        tools:text="GSA" />
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rv_print_business_details"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+    <include layout="@layout/include_horizontal_color_black_one_dividing_line" />
+</LinearLayout>
--- a/main-module/src/main/res/layout/report_business_info_item.xml
+++ b/main-module/src/main/res/layout/report_business_info_item.xml
@@ -18,9 +18,8 @@
            android:layout_marginLeft="@dimen/dp_5"
            android:layout_marginTop="@dimen/dp_20"
            android:layout_marginRight="@dimen/dp_5"
-            android:singleLine="true"
            android:textColor="@color/theme_color"
-            android:textSize="@dimen/sp_17" />
+            android:textSize="@dimen/dp_20" />
        <TextView
            android:id="@+id/tv_business_info_name"
@@ -31,9 +30,8 @@
            android:layout_marginRight="@dimen/dp_5"
            android:layout_marginBottom="@dimen/dp_20"
            android:layout_weight="1"
-            android:singleLine="true"
            android:textColor="@color/color_3c"
-            android:textSize="@dimen/sp_12" />
+            android:textSize="@dimen/sp_16" />
        <include layout="@layout/include_horizontal_color_ccc_dividing_line" />

--- a/main-module/src/main/res/layout/report_business_info_item_print.xml
+++ b/main-module/src/main/res/layout/report_business_info_item_print.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <include layout="@layout/include_horizontal_color_black_one_dividing_line" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <include layout="@layout/include_vertical_color_black_one_dividing_line" />
+        <TextView
+            android:id="@+id/tv_business_info_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="@dimen/dp_10"
+            android:layout_weight="1"
+            android:textColor="@color/black"
+            android:textSize="@dimen/dp_26"
+            tools:text="餐廳名稱" />
+        <include layout="@layout/include_vertical_color_black_one_dividing_line" />
+        <TextView
+            android:id="@+id/tv_business_info_amount"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="@dimen/dp_10"
+            android:layout_weight="1"
+            android:textColor="@color/black"
+            android:textSize="@dimen/dp_26"
+            tools:text="GSA" />
+        <include layout="@layout/include_vertical_color_black_one_dividing_line" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
--- a/main-module/src/main/res/layout/report_business_info_item_two.xml
+++ b/main-module/src/main/res/layout/report_business_info_item_two.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+    <include layout="@layout/include_horizontal_color_ccc_dividing_line" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        <include layout="@layout/include_vertical_color_ccc_dividing_line" />
+        <TextView
+            android:id="@+id/tv_business_info_name"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="@dimen/dp_10"
+            android:layout_weight="1"
+            android:textColor="@color/color_3c"
+            android:textSize="@dimen/sp_12"
+            tools:text="餐廳名稱" />
+        <include layout="@layout/include_vertical_color_ccc_dividing_line" />
+        <TextView
+            android:id="@+id/tv_business_info_amount"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="@dimen/dp_10"
+            android:layout_weight="1"
+            android:textColor="@color/theme_color"
+            android:textSize="@dimen/sp_17"
+            tools:text="GSA" />
+        <include layout="@layout/include_vertical_color_ccc_dividing_line" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/WeatherRepository.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/WeatherRepository.kt
 package com.gingersoft.gsa.other_order_mode.data
+import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
+import com.gingersoft.gsa.cloud.constans.AppConstans
+import com.gingersoft.gsa.other_order_mode.R
 import com.gingersoft.gsa.other_order_mode.data.model.bean.ThirdItem
 import com.gingersoft.gsa.other_order_mode.data.network.CoolWeatherNetwork
 import com.google.gson.Gson
+import com.jess.arms.utils.DeviceUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import okhttp3.FormBody
@@ -94,7 +98,7 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw
        network.gsUpdateOrderStatus(requestBody)
    }
-    suspend fun updateIsRead(orderId: String) = withContext(Dispatchers.IO){
+    suspend fun updateIsRead(orderId: String) = withContext(Dispatchers.IO) {
        network.updateIsRead(getBody("id" to orderId))
    }
@@ -161,6 +165,18 @@ class WeatherRepository private constructor(private val network: CoolWeatherNetw
        network.addPrj(getBody("orderId" to orderId, "restaurantId" to restaurantId, "orderDetailsIds" to orderDetailsIds))
    }
+    suspend fun noticePersonnel(pushContent: String?, code: String) {
+        val requestBody = FormBody.Builder()
+                .add("code", code)//錯誤碼AppConstans.RP_HEART_ERROR
+                .add("shopId", GsaCloudApplication.getGsPosShopId(GsaCloudApplication.getAppContext()))
+                .add("source", GsaCloudApplication.getAppName())//錯誤來源
+                .add("pushContent", pushContent + "")//推送內容
+                .add("version", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()))//系統版本
+                .build()
+        network.noticePersonnel(requestBody)
+//        OkHttp3Utils.post(HttpsConstans.ROOT_URL + "/member-web/api/monitor/pushAlarm", requestBody)
+//                .subscribeOn(Schedulers.io()).subscribe()
+    }
    fun getBody(vararg pair: Pair1<String, String>): RequestBody {
        val requestBody = FormBody.Builder()

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/CoolWeatherNetwork.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/CoolWeatherNetwork.kt
 package com.gingersoft.gsa.other_order_mode.data.network
+import com.gingersoft.gsa.other_order_mode.data.network.api.AppService
 import com.gingersoft.gsa.other_order_mode.data.network.api.WeatherService
+import okhttp3.FormBody
 import okhttp3.RequestBody
 import retrofit2.Call
 import retrofit2.Callback
@@ -15,6 +17,8 @@ class CoolWeatherNetwork {
    private val service = ServiceCreator.create2(WeatherService::class.java)
+    private val appService = ServiceCreator.create2(AppService::class.java)
    private val gsposService = ServiceCreator.create3(WeatherService::class.java)
    private val cloudService = ServiceCreator.create4(WeatherService::class.java)
@@ -70,11 +74,16 @@ class CoolWeatherNetwork {
    suspend fun addPrj(requestBody: RequestBody) = cloudService.addPrj(requestBody).await()
+    suspend fun noticePersonnel(requestBody: RequestBody) = appService.noticePersonnel(requestBody).await()
    private suspend fun <T> Call<T>.await(): T {
        return suspendCoroutine { continuation ->
            enqueue(object : Callback<T> {
                override fun onFailure(call: Call<T>, t: Throwable) {
+//                    val request = orderService.getOrderList(FormBody.Builder().build()).request()
+//                    if(call.request().url().toString().contains(request.url().toString())){
+//                        //訂單列表接口報錯，推送相關人員
+//                    }
                    t.printStackTrace()
                    continuation.resumeWithException(t)
                }

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/ServiceCreator.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/ServiceCreator.kt
@@ -14,6 +14,7 @@ import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
 import retrofit2.converter.scalars.ScalarsConverterFactory
 import java.io.IOException
+import java.net.UnknownHostException
 import java.util.concurrent.TimeUnit
 object ServiceCreator {
@@ -23,6 +24,7 @@ object ServiceCreator {
            .addInterceptor(LoggingInterceptor())
            .addInterceptor(UserAgentIntercepter())
    var ROOT_URL: String = HttpsConstans.ROOT_URL
    var CLOUD_BASE_URL: String = HttpsConstans.ROOT_SERVER_ADDRESS_FORMAL
@@ -65,7 +67,7 @@ object ServiceCreator {
     * 添加请求头
     */
    class UserAgentIntercepter : Interceptor {
-        @Throws(IOException::class)
        override fun intercept(chain: Interceptor.Chain): Response {
            val request = chain.request()
            val headers = request.headers()

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/AppService.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/AppService.kt
+package com.gingersoft.gsa.other_order_mode.data.network.api
+import okhttp3.RequestBody
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.POST
+interface AppService {
+    @POST("monitor/pushAlarm")
+    fun noticePersonnel(@Body requestBody: RequestBody): Call<String>
+}
\ No newline at end of file
--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/WeatherService.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/data/network/api/WeatherService.kt
@@ -62,4 +62,6 @@ interface WeatherService {
    @POST("printerRecording/add")
    fun addPrj(@Body requestBody: RequestBody): Call<String>
 }
\ No newline at end of file
--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/model/viewModel/PageViewModel.kt
@@ -2,6 +2,7 @@ package com.gingersoft.gsa.other_order_mode.model.viewModel
 import android.app.Dialog
 import android.content.Context
+import android.os.Message
 import android.util.Log
 import android.view.Gravity
 import android.view.WindowManager
@@ -19,6 +20,7 @@ import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils
 import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
 import com.gingersoft.gsa.cloud.base.widget.DialogUtils
+import com.gingersoft.gsa.cloud.constans.AppConstans
 import com.gingersoft.gsa.cloud.constans.PrintConstans
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails
 import com.gingersoft.gsa.other_order_mode.R
@@ -26,10 +28,12 @@ import com.gingersoft.gsa.other_order_mode.data.WeatherRepository
 import com.gingersoft.gsa.other_order_mode.data.model.bean.*
 import com.gingersoft.gsa.other_order_mode.service.GetInfoUpdateService
 import com.gingersoft.gsa.other_order_mode.ui.adapter.DeliveryAdapter
+import com.gingersoft.gsa.other_order_mode.util.OtherOrderUtils
 import com.jess.arms.utils.ArmsUtils
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
+import java.lang.NullPointerException
 class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
@@ -125,12 +129,18 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
    fun getOrderList(restaurantId: String, position: Int, page: String, isLoadMore: Boolean) {
        launch({
            repository.requestOrderList(restaurantId, fragmentStatus[position], fragmentType[position], page, orderNo, phone).apply {
+//                throw NullPointerException("測試獲取訂單列表異常")
                getOrderGroupNum(restaurantId)
                loadInfo(isLoadMore, position)
            }
        }, {
            //出錯
            mOrderList[position].value = null
+            launch({
+                repository.noticePersonnel(it.message, AppConstans.RP_ORDER_LIST_ERROR)
+            },{
+            })
+            OtherOrderUtils.initSoundPool(GsaCloudApplication.getAppContext(), R.raw.raw_get_order_list_error)
        })
    }
@@ -249,7 +259,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                            }
                            val estimatedBean = withContext(Dispatchers.Default) { repository.getShipanyOrderTime(restaurantId, orderId, type) }//1、预计整张订单完成时间2、預計配送員接單時間3、預計配送員到店時間4、配送員預計送達時間
 //                            if (estimatedBean.data.estimated_time > 0) {
-                            if(estimatedBean.data != null){
+                            if (estimatedBean.data != null) {
                                data.estimatedTime = estimatedTime + ("${estimatedBean.data.estimated_time}分鐘後")
                            }
                            orderDetails.postValue(orderDetail)
@@ -275,7 +285,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
    }
-    fun updateOrderStatusByBtn(btnId: Int, dataBean: OrderDetails.DataBean, restaurantId: String, listener: (Int, Boolean) -> Unit) {
+    fun updateOrderStatusByBtn(btnId: Int, dataBean: OrderDetails.DataBean, restaurantId: String, listener: (MessageBean) -> Unit) {
        launch({
            when (btnId) {
                BtnBuilder.sureBtn -> {
@@ -306,12 +316,12 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                BtnBuilder.ProductionCompletedBtn -> {
                    //製作完成
                    repository.gsUpdateOrderStatus(dataBean.ID.toString(), 3, dataBean.order_type, 1, "", "", "", "0", "", 1, 0).apply {
-                        listener.invoke(ProductionComplete, code == "1")
+                        listener.invoke(getMsgBean(ProductionComplete, errorMsg, code == "1"))
                    }
                }
            }
        }, {
-            listener.invoke(0, false)
+            listener.invoke(getMsgBean(0, "", false))
            it.printStackTrace()
            Log.e("eee", it.javaClass.name + "錯誤信息111：" + it.message)
            GetInfoUpdateService.loginfo.append("錯誤信息111：" + it.message + "  LOCALIZEDMESSAGE：" + it.localizedMessage + it.cause)
@@ -343,7 +353,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
    /**
     * 修改訂單狀態並打印
     */
-    private suspend fun updateOrderAndPrint(restaurantId: String, dataBean: OrderDetails.DataBean, status: Int, listener: (Int, Boolean) -> Unit) {
+    private suspend fun updateOrderAndPrint(restaurantId: String, dataBean: OrderDetails.DataBean, status: Int, listener: (MessageBean) -> Unit) {
        repository.gsUpdateOrderStatus(dataBean.ID.toString(), status, dataBean.order_type, 1, "", "", "", "0", "", 1, 0).apply {
            if (status == 0 || status == 1 || status == 2) {
                //確認送單
@@ -392,11 +402,11 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                                printOrder(DeliveryPrint, it, listener)
                            }
                        } else {
-                            listener.invoke(OrderDelivery, false)
+                            listener.invoke(getMsgBean(OrderDelivery, errorMsg, false))
                        }
                    }
                } else {
-                    listener.invoke(OrderDelivery, false)
+                    listener.invoke(getMsgBean(OrderDelivery, errorMsg, false))
                }
            }
        }
@@ -405,7 +415,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
    /**
     * 打印訂單
     */
-    private fun printOrder(code: Int, dataBean: OrderDetails.DataBean, listener: (Int, Boolean) -> Unit) {
+    private fun printOrder(code: Int, dataBean: OrderDetails.DataBean, listener: (MessageBean) -> Unit) {
        //訂單信息和廚房單，打印前需要修改dataBean的order_type和orderPayType
        MyOrderManage.setDataBean(dataBean)
        CC.obtainBuilder("Component.Print")
@@ -414,7 +424,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
                .build()
                .callAsyncCallbackOnMainThread { _, result ->
                    MyOrderManage.setDataBean(null)
-                    listener.invoke(code, result.isSuccess)
+                    listener.invoke(getMsgBean(code, "打印", result.isSuccess))
                }
    }
@@ -457,7 +467,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
    /**
     * 第三方派送
     */
-    private suspend fun thirdSend(restaurantId: String, dataBean: OrderDetails.DataBean, status: Int, listener: (Int, Boolean) -> Unit) {
+    private suspend fun thirdSend(restaurantId: String, dataBean: OrderDetails.DataBean, status: Int, listener: (MessageBean) -> Unit) {
        val third = ThirdItem()
        //將食品數據轉為第三方需要的數據
        dataBean.PRODUCT_NAME?.let {
@@ -477,7 +487,7 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
 //                listener.invoke(OrderDelivery, true)
                updateOrderAndPrint(restaurantId, dataBean, status, listener)
            } else {
-                listener.invoke(OrderDelivery, false)
+                listener.invoke(getMsgBean(OrderDelivery, errMsg, false))
            }
        }
    }
@@ -668,6 +678,10 @@ class PageViewModel(private val repository: WeatherRepository) : ViewModel() {
        })
    }
+    fun getMsgBean(what: Int, msg: String, state: Boolean): MessageBean {
+        return MessageBean(what.toString(), msg, state, System.currentTimeMillis(), null)
+    }
    var payTypeBean = MutableLiveData<PayTypeInfo.DataBean>()
    /**
     * 獲取支付方式

--- 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
--- 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
@@ -13,6 +13,7 @@ import androidx.recyclerview.widget.LinearLayoutManager
 import com.ethanhua.skeleton.Skeleton
 import com.ethanhua.skeleton.ViewSkeletonScreen
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication
+import com.gingersoft.gsa.cloud.base.utils.other.TextUtil
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils
 import com.gingersoft.gsa.cloud.print.bean.OrderDetails
 import com.gingersoft.gsa.cloud.ui.utils.AppDialog
@@ -24,6 +25,7 @@ import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel.Compani
 import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel.Companion.DeliveryPrint
 import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel.Companion.OrderDelivery
 import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel.Companion.PrintCode
+import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel.Companion.ProductionComplete
 import com.gingersoft.gsa.other_order_mode.model.viewModel.PageViewModel.Companion.SendCode
 import com.gingersoft.gsa.other_order_mode.ui.adapter.FoodListAdapter
 import com.gingersoft.gsa.other_order_mode.ui.adapter.OrderDetailsAdapter
@@ -191,57 +193,65 @@ class OrderDetailsActivity : BaseActivity() {
                        }
                        else -> {
                            showLoading()
-                            updateOrderStatusByBtn(btnList[position].type, orderDetails, GsaCloudApplication.getRestaurantId(this@OrderDetailsActivity).toString()) { status, isSuccess ->
+                            updateOrderStatusByBtn(btnList[position].type, orderDetails, GsaCloudApplication.getRestaurantId(this@OrderDetailsActivity).toString()) { msg->
                                cancelDialogForLoading()
-                                when (status) {
+                                when (msg.code) {
-                                    DeliveryPrint -> {//訂單已確認，是否打印成功
+                                    DeliveryPrint.toString() -> {//訂單已確認，是否打印成功
                                        finish()
-                                        ToastUtils.show(this@OrderDetailsActivity, if (isSuccess) {
+                                        ToastUtils.show(this@OrderDetailsActivity, if (msg.success) {
                                            "打印成功"
                                        } else {
                                            "打印失敗"
                                        })
                                    }
-                                    PrintCode -> {
+                                    PrintCode.toString() -> {
-                                        ToastUtils.show(this@OrderDetailsActivity, if (isSuccess) {
+                                        ToastUtils.show(this@OrderDetailsActivity, if (msg.success) {
                                            "打印成功"
                                        } else {
                                            "打印失敗"
                                        })
                                    }
-                                    SendCode -> {
+                                    SendCode.toString() -> {
-                                        ToastUtils.show(this@OrderDetailsActivity, if (isSuccess) {
+                                        ToastUtils.show(this@OrderDetailsActivity, if (msg.success) {
                                            "已成功指派"
+                                        } else if(!TextUtil.isEmptyOrNullOrUndefined(msg.errorMsg)){
+                                            msg.errorMsg
                                        } else {
                                            "指派送貨失敗"
                                        })
-                                        if(isSuccess){
+                                        if(msg.success){
                                            finish()
                                        }
                                    }
-                                    OrderDelivery -> {
+                                    OrderDelivery.toString() -> {
                                        //已確認訂單，重新刷新當前頁面
-                                        if (isSuccess) {
+                                        if (msg.success) {
                                            finish()
                                            ToastUtils.show(this@OrderDetailsActivity, "訂單已確認")
+                                        } else if(!TextUtil.isEmptyOrNullOrUndefined(msg.errorMsg)){
+                                            ToastUtils.show(this@OrderDetailsActivity, msg.errorMsg)
                                        } else {
                                            ToastUtils.show(this@OrderDetailsActivity, "訂單確認失敗")
                                        }
 //                                        getOrderDetails(orderId, binding)
                                    }
-                                    Closing -> {
+                                    Closing.toString() -> {
-                                        ToastUtils.show(this@OrderDetailsActivity, if (isSuccess) {
+                                        ToastUtils.show(this@OrderDetailsActivity, if (msg.success) {
                                            "結賬成功"
+                                        } else if(!TextUtil.isEmptyOrNullOrUndefined(msg.errorMsg)){
+                                            msg.errorMsg
                                        } else {
                                            "結賬失敗"
                                        })
                                    }
-                                    PageViewModel.ProductionComplete -> {
+                                    ProductionComplete.toString() -> {
-                                        if (isSuccess) {
+                                        if (msg.success) {
                                            finish()
                                        }
-                                        ToastUtils.show(this@OrderDetailsActivity, if (isSuccess) {
+                                        ToastUtils.show(this@OrderDetailsActivity, if (msg.success) {
                                            "製作完成"
+                                        } else if(!TextUtil.isEmptyOrNullOrUndefined(msg.errorMsg)){
+                                            msg.errorMsg
                                        } else {
                                            "修改訂單狀態失敗"
                                        })

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/activity/OtherOrderActivity.kt
@@ -34,6 +34,7 @@ import com.gingersoft.gsa.other_order_mode.service.GetInfoUpdateService
 import com.gingersoft.gsa.other_order_mode.ui.adapter.SectionsPagerAdapter
 import com.gingersoft.gsa.other_order_mode.ui.base.BaseActivity
 import com.gingersoft.gsa.other_order_mode.util.InjectorUtil
+import com.qmuiteam.qmui.alpha.QMUIAlphaImageButton
 import com.qmuiteam.qmui.alpha.QMUIAlphaTextView
 import com.qmuiteam.qmui.util.QMUIDisplayHelper
 import com.qmuiteam.qmui.widget.popup.QMUIPopup
@@ -289,6 +290,7 @@ class OtherOrderActivity : BaseActivity() {
    override fun onDestroy() {
        super.onDestroy()
        bind?.setOnPostCallBack(null)
+        bind?.execute {}
        unregisterReceiver(mReceiver)
        unbindService(serviceConnection)
    }
@@ -306,62 +308,19 @@ class OtherOrderActivity : BaseActivity() {
                    }
                }
            })
+            bind?.execute {
+                Log.e("eee", "執行" + it)
+                if (it) {
+                    ivDisconnectView.visibility = View.VISIBLE
+                } else {
+                    ivDisconnectView.visibility = View.INVISIBLE
+                }
+            }
        }
        override fun onServiceDisconnected(name: ComponentName) {
        }
    }
-//    private var soundPool: SoundPool? = null
-//    fun initSoundPool() {
-//        //实例化SoundPool
-//        //sdk版本21是SoundPool 的一个分水岭
-//        if (soundPool == null) {
-//            if (Build.VERSION.SDK_INT >= 21) {
-//                val builder = SoundPool.Builder()
-//                //传入最多播放音频数量,
-//                builder.setMaxStreams(1)
-//                //AudioAttributes是一个封装音频各种属性的方法
-//                val attrBuilder = AudioAttributes.Builder()
-//                //设置音频流的合适的属性
-//                attrBuilder.setLegacyStreamType(AudioManager.STREAM_MUSIC)
-//                //加载一个AudioAttributes
-//                builder.setAudioAttributes(attrBuilder.build())
-//                soundPool = builder.build()
-//            } else {
-//                /**
-//                 * 第一个参数：int maxStreams：SoundPool对象的最大并发流数
-//                 * 第二个参数：int streamType：AudioManager中描述的音频流类型
-//                 *第三个参数：int srcQuality：采样率转换器的质量。 目前没有效果。 使用0作为默认值。
-//                 */
-//                soundPool = SoundPool(1, AudioManager.STREAM_MUSIC, 0)
-//            }
-//        }
-//        //可以通过四种途径来记载一个音频资源：
-//        //1.通过一个AssetFileDescriptor对象
-//        //int load(AssetFileDescriptor afd, int priority)
-//        //2.通过一个资源ID
-//        //int load(Context context, int resId, int priority)
-//        //3.通过指定的路径加载
-//        //int load(String path, int priority)
-//        //4.通过FileDescriptor加载
-//        //int load(FileDescriptor fd, long offset, long length, int priority)
-//        //声音ID 加载音频资源,这里用的是第二种，第三个参数为priority，声音的优先级*API中指出，priority参数目前没有效果，建议设置为1。
-//        val voiceId = soundPool!!.load(this, R.raw.newordervocal, 1)
-//        //异步需要等待加载完成，音频才能播放成功
-//        soundPool!!.setOnLoadCompleteListener { soundPool, sampleId, status ->
-//            if (status == 0) {
-//                //第一个参数soundID
-//                //第二个参数leftVolume为左侧音量值（范围= 0.0到1.0）
-//                //第三个参数rightVolume为右的音量值（范围= 0.0到1.0）
-//                //第四个参数priority 为流的优先级，值越大优先级高，影响当同时播放数量超出了最大支持数时SoundPool对该流的处理
-//                //第五个参数loop 为音频重复播放次数，0为值播放一次，-1为无限循环，其他值为播放loop+1次
-//                //第六个参数 rate为播放的速率，范围0.5-2.0(0.5为一半速率，1.0为正常速率，2.0为两倍速率)
-//                soundPool.play(voiceId, 1f, 1f, 1, 0, 1f)
-//            }
-//        }
-//    }
    private var isOpen: Boolean = true
    private val btnOpenBg by lazy { ContextCompat.getDrawable(this, R.drawable.shape_white_bottom_border)!! }
    private val btnCloseBg by lazy { ContextCompat.getDrawable(this, R.drawable.shape_dialog_bg)!! }
@@ -409,6 +368,7 @@ class OtherOrderActivity : BaseActivity() {
    }
    private var pop: QMUIPopup? = null
+    lateinit var ivDisconnectView: QMUIAlphaImageButton
    /**
     * 初始化標題欄
     */
@@ -459,7 +419,9 @@ class OtherOrderActivity : BaseActivity() {
 //            //歷史訂單
 //            startActivity(Intent(this, HistoryOrderActivity::class.java))
 //        }
-        qm_other_order_bar.setBackgroundColor(resources.getColor(R.color.theme_color))
+        ivDisconnectView = qm_other_order_bar.addRightImageButton(R.drawable.ic_heart_disconnect, R.id.topbar_heart_disconnect)
+        ivDisconnectView.visibility = View.INVISIBLE
+        qm_other_order_bar.setBackgroundColor(ContextCompat.getColor(this, R.color.theme_color))
    }
    override fun onStart() {

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/ui/fragment/PlaceholderFragment.kt
@@ -62,65 +62,6 @@ class PlaceholderFragment : BaseFragment(R.layout.fragment_other_order) {
            intent.putExtra("orderPayType", data.orderPayType)
            intent.putExtra("isRead", data.isRead)
            startActivity(intent)
-//            showLoading()
-//            pageViewModel.getShipanyAndOrderInfo(data.curStat, GsaCloudApplication.getRestaurantId(context).toString(), data.Id.toString()) { it1 ->
-//                cancelDialogForLoading()
-//                //顯示彈窗
-//                if (this@PlaceholderFragment.context != null && it1 != null) {
-//                    OtherOrderUtils.showOrderDetailsDialog(this@PlaceholderFragment.context!!, it1, data.STATUS, data.order_type) { view, _, dialog ->
-//                        when (view.id) {
-//                            R.id.btn_assign_shipping -> {
-//                                //修改訂單狀態
-//                                pageViewModel.updateOrderStatus(this@PlaceholderFragment.context!!, data, it1) {
-//                                    dialog.dismiss()
-//                                    if (it) {
-//                                        // 關閉彈窗，並刷新當前頁面
-//                                        refresh()
-//                                    }
-//                                }
-//                            }
-//                            R.id.btn_cancel_order -> {
-//                                //取消訂單，先判斷有沒有物流
-//                                if (it1.data!![0].isDelete == 0) {
-//                                    //第三方物流單
-//                                    //彈出彈窗詢問是否確認取消
-//                                    AppDialog.showWaringDialog(context, "是否確認取消第三方派送？") { v, dialog ->
-//                                        when (v.id) {
-//                                            R.id.tv_dialog_confirm -> {
-//                                                //取消物流
-//                                                showLoading()
-//                                                pageViewModel.cancelLogistics(GsaCloudApplication.getRestaurantId(context).toString(), data.Id.toString()) {
-//                                                    ToastUtils.show(context, it)
-//                                                    cancelDialogForLoading()
-//                                                    refresh()//刷新當前頁面
-//                                                }
-//                                                dialog.dismiss()
-//                                            }
-//                                            R.id.tv_dialog_cancel -> dialog.dismiss()
-//                                        }
-//                                    }
-//                                } else {
-//                                    //本店配送的單
-//                                    pageViewModel.cancelOrder(context!!, data.Id.toString()) {
-//                                        ToastUtils.show(context, if (it) {
-//                                            "取消訂單成功"
-//                                        } else {
-//                                            "取消訂單失敗"
-//                                        })
-//                                        cancelDialogForLoading()
-//                                        refresh()//刷新當前頁面
-//                                    }
-//                                }
-//                                dialog.dismiss()
-//                            }
-//                        }
-//                    }
-//                } else {
-//                    ToastUtils.show(context, "獲取訂單詳情失敗")
-//                }
-//            }
        }
        rv_other_order.adapter = adapter

--- a/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/OtherOrderUtils.kt
+++ b/other_order_mode/src/main/java/com/gingersoft/gsa/other_order_mode/util/OtherOrderUtils.kt
@@ -2,6 +2,11 @@ package com.gingersoft.gsa.other_order_mode.util
 import android.app.Dialog
 import android.content.Context
+import android.media.AudioAttributes
+import android.media.AudioManager
+import android.media.SoundPool
+import android.os.Build
+import android.util.Log
 import android.view.View
 import android.widget.ImageView
 import android.widget.TextView
@@ -121,4 +126,59 @@ object OtherOrderUtils {
    }
+    private var soundPool: SoundPool? = null
+    fun initSoundPool(context: Context, resId: Int) {
+        //实例化SoundPool
+        //sdk版本21是SoundPool 的一个分水岭
+        if (soundPool == null) {
+            if (Build.VERSION.SDK_INT >= 21) {
+                val builder = SoundPool.Builder()
+                //传入最多播放音频数量,
+                builder.setMaxStreams(1)
+                //AudioAttributes是一个封装音频各种属性的方法
+                val attrBuilder = AudioAttributes.Builder()
+                //设置音频流的合适的属性
+                attrBuilder.setLegacyStreamType(AudioManager.STREAM_MUSIC)
+                //加载一个AudioAttributes
+                builder.setAudioAttributes(attrBuilder.build())
+                soundPool = builder.build()
+            } else {
+                /**
+                 * 第一个参数：int maxStreams：SoundPool对象的最大并发流数
+                 * 第二个参数：int streamType：AudioManager中描述的音频流类型
+                 *第三个参数：int srcQuality：采样率转换器的质量。 目前没有效果。 使用0作为默认值。
+                 */
+                soundPool = SoundPool(1, AudioManager.STREAM_MUSIC, 0)
+            }
+        }
+        //可以通过四种途径来记载一个音频资源：
+        //1.通过一个AssetFileDescriptor对象
+        //int load(AssetFileDescriptor afd, int priority)
+        //2.通过一个资源ID
+        //int load(Context context, int resId, int priority)
+        //3.通过指定的路径加载
+        //int load(String path, int priority)
+        //4.通过FileDescriptor加载
+        //int load(FileDescriptor fd, long offset, long length, int priority)
+        //声音ID 加载音频资源,这里用的是第二种，第三个参数为priority，声音的优先级*API中指出，priority参数目前没有效果，建议设置为1。
+        loadSound(context, resId)
+    }
+    private fun loadSound(context: Context, resId: Int) {
+        val voiceId = soundPool!!.load(context, resId, 1)
+        //异步需要等待加载完成，音频才能播放成功
+        soundPool!!.setOnLoadCompleteListener { soundPool, sampleId, status ->
+            if (status == 0) {
+                //第一个参数soundID
+                //第二个参数leftVolume为左侧音量值（范围= 0.0到1.0）
+                //第三个参数rightVolume为右的音量值（范围= 0.0到1.0）
+                //第四个参数priority 为流的优先级，值越大优先级高，影响当同时播放数量超出了最大支持数时SoundPool对该流的处理
+                //第五个参数loop 为音频重复播放次数，0为值播放一次，-1为无限循环，其他值为播放loop+1次
+                //第六个参数 rate为播放的速率，范围0.5-2.0(0.5为一半速率，1.0为正常速率，2.0为两倍速率)
+                soundPool.play(voiceId, 1f, 1f, 1, 0, 1f)
+            }
+        }
+    }
 }
\ No newline at end of file
--- a/other_order_mode/src/main/res/layout/activity_other_order.xml
+++ b/other_order_mode/src/main/res/layout/activity_other_order.xml
@@ -84,7 +84,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="@dimen/dp_5"
-                        android:text="本月外賣訂單數："
+                        android:text="外賣訂單數："
                        android:textColor="@color/color_a9"
                        android:textSize="@dimen/dp_12"
                        app:layout_constraintRight_toLeftOf="@id/tv_month_takeaway_num"
@@ -130,7 +130,7 @@
                        android:layout_width="wrap_content"
                        android:layout_height="wrap_content"
                        android:layout_marginTop="@dimen/dp_5"
-                        android:text="本月自取訂單數："
+                        android:text="自取訂單數："
                        android:textColor="@color/color_a9"
                        android:textSize="@dimen/dp_12"
                        app:layout_constraintRight_toLeftOf="@id/tv_month_self_num"

--- a/other_order_mode/src/main/res/layout/layout_order_receiving.xml
+++ b/other_order_mode/src/main/res/layout/layout_order_receiving.xml
@@ -42,11 +42,12 @@
        android:id="@+id/btn_stop_service"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
        android:paddingTop="@dimen/dp_5"
        android:paddingBottom="@dimen/dp_5"
        android:paddingLeft="@dimen/dp_10"
        android:paddingRight="@dimen/dp_10"
+        android:layout_centerVertical="true"
        android:background="@drawable/shape_cloas_btn"
        android:text="停止接單"
        android:textColor="@color/white"

--- a/other_order_mode/src/main/res/raw/raw_disconnect.m4a
+++ b/other_order_mode/src/main/res/raw/raw_disconnect.m4a
--- a/other_order_mode/src/main/res/raw/raw_get_order_list_error.m4a
+++ b/other_order_mode/src/main/res/raw/raw_get_order_list_error.m4a
--- 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
@@ -185,10 +185,9 @@ public class PrintInfoBean {
     * @param datas             prj數據
     * @param printLocation     廚房位置
     * @param deviceBean        打印機信息
-     * @param printCurrencyBean 堂食or外賣配置
     * @return 打印類集合
     */
-    public static List<List<PrintInfoBean>> transPrjBean(List<PrjBean.DataBean.Bean> datas, String printLocation, PrinterDeviceBean deviceBean, PrintCurrencyBean printCurrencyBean) {
+    public static List<List<PrintInfoBean>> transPrjBean(List<PrjBean.DataBean.Bean> datas, String printLocation, PrinterDeviceBean deviceBean) {
        List<List<PrintInfoBean>> prjPrintBeans = new ArrayList<>();
        //通過打印位置生成多張用於打印的bitmap
        List<PrjBean.DataBean.Bean> noCut = new ArrayList<>();
@@ -198,14 +197,14 @@ public class PrintInfoBean {
                //切紙，單獨生成一條prj數據
                List<PrjBean.DataBean.Bean> beans = new ArrayList<>();
                beans.add(prjbean);
-                prjPrintBeans.add(getPrjPrintInfoBean(printLocation, beans, deviceBean, printCurrencyBean));
+                prjPrintBeans.add(getPrjPrintInfoBean(printLocation, beans, deviceBean));
            } else {
                //不切紙，保存到單獨的集合里，之後生成一組數據
                noCut.add(prjbean);
            }
        }
        if (noCut.size() > 0) {
-            prjPrintBeans.add(getPrjPrintInfoBean(printLocation, noCut, deviceBean, printCurrencyBean));
+            prjPrintBeans.add(getPrjPrintInfoBean(printLocation, noCut, deviceBean));
        }
        return prjPrintBeans;
    }
@@ -230,9 +229,9 @@ public class PrintInfoBean {
     *
     * @return
     */
-    private static List<PrintInfoBean> getPrjPrintInfoBean(String key, List<PrjBean.DataBean.Bean> prjBeans, PrinterDeviceBean deviceBean, PrintCurrencyBean printCurrencyBean) {
+    private static List<PrintInfoBean> getPrjPrintInfoBean(String key, List<PrjBean.DataBean.Bean> prjBeans, PrinterDeviceBean deviceBean) {
        List<PrintInfoBean> printInfoBeans = new ArrayList<>();
-        initPrintConfig(deviceBean, printCurrencyBean);
+        initPrintConfig(deviceBean);
        if (prjBeans == null || prjBeans.size() <= 0) {
            return null;
        }
@@ -331,7 +330,7 @@ public class PrintInfoBean {
     */
    public static List<PrintInfoBean> getTakeAwayBillPrint(Context context, OrderDetails.DataBean data, PrinterDeviceBean deviceBean, PrintCurrencyBean printCurrencyBean) {
        List<PrintInfoBean> printInfoBeans = new ArrayList<>();
-        initPrintConfig(deviceBean, printCurrencyBean);
+        initPrintConfig(deviceBean);
        if (data == null) {
            return null;
        }
@@ -519,42 +518,15 @@ public class PrintInfoBean {
     * 初始化打印配置
     *
     * @param deviceBean        打印機
-     * @param printCurrencyBean 通用打印配置
     */
-    private static void initPrintConfig(PrinterDeviceBean deviceBean, PrintCurrencyBean printCurrencyBean) {
+    private static void initPrintConfig(PrinterDeviceBean deviceBean) {
-        if (printCurrencyBean != null) {
+        foodColor = deviceBean.getFoodComplexion();
-            foodColor = printCurrencyBean.getFoodComplexion();
+        modifierColor = deviceBean.getModifierComplexion();
-            modifierColor = printCurrencyBean.getModifierComplexion();
+        foodIsBold = deviceBean.getFoodIsBold() == 1;
-        }
+        foodItemIsBold = deviceBean.getModifierIsBold() == 1;
+        foodIsItalic = deviceBean.getFoodIsItalic() == 1;
-        if (deviceBean.getFoodIsBold() == 1) {
+        modifierIsItalic = deviceBean.getModifierIsItalic() == 1;
-            foodIsBold = true;
+        numberIsFlip = deviceBean.getNumberIsFlip() == 1;
-        } else if (printCurrencyBean != null) {
-            foodIsBold = printCurrencyBean.getFoodIsBold() == 1;
-        }
-        if (deviceBean.getModifierIsBold() == 1) {
-            foodItemIsBold = true;
-        } else if (printCurrencyBean != null) {
-            foodItemIsBold = printCurrencyBean.getModifierIsBold() == 1;
-        }
-        if (deviceBean.getFoodIsItalic() == 1) {
-            foodIsItalic = true;
-        } else if (printCurrencyBean != null) {
-            foodIsItalic = printCurrencyBean.getFoodIsItalic() == 1;
-        }
-        if (deviceBean.getModifierIsItalic() == 1) {
-            modifierIsItalic = true;
-        } else if (printCurrencyBean != null) {
-            modifierIsItalic = printCurrencyBean.getModifierIsItalic() == 1;
-        }
-        if (deviceBean.getNumberIsFlip() == 1) {
-            numberIsFlip = true;
-        } else if (printCurrencyBean != null) {
-            numberIsFlip = printCurrencyBean.getNumberIsFlip() == 1;
-        }
        if ((deviceBean.getPrinterName() != null && deviceBean.getPrinterName().toLowerCase().contains("EPSON".toLowerCase()))
                && (deviceBean.getModel() != null && deviceBean.getModel().toLowerCase().contains("TM-U220B".toLowerCase()))) {
            cnLength = 1.5;

--- a/print-module/src/main/java/com/joe/print/mvp/model/bean/PrjBean.java
+++ b/print-module/src/main/java/com/joe/print/mvp/model/bean/PrjBean.java
@@ -58,7 +58,7 @@ public class PrjBean {
             */
            private int id;
            private int printerDeviceId;
-            private int status;
+            private int status;//為2是帶*，需要切紙的
            private String tableName;
            private String orderNo;
            private int orderTime;

--- a/print-module/src/main/java/com/joe/print/mvp/presenter/PrintPresenter.java
+++ b/print-module/src/main/java/com/joe/print/mvp/presenter/PrintPresenter.java
@@ -2,12 +2,10 @@ package com.joe.print.mvp.presenter;
 import android.app.Application;
 import android.content.Context;
-import android.util.Log;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.PrinterManger.PrinterManager;
 import com.gingersoft.gsa.cloud.base.utils.JsonUtils;
-import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
 import com.gingersoft.gsa.cloud.database.bean.PrinterListBean;
@@ -19,7 +17,6 @@ import com.jess.arms.integration.AppManager;
 import com.jess.arms.mvp.BasePresenter;
 import com.jess.arms.utils.RxLifecycleUtils;
 import com.joe.print.mvp.contract.PrintContract;
-import com.joe.print.mvp.model.bean.PrjBean;
 import com.joe.print.mvp.print.PrintBill;
 import com.joe.print.mvp.print.PrintCleanMachine;
 import com.joe.print.mvp.print.PrintInstruction;
@@ -30,7 +27,6 @@ import com.joe.print.mvp.print.PrintServe;
 import com.joe.print.mvp.print.PrintSlip;
 import com.joe.print.mvp.print.PrintTest;
 import com.joe.print.mvp.print.PrinterRoot;
-import com.joe.print.mvp.print.utils.MyPrintUtils;
 import java.util.List;
@@ -41,8 +37,6 @@ import io.reactivex.schedulers.Schedulers;
 import me.jessyan.rxerrorhandler.core.RxErrorHandler;
 import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
-import static com.joe.print.mvp.print.PrinterRoot.PRINT_TEST;
 /**
 * ================================================

--- a/print-module/src/main/java/com/joe/print/mvp/print/EpsonPrint.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/EpsonPrint.java
@@ -23,6 +23,8 @@ public class EpsonPrint implements ReceiveListener {
    private ReceiveListener receiveListener;
+//    private PrjPrintCallbackListener
    private static EpsonPrint epsonPrint;
    public static EpsonPrint getInstance() {
@@ -168,17 +170,6 @@ public class EpsonPrint implements ReceiveListener {
 //            textData.delete(0, textData.length());
 //
 //            textData.append("400 OHEIDA 3PK SPRINGF  9.99 R\n");
-//            textData.append("410 3 CUP BLK TEAPOT    9.99 R\n");
-//            textData.append("445 EMERIL GRIDDLE/PAN 17.99 R\n");
-//            textData.append("438 CANDYMAKER ASSORT   4.99 R\n");
-//            textData.append("474 TRIPOD              8.99 R\n");
-//            textData.append("433 BLK LOGO PRNTED ZO  7.99 R\n");
-//            textData.append("458 AQUA MICROTERRY SC  6.99 R\n");
-//            textData.append("493 30L BLK FF DRESS   16.99 R\n");
-//            textData.append("407 LEVITATING DESKTOP  7.99 R\n");
-//            textData.append("441 **Blue Overprint P  2.99 R\n");
-//            textData.append("476 REPOSE 4PCPM CHOC   5.49 R\n");
-//            textData.append("461 WESTGATE BLACK 25  59.99 R\n");
 //            textData.append("------------------------------\n");
 //            method = "addText";
 //            mPrinter.addText(textData.toString());
@@ -328,62 +319,43 @@ public class EpsonPrint implements ReceiveListener {
        }
    }
-    public int putPrintData(String ip, Bitmap bitmap) {
+    public void putPrintData(String ip, Bitmap bitmap) {
        //把bitmap存隊列中，下次打印
        bitmaps.add(bitmap);
        if (isPrint) {
-            //開啟定時，如果在10秒後沒執行回調，就修改打印狀態為沒打印
+            return;
-//            startTimer(10);
-            return 0;
        }
        isPrint = true;
-        return printData(ip, bitmap);
+        printData(ip, bitmap);
    }
    //重試次數5次
    private int resetCount = 5;
-    private int printData(String ip, Bitmap bitmap) {
+    private void printData(String ip, Bitmap bitmap) {
        mPrinter.clearCommandBuffer();
        if (!createPrintData(bitmap)) {
-            return 0;
+            return;
        }
        if (mPrinter == null) {
-            return 0;
+            return;
        }
        connectByIp(ip, mPrinter.getStatus());
        if (mPrinter == null) {
-            return 0;
+            return;
        }
        PrinterStatusInfo statusInfo = mPrinter.getStatus();
-//        if (statusInfo.getConnection() != 1) {
-//            if (resetCount > 0) {
-//                //沒連接上打印機，延遲2秒後再試
-//                resetCount--;
-//                if (resetCount < 3) {
-//                    //試了兩次還不能連接上，斷開連接
-//                    disconnectPrinter();
-//                }
-//                startTimer(5);
-//            }
-//            return 0;
-//        }
        if (statusInfo.getPaper() == 2) {
            //沒紙了
-            return 2;
+            return;
        }
        try {
            mPrinter.sendData(Printer.PARAM_DEFAULT);
-            if (timerDisposable != null) {
-                timerDisposable.dispose();
-            }
        } catch (Exception e) {
            mPrinter.clearCommandBuffer();
            disconnectPrinter();
            isPrint = false;
-            return 0;
        }
-        return 1;
    }
    private Disposable timerDisposable;
@@ -493,7 +465,6 @@ public class EpsonPrint implements ReceiveListener {
            bitmaps.remove(0);
        }
        if (bitmaps.size() > 0) {
-//            startTimer(2);
            printData(ipAddress, bitmaps.get(0));
        } else {
            isPrint = false;

--- a/print-module/src/main/java/com/joe/print/mvp/print/IpPrintMaker.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/IpPrintMaker.java
@@ -5,6 +5,7 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Rect;
+import android.util.Log;
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
 import com.gingersoft.gsa.cloud.print.PrintDataMaker;
@@ -43,14 +44,15 @@ public class IpPrintMaker implements PrintDataMaker {
                ToastUtils.show(mContext, "打印失敗");
                return null;
            }
+            Log.e("eee", "個數：" + bitmaps.size());
            for (int i = 0; i < bitmaps.size(); i++) {
                ArrayList<byte[]> image1 = printer.getImageByte(bitmaps.get(i));//將bitmap縮放到打印機紙張大小再添加到集合中。
                data.addAll(image1);//draw2PxPoint2(bitmaps.get(i)
                printer.printLineFeed();
                printer.printLineFeed();
                printer.printLineFeed();
-                printer.printLineFeed();
+//                printer.printLineFeed();
-                printer.printLineFeed();
+//                printer.printLineFeed();
                printer.feedPaperCutPartial();
                data.add(printer.getDataAndReset());
            }
@@ -60,4 +62,9 @@ public class IpPrintMaker implements PrintDataMaker {
            return new ArrayList<>();
        }
    }
+    @Override
+    public String getPrjIds() {
+        return null;
+    }
 }
--- a/print-module/src/main/java/com/joe/print/mvp/print/OpenCashBoxMaker.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/OpenCashBoxMaker.java
@@ -26,4 +26,9 @@ public class OpenCashBoxMaker implements PrintDataMaker {
            return new ArrayList<>();
        }
    }
+    @Override
+    public String getPrjIds() {
+        return null;
+    }
 }
--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java
@@ -41,7 +41,7 @@ public class PrintBill extends PrinterRoot {
    public Map<String, List<Bitmap>> getPrintBitmap(Context mContext, PrinterDeviceBean deviceBean) {
        Map<String, List<Bitmap>> bitmapMaps = new HashMap<>();
        List<Bitmap> bitmaps = new ArrayList<>();
-        bitmaps.add(getServeBitmap(mContext));
+        bitmaps.add(getBitmap(mContext, deviceBean));
        bitmapMaps.put("", bitmaps);
        return bitmapMaps;
    }
@@ -158,7 +158,7 @@ public class PrintBill extends PrinterRoot {
        layout.addView(getLine(mContext));
        //食品信息
-        layout.addView(getDiningFoodList(mContext, foodList));
+        layout.addView(getDiningFoodList(mContext, foodList, deviceBean));
        layout.addView(getHalfLine(mContext));
        //訂單金額信息
@@ -172,6 +172,8 @@ public class PrintBill extends PrinterRoot {
            }
        }
        layout.addView(getDiningBillInfo(mContext, billingBeans));
        layout.addView(getHalfLine(mContext));
        BigDecimal totalAmount = new BigDecimal(0);

--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintCleanMachine.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintCleanMachine.java
@@ -21,7 +21,7 @@ public class PrintCleanMachine extends PrinterRoot {
    public Map<String, List<Bitmap>> getPrintBitmap(Context mContext, PrinterDeviceBean deviceBean) {
        Map<String, List<Bitmap>> bitmapMaps = new HashMap<>();
        List<Bitmap> bitmaps = new ArrayList<>();
-        bitmaps.add(getServeBitmap(mContext));
+        bitmaps.add(getServeBitmap(mContext, deviceBean));
        bitmapMaps.put("", bitmaps);
        return bitmapMaps;
    }
@@ -38,10 +38,10 @@ public class PrintCleanMachine extends PrinterRoot {
     * @param mContext
     * @return
     */
-    private Bitmap getServeBitmap(Context mContext) {
+    private Bitmap getServeBitmap(Context mContext, PrinterDeviceBean deviceBean) {
        View view = PrintTransitUtils.getInstance().getPrintView();
        if (view != null) {
-            return viewToBitmap(mContext, view);
+            return viewToZoomBitmap(mContext, view, deviceBean);
        }
        return null;
    }

--- 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
@@ -11,6 +11,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
+import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
 import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
 import com.gingersoft.gsa.cloud.base.utils.other.TextUtil;
@@ -31,6 +32,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+/**
+ * 外送接單，印單
+ */
 public class PrintOtherOrder extends PrinterRoot {
@@ -129,7 +133,8 @@ public class PrintOtherOrder extends PrinterRoot {
 //            }
            //如果需要打印印單，加上
            List<Bitmap> bitmaps = new ArrayList<>();
-            Bitmap bitmap = initPrintView(mContext, dataBean);
+//            Bitmap bitmap = initPrintView(mContext, dataBean);
+            Bitmap bitmap = getBitmap(mContext, dataBean, deviceBean);
            bitmaps.add(bitmap);
            merge2ResultMap(bitmapMaps, "", bitmaps);
            return bitmapMaps;
@@ -207,6 +212,59 @@ public class PrintOtherOrder extends PrinterRoot {
        return viewToBitmap(context, view);
    }
+    private Bitmap getBitmap(Context mContext, OrderDetails.DataBean data, PrinterDeviceBean deviceBean) {
+        LinearLayout layout = new LinearLayout(mContext);
+        layout.setOrientation(LinearLayout.VERTICAL);
+        //頭部
+        layout.addView(getHeader(mContext));
+        //訂單信息
+        layout.addView(getTakeawayOrderInfo(mContext, data));
+        //食品
+        layout.addView(getTextLine(mContext, "項目"));
+        layout.addView(getDiningFoodList(mContext, OrderDetail.productMameBeanToOrderDetail(0, data.getPRODUCT_NAME()), deviceBean));
+        layout.addView(getLine(mContext));
+        //訂單金額信息
+        List<PrintBillBean> billData = new ArrayList<>();
+        billData.add(getBillBean("合計：", MONETARY_UNIT + MoneyUtil.sub(MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getLunchbox()), data.getDELIVERY_CHARGE())));
+        if (data.getLunchbox() != 0) {
+            billData.add(getBillBean("餐盒費：", MONETARY_UNIT + data.getLunchbox()));
+        }
+        if (data.getDELIVERY_CHARGE() != 0) {
+            billData.add(getBillBean("送貨費：", MONETARY_UNIT + data.getDELIVERY_CHARGE()));
+        }
+        if (data.getCouponList() != null && data.getCouponList().size() > 0) {
+            for (OrderDetails.DataBean.CouponBean coupon : data.getCouponList()) {
+                billData.add(getBillBean(coupon.getCouponName() + "：", "-" + MONETARY_UNIT + coupon.getDiscount_amount()));
+            }
+        }
+        layout.addView(getTakeawayBillInfoView(mContext, billData));
+        layout.addView(getLine(mContext));
+        //總金額34sp
+        layout.addView(getTakeawayLargeAmount(mContext, "總金額：", MONETARY_UNIT + data.getTOTAL_AMOUNT()));
+        layout.addView(getLine(mContext));
+        //支付金額
+        layout.addView(getTakeawayLargeAmount(mContext, "支付金額：", MONETARY_UNIT + MoneyUtil.sub(Double.parseDouble(data.getTOTAL_AMOUNT()), data.getDiscount_amount()) + ""));
+        layout.addView(getLine(mContext));
+        //用戶信息
+        String address = "";
+        String receiver = "";
+        if (data.getOrder_type() == 2) {
+            //收貨地址
+            address = "地址：" + data.getAddressDetail();
+            //收貨人
+            receiver = "收貨人：" + data.getRECEIVER();
+        }
+        if (!TextUtil.isEmptyOrNullOrUndefined(address)) {
+            layout.addView(getTakeawayTextView(mContext, address));
+        }
+        if (!TextUtil.isEmptyOrNullOrUndefined(receiver)) {
+            layout.addView(getTakeawayTextView(mContext, receiver));
+        }
+        layout.addView(getTakeawayTextView(mContext, "手機號：" + data.getPHONE()));
+        //尾部
+        return viewToZoomBitmap(mContext, layout, deviceBean);
+    }
    private Bitmap initPrintView(Context context, OrderDetails.DataBean data) {
        View view = LayoutInflater.from(context).inflate(R.layout.print_confirm_order_view, null, false);

--- 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
@@ -39,7 +39,7 @@ public class PrintOtherOrderClosing extends PrinterRoot {
        if (dataBean != null) {
            Map<String, List<Bitmap>> bitmapMaps = new HashMap<>();
            List<Bitmap> bitmaps = new ArrayList<>();
-            bitmaps.add(initPrintView(mContext, dataBean));
+            bitmaps.add(initPrintView(mContext, dataBean, deviceBean));
            bitmapMaps.put("", bitmaps);
            return bitmapMaps;
        }
@@ -61,7 +61,7 @@ public class PrintOtherOrderClosing extends PrinterRoot {
        return printCount;
    }
-    private Bitmap initPrintView(Context context, OrderDetails.DataBean data) {
+    private Bitmap initPrintView(Context context, OrderDetails.DataBean data, PrinterDeviceBean deviceBean) {
        View view = LayoutInflater.from(context).inflate(R.layout.print_confirm_order_view, null, false);
        TextView tvMemberNum = view.findViewById(R.id.tv_member_number);//會員號碼
        TextView tvMemberName = view.findViewById(R.id.tv_member_name);//會員名稱
@@ -185,7 +185,7 @@ public class PrintOtherOrderClosing extends PrinterRoot {
            tvOldPoints.setVisibility(View.VISIBLE);
            lineMember.setVisibility(View.VISIBLE);
        }
-        return viewToBitmap(context, view);
+        return viewToZoomBitmap(context, view, deviceBean);
    }
    private PrintBillBean getBillBean(String title, String value) {

--- a/print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java
@@ -64,13 +64,19 @@ public class PrintPrjKitchen extends PrinterRoot {
        return 1;
    }
+    public Bitmap getKitChenPrintBitmap(Context context, String key, PrjBean.DataBean.Bean data) {
+        List<PrjBean.DataBean.Bean> beans = new ArrayList<>();
+        beans.add(data);
+        return getKitChenPrintBitmap(context, key, beans);
+    }
    /**
     * 獲取"廚房單"圖片
     *
     * @param context
     * @return
     */
-    private Bitmap getKitChenPrintBitmap(Context context, String key, List<PrjBean.DataBean.Bean> data) {
+    public Bitmap getKitChenPrintBitmap(Context context, String key, List<PrjBean.DataBean.Bean> data) {
        if (data == null || data.size() <= 0) {
            return null;
        }
@@ -134,7 +140,7 @@ public class PrintPrjKitchen extends PrinterRoot {
            if (prjBean.getOrderType() == 7) {
                tvTableNumber.setText("自取");
                tvTableNumber2.setText("自取");
-                if(!TextUtil.isEmptyOrNullOrUndefined(prjBean.getTakeFoodCode())){
+                if (!TextUtil.isEmptyOrNullOrUndefined(prjBean.getTakeFoodCode())) {
                    tvTakeCodeText.setVisibility(View.VISIBLE);
                    tvTakeCode.setVisibility(View.VISIBLE);
                    tvTakeCode.setText(prjBean.getTakeFoodCode());

--- 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
--- a/print-module/src/main/java/com/joe/print/mvp/print/PrjPrintCallbackListener.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/PrjPrintCallbackListener.java
+package com.joe.print.mvp.print;
+public interface PrjPrintCallbackListener {
+//    void
+}
--- a/print-module/src/main/java/com/joe/print/mvp/print/SendPrint.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/SendPrint.java
@@ -77,6 +77,11 @@ public class SendPrint implements PrintDataMaker {
        }
    }
+    @Override
+    public String getPrjIds() {
+        return null;
+    }
 /*************************************************************************
      * 假设一个240*240的图片，分辨率设为24, 共分10行打印
      * 每一行,是一个 240*24 的点阵, 每一列有24个点,存储在3个byte里面。

--- a/print-module/src/main/java/com/joe/print/mvp/print/TestPrintMaker.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/TestPrintMaker.java
@@ -46,6 +46,11 @@ public class TestPrintMaker implements PrintDataMaker {
        }
    }
+    @Override
+    public String getPrjIds() {
+        return null;
+    }
    private void print(PrintInfoBean printInfoBean, int i) throws IOException {
 //        if (i == 0) {
 //            location = 0;

--- a/print-module/src/main/java/com/joe/print/mvp/print/maker/PrjPrintMaker.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/maker/PrjPrintMaker.java
+package com.joe.print.mvp.print.maker;
+import android.graphics.Bitmap;
+import com.gingersoft.gsa.cloud.print.PrintDataMaker;
+import com.gingersoft.gsa.cloud.print.PrinterWriter;
+import com.gingersoft.gsa.cloud.print.PrinterWriterExecutor;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+/**
+ * Created by Wyh on 2020/1/9.
+ * ip打印類
+ */
+public class PrjPrintMaker implements PrintDataMaker {
+    private Map<String, Bitmap> bitmapMap;
+    public PrjPrintMaker(Map<String, Bitmap> bitmapMap) {
+        this.bitmapMap = bitmapMap;
+    }
+    @Override
+    public List<byte[]> getPrintData() {
+        ArrayList<byte[]> data = new ArrayList<>();
+        try {
+            PrinterWriter printer = new PrinterWriterExecutor(255, 380);
+            for (Map.Entry<String, Bitmap> bitmapMap : bitmapMap.entrySet()) {
+                ArrayList<byte[]> image1 = printer.getImageByte(bitmapMap.getValue());
+                data.addAll(image1);
+            }
+            printer.printLineFeed(5);
+            printer.feedPaperCutPartial();
+            data.add(printer.getDataAndReset());
+            data.add(printer.getDataAndClose());
+            return data;
+        } catch (Exception e) {
+            return new ArrayList<>();
+        }
+    }
+    @Override
+    public String getPrjIds() {
+        for (Map.Entry<String, Bitmap> bitmapMap : bitmapMap.entrySet()) {
+            return bitmapMap.getKey();
+        }
+        return "";
+    }
+}
--- a/print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/service/PrjService.java
--- a/print-module/src/main/java/com/joe/print/mvp/print/utils/MyPrintUtils.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/utils/MyPrintUtils.java
@@ -39,7 +39,7 @@ public class MyPrintUtils {
     * @param type    1：堂食，2：外送
     * @return
     */
-    public PrintCurrencyBean getPrintCurrencyBeanByType(Context context, int type) {
+    public static PrintCurrencyBean getPrintCurrencyBeanByType(Context context, int type) {
        if (isUpdateCurrencyBeans || printCurrencyBeans == null || printCurrencyBeans.size() == 0) {
            PrintCurrencyDaoUtils printCurrencyDaoUtils = new PrintCurrencyDaoUtils(context);
            printCurrencyBeans = printCurrencyDaoUtils.queryAllPrintCurrencyBean();
@@ -107,6 +107,35 @@ public class MyPrintUtils {
        return null;
    }
+    /**
+     * 配置打印機屬性，因為有部分屬性是預設的，如果是預設的，就取通用打印配置
+     */
+    public static PrinterDeviceBean configPrinterProperties(PrintCurrencyBean printCurrencyBean, PrinterDeviceBean defaultPrint) {
+        if (printCurrencyBean != null && defaultPrint != null) {
+            if (defaultPrint.getFoodIsBold() == 0) {
+                defaultPrint.setFoodIsBold(printCurrencyBean.getFoodIsBold());
+            }
+            if (defaultPrint.getFoodFont().equals("0")) {
+                defaultPrint.setFoodFont(printCurrencyBean.getFoodFont());
+            }
+            if (defaultPrint.getFoodIsItalic() == 0) {
+                defaultPrint.setFoodIsItalic(printCurrencyBean.getFoodIsItalic());
+            }
+            if (defaultPrint.getModifierIsBold() == 0) {
+                defaultPrint.setModifierIsBold(printCurrencyBean.getModifierIsBold());
+            }
+            if (defaultPrint.getModifierFont().equals("0")) {
+                defaultPrint.setModifierFont(printCurrencyBean.getModifierFont());
+            }
+            if (defaultPrint.getModifierIsItalic() == 0) {
+                defaultPrint.setModifierIsItalic(printCurrencyBean.getModifierIsItalic());
+            }
+            if (defaultPrint.getNumberIsFlip() == 0) {
+                defaultPrint.setNumberIsFlip(printCurrencyBean.getNumberIsFlip());
+            }
+        }
+        return defaultPrint;
+    }
    public TextView getBrandName(Context context) {
        return getNormalTextView(context, GsaCloudApplication.getBrandName(context), HEADER_TEXTSIZE);

--- a/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
+++ b/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
@@ -44,6 +44,7 @@ import com.joe.print.mvp.print.OpenCashBoxMaker;
 import com.joe.print.mvp.print.PrintInstruction;
 import com.joe.print.mvp.print.PrintListener;
 import com.joe.print.mvp.print.PrinterRoot;
+import com.joe.print.mvp.print.utils.MyPrintUtils;
 import com.joe.print.mvp.ui.adapter.DialogPrinterListAdapter;
 import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
@@ -53,7 +54,6 @@ import java.util.List;
 import static com.gingersoft.gsa.cloud.constans.PrintConstans.PRINT_TYPE;
 import static com.jess.arms.utils.Preconditions.checkNotNull;
 /**
 * ================================================
 * Description:
@@ -117,9 +117,9 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        return 0; //如果你不需要框架帮你设置 setContentView(id) 需要 自行设置,请返回 0
    }
    @Override
    public void initData(@Nullable Bundle savedInstanceState) {
+        Log.e("eee", "打開打印界面");
        callId = CCUtil.getNavigateCallId(this);
        //獲取打印類型，根據打印類型生成對應的bitmap
@@ -130,24 +130,6 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        if (printerInIt != null) {
            printerInIt.setmContext(mContext).setPrintListener(this).initUsbPrint();
        }
-//        PrinterDeviceDaoUtils printerDeviceDaoUtils = new PrinterDeviceDaoUtils(this);
-//        printerDeviceBeans = printerDeviceDaoUtils.queryAllPrinterDeviceBean();
-//        printerDeviceDaoUtils.closeConnection();
-//        if (type == PrinterRoot.PRINT_TEST) {
-//            if (deviceBean != null) {
-//                printerInIt.ipDevicePrint(deviceBean, printerInIt.getPrintBitmap(mContext).get(""));
-//            } else {
-//                ToastUtils.show(mContext, "測試失敗");
-//                finish();
-//            }
-//        } else {
-//            if (printerDeviceBeans == null || printerDeviceBeans.size() <= 0) {
-//                mPresenter.getPrinterList(GsaCloudApplication.getRestaurantId(mContext));
-//            } else {
-//                printerInIt.print(printerDeviceBeans);
-//            }
-//        }
        initPrintConfig();
    }
@@ -188,7 +170,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
                        mRvPrintList.setAdapter(printListAdapter);
                        printListAdapter.setOnItemClickListener((adapter, view, position) -> {
                            //用戶選擇的ip打印機打印
-                            PrinterDeviceBean defaultPrint = configPrinterProperties(finalPrintCurrencyBean, printerDeviceBeans.get(position));
+                            PrinterDeviceBean defaultPrint = MyPrintUtils.configPrinterProperties(finalPrintCurrencyBean, printerDeviceBeans.get(position));
                            printByDevice(defaultPrint);
                            SPUtils.put(mContext, "defaultPrint", printerDeviceBeans.get(position).getName());
                            dialog.dismiss();
@@ -203,7 +185,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
                ToastUtils.show(mContext, "沒有打印機，請先添加打印機");
            }
        } else {
-            defaultPrint = configPrinterProperties(printCurrencyBean, defaultPrint);
+            defaultPrint = MyPrintUtils.configPrinterProperties(printCurrencyBean, defaultPrint);
            printByDevice(defaultPrint);
        }
    }
@@ -212,27 +194,23 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    //根據配置生成配置好的圖片----生成圖片邏輯：把打印的單分為幾個模塊，再由不同的單拼接出對應的單，(如果是針式，生成對應的文字)
    //再獲取打印方式(IP、本機、USB、藍牙或其他的)，調用打印
    private void printByDevice(PrinterDeviceBean defaultPrint) {
-        if (isShowDialog) {
-            initDialog();
-        }
        //獲取對應的打印類
        if (printerInIt instanceof PrintInstruction) {
            //開錢箱
            PrintExecutor executor = new PrintExecutor(defaultPrint);
            executor.doPrinterRequestAsync(new OpenCashBoxMaker());
        } else {
-            //先在這裡壓縮，之後在每個類自己生成的時候壓縮
+            if (isShowDialog) {
-            List<Bitmap> bitmaps = printerInIt.getPrintBitmap(mContext, defaultPrint).get("");
+                initDialog();
-            List<Bitmap> zoomBitmaps = new ArrayList<>();
-            if (bitmaps == null || bitmaps.size() <= 0) {
-                printFile();
-                return;
-            }
-            for (Bitmap bitmap : bitmaps) {
-                Bitmap zoomBitmap = printerInIt.zoomBitmap(defaultPrint, bitmap);
-                zoomBitmaps.add(zoomBitmap);
            }
-            if (zoomBitmaps.size() > 0) {
+            //先在這裡壓縮，之後在每個類自己生成的時候壓縮
+            List<Bitmap> zoomBitmaps = printerInIt.getPrintBitmap(mContext, defaultPrint).get("");
+//            List<Bitmap> zoomBitmaps = new ArrayList<>();
+//            for (Bitmap bitmap : bitmaps) {
+//                Bitmap zoomBitmap = printerInIt.zoomBitmap(defaultPrint, bitmap);
+//                zoomBitmaps.add(zoomBitmap);
+//            }
+            if (zoomBitmaps != null && zoomBitmaps.size() > 0) {
                if (defaultPrint.getPrinterDeviceType() == 1) {
                    //IP打印
                    printerInIt.ipDevicePrint(defaultPrint, zoomBitmaps);
@@ -244,44 +222,14 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
                    printerInIt.usbPrint(mContext, zoomBitmaps);
                } else {
                    ToastUtils.show(mContext, "未找到對應的打印類型");
-                    finish();
+                    printFile();
                }
            } else {
                //打印失敗
                Log.e("eee", "打印失敗，沒有生成對應的圖片");
-                finish();
+                printFile();
-            }
-        }
-    }
-    /**
-     * 配置打印機屬性，因為有部分屬性是預設的，如果是預設的，就取通用打印配置
-     */
-    private PrinterDeviceBean configPrinterProperties(PrintCurrencyBean printCurrencyBean, PrinterDeviceBean defaultPrint) {
-        if (printCurrencyBean != null && defaultPrint != null) {
-            if (defaultPrint.getFoodIsBold() == 0) {
-                defaultPrint.setFoodIsBold(printCurrencyBean.getFoodIsBold());
-            }
-            if (defaultPrint.getFoodFont().equals("0")) {
-                defaultPrint.setFoodFont(printCurrencyBean.getFoodFont());
-            }
-            if (defaultPrint.getFoodIsItalic() == 0) {
-                defaultPrint.setFoodIsItalic(printCurrencyBean.getFoodIsItalic());
-            }
-            if (defaultPrint.getModifierIsBold() == 0) {
-                defaultPrint.setModifierIsBold(printCurrencyBean.getModifierIsBold());
-            }
-            if (defaultPrint.getModifierFont().equals("0")) {
-                defaultPrint.setModifierFont(printCurrencyBean.getModifierFont());
-            }
-            if (defaultPrint.getModifierIsItalic() == 0) {
-                defaultPrint.setModifierIsItalic(printCurrencyBean.getModifierIsItalic());
-            }
-            if (defaultPrint.getNumberIsFlip() == 0) {
-                defaultPrint.setNumberIsFlip(printCurrencyBean.getNumberIsFlip());
            }
        }
-        return defaultPrint;
    }
    private void initDialog() {
@@ -371,6 +319,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
            case PrintSocketHolder.STATE_4:
                Log.e("eee", "關閉中");
                tip = "關閉中";
+                finish();
                break;
            case DIMISS_LOADING:
                disLoadingDialog();

--- a/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrinterAddActivity.java
+++ b/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrinterAddActivity.java
@@ -130,7 +130,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
    private int flipPosition = 0;//數量大於1是否翻轉
    public static List<String> printTypes = Arrays.asList("網路打印", "本機打印", "USB打印");
-    private List<String> fontSize = Arrays.asList("預設", "0", "1");
+    private List<String> fontSize = Arrays.asList("預設", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30");
    private List<String> booleanSelect = Arrays.asList("預設", "是", "否");

--- a/print-module/src/main/res/layout/print_bill_adapter_item_bill.xml
+++ b/print-module/src/main/res/layout/print_bill_adapter_item_bill.xml
@@ -18,6 +18,7 @@
        android:layout_height="wrap_content"
        android:layout_marginLeft="@dimen/dp_5"
        android:layout_weight="1"
+        android:layout_gravity="bottom"
        android:gravity="right" />
 </LinearLayout>
\ No newline at end of file
--- a/print-module/src/main/res/layout/print_model_takeaway_member_integer_info.xml
+++ b/print-module/src/main/res/layout/print_model_takeaway_member_integer_info.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <TextView
+        android:id="@+id/tv_print_model_member_number"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="會員號碼：" />
+    <TextView
+        android:id="@+id/tv_print_model_member_name"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="會員名稱：" />
+    <TextView
+        android:id="@+id/tv_print_model_member_phone"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="會員電話：" />
+    <TextView
+        android:id="@+id/tv_print_model_oldPoints"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="上次積分：" />
+    <TextView
+        android:id="@+id/tv_print_model_addPoints"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="本次積分：" />
+    <TextView
+        android:id="@+id/tv_print_model_nowPoints"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:text="結餘積分：" />
+</LinearLayout>
\ No newline at end of file
--- a/print-module/src/main/res/layout/print_model_takeaway_order_info.xml
+++ b/print-module/src/main/res/layout/print_model_takeaway_order_info.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+    <include layout="@layout/print_model_text_line" />
+    <TextView
+        android:id="@+id/tv_print_model_pay_type"
+        style="@style/print_other_order_thirty_bold_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_5"
+        tools:text="在線支付：Payme" />
+    <TextView
+        android:id="@+id/tv_print_model_delivery_time"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="@dimen/dp_5"
+        android:textColor="@color/theme_333_color"
+        android:textStyle="bold"
+        tools:text="盡快送達" />
+    <TextView
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:maxLines="1"
+        android:text="@string/print_split_line" />
+    <TextView
+        android:id="@+id/tv_print_model_bill_number"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text='單號：' />
+    <TextView
+        android:id="@+id/tv_print_model_order_number"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text='訂單號：' />
+    <TextView
+        android:id="@+id/tv_print_model_order_take_food_code"
+        style="@style/print_other_order_thirty_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:textSize="@dimen/dp_50"
+        android:textStyle="bold"
+        tools:text="取餐碼：" />
+    <TextView
+        android:id="@+id/tv_print_model_order_create_time"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text='開單時間' />
+    <TextView
+        android:id="@+id/tv_print_model_order_closing_time"
+        style="@style/print_other_order_twenty_six_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="結賬時間" />
+    <TextView
+        android:id="@+id/tv_print_model_remark"
+        style="@style/print_other_order_thirty_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_5"
+        android:textStyle="bold"
+        tools:text="備註：" />
+</LinearLayout>
\ No newline at end of file
--- a/print-module/src/main/res/layout/print_model_takeaway_total_amount.xml
+++ b/print-module/src/main/res/layout/print_model_takeaway_total_amount.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="horizontal">
+    <TextView
+        android:id="@+id/tv_total_text"
+        style="@style/print_other_order_thirty_bold_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        tools:text="總金額：" />
+    <TextView
+        android:id="@+id/tv_total"
+        style="@style/print_other_order_thirty_bold_style"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_10"
+        android:layout_weight="1"
+        android:gravity="right"
+        android:textStyle="bold"
+        tools:text="$11" />
+</LinearLayout>
--- a/print-module/src/main/res/layout/print_model_text_line.xml
+++ b/print-module/src/main/res/layout/print_model_text_line.xml
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:gravity="center_vertical"
+    android:orientation="horizontal">
+    <TextView
+        style="@style/Print_text_style"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.5"
+        android:maxLines="1"
+        android:text="@string/print_split_line" />
+    <TextView
+        android:id="@+id/print_model_center_text"
+        style="@style/Print_text_style"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        tools:text="外送或自取" />
+    <TextView
+        style="@style/Print_text_style"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.5"
+        android:maxLines="1"
+        android:text="@string/print_split_line" />
+</LinearLayout>
\ No newline at end of file
--- a/print-module/src/main/res/layout/print_model_textview.xml
+++ b/print-module/src/main/res/layout/print_model_textview.xml
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/tv_print_model_textview"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" />
--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/contract/OrderContentContract.java
@@ -81,7 +81,7 @@ public interface OrderContentContract {
        Observable<TableBean> getTables(int restaurantId);
-        Observable<TableDetail> getTable(int tableId);
+        Observable<TableDetail> getTable(long tableId);
        Observable<BaseRespose> transferFood(RequestBody requestBody);
    }

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/model/OrderContentModel.java
@@ -96,7 +96,7 @@ public class OrderContentModel extends BaseModel implements OrderContentContract
    }
    @Override
-    public Observable<TableDetail> getTable(int tableId) {
+    public Observable<TableDetail> getTable(long tableId) {
        return mRepositoryManager.obtainRetrofitService(TableService.class)
                .getTable(tableId);
    }

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderContentPresenter.java
@@ -18,27 +18,17 @@ import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
 import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
 import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
-import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
 import com.gingersoft.gsa.cloud.base.utils.gson.GsonUtils;
 import com.gingersoft.gsa.cloud.constans.GoldConstants;
 import com.gingersoft.gsa.cloud.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.database.bean.Discount;
-import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.bean.Function;
-import com.gingersoft.gsa.cloud.database.bean.Modifier;
-import com.gingersoft.gsa.cloud.database.utils.FoodDaoUtils;
-import com.gingersoft.gsa.cloud.database.utils.ModifierDaoUtils;
-import com.gingersoft.gsa.cloud.function.FunctionManager;
 import com.gingersoft.gsa.cloud.print.PrinterUtils;
-import com.gingersoft.gsa.cloud.table.ComponentTable;
-import com.gingersoft.gsa.cloud.table.R;
-import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant;
 import com.gingersoft.gsa.cloud.table.mvp.contract.OrderContentContract;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.TableDetail;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.AddOrderRequest;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.CreateOrderRequest;
-import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.SoldoutRequest;
 import com.gingersoft.gsa.cloud.table.mvp.model.utils.OrderAssemblyUtil;
 import com.gingersoft.gsa.cloud.table.mvp.ui.activity.MealStandActivity;
 import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderContentActivity;
@@ -48,11 +38,9 @@ import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderMoneyAdapter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.OrderTopFunctionAdapter;
 import com.gingersoft.gsa.cloud.table.mvp.ui.widget.DiscountDialog;
 import com.gingersoft.gsa.cloud.ui.widget.dialog.CommonTipDialog;
-import com.jess.arms.base.DefaultAdapter;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;
-import com.jess.arms.utils.ArmsUtils;
 import com.jess.arms.utils.RxLifecycleUtils;
 import com.scwang.smartrefresh.layout.api.RefreshLayout;

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/OrderPayPresenter.java
 package com.gingersoft.gsa.cloud.table.mvp.presenter;
 import android.app.Application;
-import android.text.TextUtils;
-import android.view.View;
-import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.base.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.base.common.bean.OrderDetail;
@@ -19,15 +16,12 @@ import com.gingersoft.gsa.cloud.table.mvp.contract.OrderPayContract;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.AddOrderRequest;
 import com.gingersoft.gsa.cloud.table.mvp.model.bean.request.CreateOrderRequest;
 import com.gingersoft.gsa.cloud.table.mvp.ui.activity.OrderPayActivity;
-import com.gingersoft.gsa.cloud.ui.adapter.BillMethodAdapter;
-import com.gingersoft.gsa.cloud.ui.adapter.BillMoneyAdapter;
 import com.gingersoft.gsa.cloud.ui.view.OrderPayView;
 import com.jess.arms.di.scope.ActivityScope;
 import com.jess.arms.http.imageloader.ImageLoader;
 import com.jess.arms.integration.AppManager;
 import com.jess.arms.utils.RxLifecycleUtils;
-import java.util.ArrayList;
 import java.util.List;
 import javax.inject.Inject;

--- a/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+++ b/table-module/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
@@ -42,7 +42,6 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
 import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
 import com.gingersoft.gsa.cloud.base.utils.VibratorUtils;
-import com.gingersoft.gsa.cloud.base.utils.encryption.Md5;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.database.bean.Food;
 import com.gingersoft.gsa.cloud.database.utils.ComboItemDaoUtils;
@@ -623,10 +622,10 @@ public class MealStandActivity extends BaseFragmentActivity<MealStandPresenter> 
    private List<SectionTextItem> getMemberInfoItem(MemberInfo memberInfo) {
        List<SectionTextItem> textItems = new ArrayList<>();
-        textItems.add(new SectionTextItem("會員號碼: " + memberInfo.getMemberNo()));
+//        textItems.add(new SectionTextItem("會員號碼: " + memberInfo.getMemberNo()));
-        textItems.add(new SectionTextItem("會員電話: " + memberInfo.getPhone()));
+//        textItems.add(new SectionTextItem("會員電話: " + memberInfo.getPhone()));
-        textItems.add(new SectionTextItem("會員名稱: " + memberInfo.getMemberName()));
+//        textItems.add(new SectionTextItem("會員名稱: " + memberInfo.getMemberName()));
-        textItems.add(new SectionTextItem("積分: " + memberInfo.getMemberPoint()));
+//        textItems.add(new SectionTextItem("積分: " + memberInfo.getMemberPoint()));
        return textItems;
    }