Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
#	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
#	table-module/src/main/java/com/gingersoft/gsa/cloud/bean/mvp/ui/adapter/OrderCenterAdapter.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/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;