9.29 1、編譯通過合併

Signed-off-by: Wyh <1239658231>

base-module/src/main/java/com/gingersoft/gsa/cloud/constans/UserConstans.java

@@ -24,6 +24,6 @@ public class UserConstans {
     /**當前賬號下所有餐檯品牌Json*/
     public static String brandRestaurantInfos = "brand_restaurant_infos";
 
-    //平板登录状态
+    //平闆登录状态
     public static String FLATBED_LOGIN_STATUS = "flatbed_login_status";
 }

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/LanguageActivity.java

@@ -62,7 +62,7 @@ public class LanguageActivity extends BaseActivity<LanguagePresenter> implements
     /**
      * 系統類型
      * 0：gsa
-     * 1：gsa（平板）
+     * 1：gsa（平闆）
      */
     private int systemType = 0;
 

main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/view/SlidingMenu.java

@@ -2,7 +2,6 @@ package com.gingersoft.gsa.cloud.main.mvp.ui.view;
 
 import android.content.Context;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewGroup;
@@ -16,7 +15,7 @@ import com.nineoldandroids.view.ViewHelper;
 import static com.qmuiteam.qmui.util.QMUIDisplayHelper.dp2px;
 
 /**
- * des ：SlidingMenu 侧边栏 侧滑菜单
+ * des ：SlidingMenu 側邊欄側滑菜單
  */
 public class SlidingMenu extends HorizontalScrollView {
     private int mScreenWidth;
@@ -52,7 +51,7 @@ public class SlidingMenu extends HorizontalScrollView {
     @Override
     protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
         /**
-         * 显示设置一个宽度
+         * 顯示設置一個寬度
          */
         if (!once) {
             LinearLayout wrapper = (LinearLayout) getChildAt(0);
@@ -125,7 +124,7 @@ public class SlidingMenu extends HorizontalScrollView {
     }
 
     /**
-     * 打开菜单
+     * 打開菜單
      */
     public void openMenu() {
         if (isOpen)
@@ -136,7 +135,7 @@ public class SlidingMenu extends HorizontalScrollView {
     }
 
     /**
-     * 关闭菜单
+     * 關閉菜單
      */
     public void closeMenu() {
         if (isOpen) {

print-module/src/main/java/com/joe/print/mvp/print/PrintBill.java

@@ -36,6 +36,11 @@ public class PrintBill extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return RestaurantExpandInfoUtils.getValue(ExpandConstant.TableModeClosingPC,1);
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintCleanMachine.java

@@ -27,6 +27,11 @@ public class PrintCleanMachine extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return 1;
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintInstruction.java

@@ -19,6 +19,11 @@ public class PrintInstruction extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return 0;
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintKitchen.java

@@ -127,6 +127,11 @@ public class PrintKitchen extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return 1;
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrder.java

@@ -61,6 +61,11 @@ public class PrintOtherOrder extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return RestaurantExpandInfoUtils.getValue(ExpandConstant.DeliveryPrintCount,1);
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintOtherOrderClosing.java

@@ -47,6 +47,11 @@ public class PrintOtherOrderClosing extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return RestaurantExpandInfoUtils.getValue(ExpandConstant.DeliveryClosingPC,1);
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintPrjKitchen.java

@@ -61,6 +61,11 @@ public class PrintPrjKitchen extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return 1;
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintServe.java

@@ -40,6 +40,11 @@ public class PrintServe extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return 1;
     }

print-module/src/main/java/com/joe/print/mvp/print/PrintSlip.java

@@ -4,6 +4,8 @@ import android.content.Context;
 import android.graphics.Bitmap;
 import android.view.Gravity;
 import android.widget.LinearLayout;
+
+import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.base.common.bean.BillingBean;
 import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
 import com.gingersoft.gsa.cloud.base.order.bean.OrderDetail;
@@ -15,6 +17,7 @@ import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.constans.ExpandConstant;
 import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
 import com.joe.print.R;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -43,8 +46,73 @@ public class PrintSlip extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        List<OrderDetail> foodList = MyOrderManage.getInstance().getOrderFoodList();
+        if (foodList == null || foodList.size() <= 0) {
+            return null;
+        }
+        TableBean.DataBean tableBean = OpenTableManage.getDefault().getTableBean();
+
+        StringBuilder stringBuilder = new StringBuilder();
+        stringBuilder.append("<html><body>");
+        stringBuilder.append(getPLable(GsaCloudApplication.getBrandName()))
+                .append(getPLable(GsaCloudApplication.getRestaurantName()))
+                .append(getLineLable())
+                .append(getPLable("餐檯：" + tableBean.getTableName()))
+                .append(getPLable("人數：" + OpenTableManage.getDefault().getPeopleNumber()))
+                .append(getPLable("單號：" + MyOrderManage.getInstance().getOrderId()))
+                .append(getPLable("日期：" + TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT)))
+                .append(getLineLable())
+                .append("<p>\n" +
+                        "<div align=\"left\">Item 1 - WisePOS</div>\n" +
+                        "<div align=\"right\">$999</div>\n" +
+                        "<div align=\"left\">Item 2 - Printer</div>\n" +
+                        "<div align=\"right\">$299</div>\n" +
+                        "<div align=\"left\">Item 3 - Cup</div>\n" +
+                        "<div align=\"right\">$78</div> \n" +
+                        "<div align=\"left\">Item 4 - Data SIM</div>\n" +
+                        "<div align=\"right\">$99</div> \n" +
+                        "<div align=\"right\">____________</div>\n" +
+                        "<div align=\"right\">Total: $XXX</div>\n" +
+                        "</p>");
+        stringBuilder.append("</body></html>");
+
+
+//<h1>Heading 1</h1><br/>
+//<h2>Heading 2</h2><br/>
+//<h3>Heading 3</h3><br/>
+//<h4>Heading 4</h4><br/>
+//<p align="right">Right</p><div align="center">Center</div>
+//<p align="left">Left</p><br/>
+//<img src="https%3A%2F%2Fmedia.licdn.com%2Fdms%2Fimage%2FC510BAQFnb_2T7cLREw%2Fcomp
+//        any-logo_200_200%2F0%3Fe%3D2159024400%26v%3Dbeta%26t%3De21PjbFv5en9quafFnWxkwWiJh
+//        3aAFqZHJJsoE81ggk"></img><br/>
+//                <ol start="10">
+//<li>A</li>
+//<li>B</li>
+//</ol>
+//<ul>
+//<li>A</li>
+//<li>B</li>
+//</ul>
+        return null;
+    }
+
+//    private String getDiv(String content, String location) {
+//
+//    }
+
+    private String getLineLable() {
+        return "<br/>";
+    }
+
+    private String getPLable(String content) {
+        return "<p>" + content + "</p>";
+    }
+
+    @Override
     public int getPrintCount(Context context) {
-        return RestaurantExpandInfoUtils.getValue(ExpandConstant.TableModePrintCount,1);
+        return RestaurantExpandInfoUtils.getValue(ExpandConstant.TableModePrintCount, 1);
     }
 
     private Bitmap getBitmap(Context mContext, PrinterDeviceBean printerDeviceBean) {

print-module/src/main/java/com/joe/print/mvp/print/PrintTest.java

@@ -34,6 +34,11 @@ public class PrintTest extends PrinterRoot {
     }
 
     @Override
+    public String getPrintData(Context mContext, PrinterDeviceBean deviceBean) {
+        return null;
+    }
+
+    @Override
     public int getPrintCount(Context context) {
         return 1;
     }

print-module/src/main/java/com/joe/print/mvp/print/PrinterRoot.java

@@ -178,6 +178,12 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
     public abstract Map<String, List<Bitmap>> getPrintBitmap(Context mContext, PrinterDeviceBean deviceBean);
 
     /**
+     * 獲取打印內容
+     * @return BBPOS是HTMl格式
+     */
+    public abstract String getPrintData(Context mContext, PrinterDeviceBean deviceBean);
+
+    /**
      * 獲取打印次數
      *
      * @param context
@@ -376,7 +382,7 @@ public abstract class PrinterRoot implements PrintSocketHolder.OnStateChangedLis
     /**
      * ip設備打印
      */
-    public void ipDevicePrint(PrinterDeviceBean
+    private void ipDevicePrint(PrinterDeviceBean
                                       printerDeviceBean, List<Bitmap> bitmaps, PrintSocketHolder.OnStateChangedListener
                                       stateChangedListener, PrintExecutor.OnPrintResultListener resultListener) {
         //獲取打印機機型，如果是EPSON的打印機，調用EPSON的打印方法

print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -229,32 +230,34 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
 //            if (defaultPrint.getPrinterDeviceType() == 2 && PrintConstans.PRINT_MODEL_WISEPOS.contains(Build.MODEL)) {
 //                //本機打印並且是BBPOS
 //
-//            }
-
-            //獲得對應的圖片
-            Map<String, List<Bitmap>> listMap = printerInIt.getPrintBitmapByCount(mContext, defaultPrint);
-            if (listMap != null) {
-                List<Bitmap> zoomBitmaps = listMap.get("");
-                if (zoomBitmaps != null && zoomBitmaps.size() > 0) {
-                    if (defaultPrint.getPrinterDeviceType() == 1) {
-                        //IP打印
-                        printerInIt.ipDevicePrint(defaultPrint, zoomBitmaps);
-                    } else if (defaultPrint.getPrinterDeviceType() == 2) {
-                        //本地N5或Sunmi打印
-                        printerInIt.locationPrint(zoomBitmaps, this);
-                    } else if (defaultPrint.getPrinterDeviceType() == 3) {
-                        //USB打印打印
-                        printerInIt.usbPrint(mContext, zoomBitmaps);
+//
+//
+//            } else {
+                //獲得對應的圖片
+                Map<String, List<Bitmap>> listMap = printerInIt.getPrintBitmapByCount(mContext, defaultPrint);
+                if (listMap != null) {
+                    List<Bitmap> zoomBitmaps = listMap.get("");
+                    if (zoomBitmaps != null && zoomBitmaps.size() > 0) {
+                        if (defaultPrint.getPrinterDeviceType() == 1) {
+                            //IP打印
+                            printerInIt.ipDevicePrint(defaultPrint, zoomBitmaps);
+                        } else if (defaultPrint.getPrinterDeviceType() == 2) {
+                            //本地N5或Sunmi打印
+                            printerInIt.locationPrint(zoomBitmaps, this);
+                        } else if (defaultPrint.getPrinterDeviceType() == 3) {
+                            //USB打印打印
+                            printerInIt.usbPrint(mContext, zoomBitmaps);
+                        } else {
+                            printFile("未找到對應的打印類型");
+                        }
                     } else {
-                        printFile("未找到對應的打印類型");
+                        //打印失敗
+                        printFile("打印失敗，生成打印數據失敗");
                     }
                 } else {
-                    //打印失敗
-                    printFile("打印失敗，生成打印數據失敗");
+                    printFile("打印失敗，打印次數為0");
                 }
-            } else {
-                printFile("打印失敗，打印次數為0");
-            }
+//            }
         }
     }
 

print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintTestActivity.java

@@ -9,6 +9,9 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.epson.epos2.printer.Printer;
 import com.epson.epos2.printer.PrinterStatusInfo;
 import com.epson.epos2.printer.ReceiveListener;
+import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
+import com.gingersoft.gsa.cloud.base.utils.okhttpUtils.OkHttp3Utils;
+import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.base.utils.toast.ToastUtils;
 import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
 import com.gingersoft.gsa.cloud.print.PrintExecutor;
@@ -22,10 +25,12 @@ import com.joe.print.mvp.print.usb.UsbPrinterFinder;
 
 import java.util.List;
 
+import io.reactivex.Observer;
+import io.reactivex.disposables.Disposable;
+
 public class PrintTestActivity extends AppCompatActivity implements PrintSocketHolder.OnStateChangedListener, PrintExecutor.OnPrintResultListener, ReceiveListener {
 
-    private int lineLength = 24;//一行42個
-    private int LEFT_TEXT_LENGTH = 8;
+    private int lineLength = 42;//一行42個
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -35,13 +40,57 @@ public class PrintTestActivity extends AppCompatActivity implements PrintSocketH
         UsbPrinterFinder printerFinder = new UsbPrinterFinder(this, printerFinderCallback);
         printerFinder.startFinder();
 
-
         findViewById(R.id.btn_test).setOnClickListener(view -> {
             //打印測試
+            String stringBuilder = "<html><body>" +
+                    getPLable(GsaCloudApplication.getBrandName()) +
+                    getPLable(GsaCloudApplication.getRestaurantName()) +
+                    getLineLable() +
+                    getPLable("餐檯：" + "111") +
+                    getPLable("人數：23") +
+                    getPLable("123456789123456789123456789123456789123456789") +
+                    getPLable("日期：" + TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT)) +
+                    getLineLable() +
+//                    getPLable(getDiv("牛油燒翠玉瓜", 0)) +
+                    "</body></html>";
+            OkHttp3Utils.get("http://localhost:8080/pos?transact ionType=PRINT&isExternal=false&apiVersion=21&printData=" + stringBuilder).subscribe(new Observer<String>() {
+                @Override
+                public void onSubscribe(Disposable d) {
+
+                }
+
+                @Override
+                public void onNext(String s) {
+                    Log.e("eee", "打印內容：" + s);
+                }
+
+                @Override
+                public void onError(Throwable e) {
+
+                }
+
+                @Override
+                public void onComplete() {
+
+                }
+            });
         });
     }
 
 
+
+//    private String getDiv(String foodName, String foodNum, String price) {
+//
+//    }
+
+    private String getLineLable() {
+        return "<br/>";
+    }
+
+    private String getPLable(String content) {
+        return "<p>" + content + "</p>";
+    }
+
     @Override
     public void onResult(int errorCode, PrinterDeviceBean printerDeviceBean) {
         if (errorCode == 0) {

print-module/src/main/res/layout/activity_print_test.xml

@@ -15,7 +15,7 @@
         android:layout_height="@dimen/dp_50"
         android:layout_marginTop="@dimen/dp_20"
         android:text="192.168.1.203"
-        android:hint="请输入IP地址" />
+        android:hint="請輸入IP地址" />
 
     <Button
         android:id="@+id/btn_test"

qm-qmui/src/main/java/com/qmuiteam/qmui/util/QMUIDeviceHelper.java

@@ -24,9 +24,10 @@ import android.content.res.Configuration;
 import android.os.Binder;
 import android.os.Build;
 import android.os.Environment;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
 
+import androidx.annotation.Nullable;
+
 import com.qmuiteam.qmui.QMUILog;
 
 import java.io.File;
@@ -91,7 +92,7 @@ public class QMUIDeviceHelper {
     }
 
     /**
-     * 判断是否为平板设备
+     * 判断是否为平闆设备
      */
     public static boolean isTablet(Context context) {
         if (sIsTabletChecked) {

qm-qmui/src/main/java/com/qmuiteam/qmui/util/QMUIStatusBarHelper.java

@@ -21,13 +21,14 @@ import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
 import android.os.Build;
-import androidx.annotation.ColorInt;
-import androidx.annotation.IntDef;
-import androidx.core.view.ViewCompat;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntDef;
+import androidx.core.view.ViewCompat;
+
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.reflect.Field;
@@ -453,7 +454,7 @@ public class QMUIStatusBarHelper {
         }
         if (QMUIDeviceHelper.isTablet(context)
                 && sStatusbarHeight > QMUIDisplayHelper.dp2px(context, STATUS_BAR_DEFAULT_HEIGHT_DP)) {
-            //状态栏高度大于25dp的平板，状态栏通常在下方
+            //状态栏高度大于25dp的平闆，状态栏通常在下方
             sStatusbarHeight = 0;
         } else {
             if (sStatusbarHeight <= 0) {

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/orderManager/AllOrderPresenter.java

@@ -16,7 +16,7 @@ import com.gingersoft.gsa.cloud.base.order.bean.mealManger.MyOrderManage;
 import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
 import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
+import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.bean.R;
 import com.gingersoft.gsa.cloud.bean.mvp.contract.AllOrderContract;
 import com.gingersoft.gsa.cloud.bean.mvp.model.bean.OrderDetailItem;
@@ -183,7 +183,7 @@ public class AllOrderPresenter extends BasePresenter<AllOrderContract.Model, All
         TableBean.DataBean dataBean = new TableBean.DataBean();
         dataBean.setTableName(orderDetailItem.getTableName());
         if(!TextUtils.isEmpty(orderDetailItem.getCreateTime())) {
-            dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
+            dataBean.setCreateTime(TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
         }
         OpenTableManage.getDefault().setTableBean(dataBean);
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/activity/orderManager/OrderDetailActivity.java

@@ -8,6 +8,13 @@ import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.ScrollView;
 import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.billy.cc.core.component.CC;
 import com.gingersoft.gsa.cloud.base.common.bean.PayMethod;
 import com.gingersoft.gsa.cloud.base.order.bean.BillOrderMoney;
@@ -19,7 +26,7 @@ import com.gingersoft.gsa.cloud.base.order.bean.mealManger.OpenTableManage;
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
 import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
 import com.gingersoft.gsa.cloud.base.utils.MoneyUtil;
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
+import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.bean.R;
 import com.gingersoft.gsa.cloud.bean.R2;
 import com.gingersoft.gsa.cloud.bean.di.component.DaggerOrderDetailComponent;
@@ -45,11 +52,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
 import butterknife.OnClick;
 
@@ -166,9 +168,9 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
             String pax = LanguageUtils.get_language_system(this, "Meal.Mannumber", "人數") + "：";
             String openTable = LanguageUtils.get_language_system(this, "open.table", "開台") + "：";
             tv_people_num.setText(pax + orderDetailItem.getPerson());
-            tv_open_time.setText(openTable + TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
+            tv_open_time.setText(openTable + TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
             if (!TextUtils.isEmpty(orderDetailItem.getEndTime())) {
-                tv_pay_time.setText(payBill + TimeUtil.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtil.dateFormatYMDHM));
+                tv_pay_time.setText(payBill + TimeUtils.getStringByFormat(new Date(orderDetailItem.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
             }
             tv_total_money.setText("$" + orderDetailItem.getTotalAmount());
 
@@ -495,7 +497,7 @@ public class OrderDetailActivity extends BaseActivity<OrderDetailPresenter> impl
         TableBean.DataBean dataBean = new TableBean.DataBean();
         dataBean.setTableName(orderDetailItem.getTableName());
         if(!TextUtils.isEmpty(orderDetailItem.getCreateTime())){
-            dataBean.setCreateTime(TimeUtil.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtil.dateFormatYMDHM));
+            dataBean.setCreateTime(TimeUtils.getStringByFormat(new Date(orderDetailItem.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
         }
         OpenTableManage.getDefault().setTableBean(dataBean);
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/adapter/OrderCenterAdapter.java

@@ -7,7 +7,7 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.gingersoft.gsa.cloud.base.utils.LanguageUtils;
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
+import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.bean.R;
 import com.gingersoft.gsa.cloud.bean.R2;
 import com.gingersoft.gsa.cloud.bean.mvp.model.bean.OrderDetailItem;
@@ -96,9 +96,9 @@ public class OrderCenterAdapter extends DefaultAdapter<OrderDetailItem> {
             String amount = LanguageUtils.get_language_system(mContext, "amount", "金額") + "：$";
 
             tv_people_num.setText(pax + item.getPerson());
-            tv_open_time.setText(openTable + TimeUtil.getStringByFormat(new Date(item.getCreateTime()), TimeUtil.dateFormatYMDHM));
+            tv_open_time.setText(openTable + TimeUtils.getStringByFormat(new Date(item.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
             if (!TextUtils.isEmpty(item.getEndTime())) {
-                tv_pay_time.setText(payTable + TimeUtil.getStringByFormat(new Date(item.getEndTime()), TimeUtil.dateFormatYMDHM));
+                tv_pay_time.setText(payTable + TimeUtils.getStringByFormat(new Date(item.getEndTime()), TimeUtils.DEFAULT_DATE_FORMAT_YMDHM));
             }
             tv_pay_money.setText(amount + item.getTotalAmount());
 

table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/adapter/TableAdapter.java

@@ -8,10 +8,13 @@ import android.view.View;
 import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
+
+import androidx.core.content.ContextCompat;
+
 import com.gingersoft.gsa.cloud.base.table.bean.TableBean;
 import com.gingersoft.gsa.cloud.base.table.bean.TableItem;
 import com.gingersoft.gsa.cloud.base.utils.log.LogUtil;
-import com.gingersoft.gsa.cloud.base.utils.time.TimeUtil;
+import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.bean.R;
 import com.gingersoft.gsa.cloud.bean.R2;
 import com.gingersoft.gsa.cloud.ui.view.TriangleLabelView;
@@ -24,7 +27,6 @@ import com.qmuiteam.qmui.util.QMUIDisplayHelper;
 import java.util.Date;
 import java.util.List;
 
-import androidx.core.content.ContextCompat;
 import butterknife.BindView;
 
 /**
@@ -161,9 +163,9 @@ public class TableAdapter extends DefaultAdapter<TableBean.DataBean> {
                 if (!TextUtils.isEmpty(createDate) && createDate.startsWith("Jul")) {
                     LogUtil.d(TAG, "tableName: " + item.getTableName() + "  " + "createDate: " + createDate);
                     Date date = new Date(createDate);
-                    String createTime = TimeUtil.getStringByFormat(date, TimeUtil.dateFormatYMDHMS);
-                    String currentTime = TimeUtil.getStringByFormat(System.currentTimeMillis(), TimeUtil.dateFormatYMDHMS);
-                    long[] difference = TimeUtil.getDistanceTimes2(createTime, currentTime);
+                    String createTime = TimeUtils.getStringByFormat(date, TimeUtils.DEFAULT_DATE_FORMAT);
+                    String currentTime = TimeUtils.getStringByFormat(System.currentTimeMillis(), TimeUtils.DEFAULT_DATE_FORMAT);
+                    long[] difference = TimeUtils.getDistanceTimes2(createTime, currentTime);
                     if (difference[0] != 0) {
                         tv_open_duration.setText(difference[0] + ":" + difference[1] + ":" + difference[2]);
                     } else if (difference[1] != 0) {

table-module/src/main/res/values/strings.xml

@@ -58,7 +58,7 @@
     <string name="customernumber">人數</string>
     <string name="opentabeexists">此台已被開台，是否進入點單？</string>
     <string name="standmode">一般模式</string>
-    <string name="detailmode">细微模式</string>
+    <string name="detailmode">細微模式</string>
     <string name="malnumber">請選擇按鍵錄入數量</string>
     <string name="please_input_table_number">請輸入檯號</string>
     <string name="please_input_cancel_number">請輸入取消數量</string>
@@ -77,7 +77,7 @@
     <string name="remove">刪除</string>
     <string name="end">完成</string>
     <string name="Vertical">豎向</string>
-    <string name="Horizontal">横向</string>
+    <string name="Horizontal">橫向</string>
     <string name="shottableDirection">檯桌顯示方向</string>
     <string name="deleteExistsOrderdetail">取消</string>
     <string name="deleteExistsOrderdetail_ok">確認删除</string>