Merge branch 'master' into dev

# Conflicts:
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/presenter/orderManager/AllOrderPresenter.java
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/activity/orderManager/OrderDetailActivity.java

base-module/src/main/java/com/gingersoft/gsa/cloud/base/application/GsaCloudApplication.java

@@ -73,9 +73,13 @@ public class GsaCloudApplication extends BaseApplication {
      */
     public static boolean openSkinMake = false;
     /**
-     * 设置请求超时默认15秒钟
+     * okhttp连接超时15秒
      */
-    public static int REQUEST_TIMEOUT = 15;
+    public static int CONNECT_TIMEOUT = 15;
+    /**
+     * okhttp读写超时20秒
+     */
+    public static int REQUEST_TIMEOUT = 20;
 
     public static boolean isLogin = false;
     public static String userName = "";

base-module/src/main/java/com/gingersoft/gsa/cloud/database/greendao/ExpandInfoDao.java

@@ -3,13 +3,13 @@ package com.gingersoft.gsa.cloud.database.greendao;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteStatement;
 
-import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
-
 import org.greenrobot.greendao.AbstractDao;
 import org.greenrobot.greendao.Property;
+import org.greenrobot.greendao.internal.DaoConfig;
 import org.greenrobot.greendao.database.Database;
 import org.greenrobot.greendao.database.DatabaseStatement;
-import org.greenrobot.greendao.internal.DaoConfig;
+
+import com.gingersoft.gsa.cloud.database.bean.ExpandInfo;
 
 // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT.
 /** 

base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/applyOptions/MyOkhttpConfiguration.java

@@ -23,6 +23,7 @@ public class MyOkhttpConfiguration implements ClientModule.OkhttpConfiguration {
     @Override
     public void configOkhttp(Context context, OkHttpClient.Builder builder) {
 //        builder.sslSocketFactory(); //支持 Https,详情请百度
+        builder.connectTimeout(GsaCloudApplication.CONNECT_TIMEOUT, TimeUnit.SECONDS);
         builder.writeTimeout(GsaCloudApplication.REQUEST_TIMEOUT, TimeUnit.SECONDS);
         builder.readTimeout(GsaCloudApplication.REQUEST_TIMEOUT, TimeUnit.SECONDS);
         //使用一行代码监听 Retrofit／Okhttp 上传下载进度监听,以及 Glide 加载进度监听 详细使用方法查看 https://github.com/JessYanCoding/ProgressManager

base-module/src/main/java/com/gingersoft/gsa/cloud/globalconfig/lifecyclesOptioins/MyAppLifecycles.java

@@ -20,7 +20,7 @@ public class MyAppLifecycles implements AppLifecycles {
     @Override
     public void onCreate(Application application) {
 //        initTimber();
-        initLeakCanary(application);
+//        initLeakCanary(application);
         initFragmentation();
 //        initARouter(application);
     }

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

@@ -17,6 +17,10 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import androidx.annotation.ColorRes;
+import androidx.core.content.ContextCompat;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.epson.epos2.printer.Printer;
 import com.epson.epos2.printer.PrinterStatusInfo;

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));
         }
         OpenTableManage.getDefault().setTableBean(dataBean);
 

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

@@ -19,7 +19,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;
@@ -494,9 +494,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);
 
         List<PayMethod> payMethodList = getPayMethodList(orderDetailItem.getOrderPays());

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

@@ -5,9 +5,8 @@ import android.text.TextUtils;
 import android.view.View;
 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 +95,11 @@ 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));
+            if(!TextUtils.isEmpty(item.getCreateTime())) {
+                tv_open_time.setText(openTable + TimeUtils.getStringByFormat(new Date(item.getCreateTime()), TimeUtils.DEFAULT_DATE_FORMAT));
+            }
             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

@@ -11,7 +11,7 @@ import android.widget.TextView;
 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;
@@ -161,9 +161,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) {