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

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/crash/AppCrashHandler.java

@@ -11,6 +11,7 @@ import android.widget.Toast;
 
 
 import com.elvishew.xlog.XLog;
 import com.elvishew.xlog.XLog;
 import com.gingersoft.gsa.cloud.base.Api;
 import com.gingersoft.gsa.cloud.base.Api;
+import com.gingersoft.gsa.cloud.base.BuildConfig;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 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.BaseResult;
 import com.gingersoft.gsa.cloud.base.utils.FileUtils;
 import com.gingersoft.gsa.cloud.base.utils.FileUtils;
@@ -41,6 +42,8 @@ import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import io.reactivex.schedulers.Schedulers;
 
 
+import static com.gingersoft.gsa.cloud.constans.AppConstans.RP_ERROR;
+
 public class AppCrashHandler implements UncaughtExceptionHandler {
 public class AppCrashHandler implements UncaughtExceptionHandler {
     /**
     /**
      * Debug Log tag
      * Debug Log tag
@@ -141,12 +144,27 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
         if (ex == null) {
         if (ex == null) {
             return false;
             return false;
         }
         }
+
         //使用Toast来显示异常信息
         //使用Toast来显示异常信息
         new Thread() {
         new Thread() {
             @Override
             @Override
             public void run() {
             public void run() {
                 Looper.prepare();
                 Looper.prepare();
-                Toast.makeText(mContext, ErrorStr, Toast.LENGTH_LONG).show();
+                String showText = ErrorStr;
+                Throwable cause = ex.getCause();
+                if (cause != null && BuildConfig.DEBUG) {
+                    StackTraceElement[] stackTrace = cause.getStackTrace();
+                    if (stackTrace != null && stackTrace.length > 0) {
+                        String causeName = cause.getClass().getSimpleName();
+
+                        String fileName = stackTrace[0].getFileName();
+                        fileName = fileName.substring(0, fileName.length() - 4);
+                        int lineNumber = stackTrace[0].getLineNumber();
+                        showText += "-" + fileName + "-" + lineNumber + "-" + causeName;
+                        OkHttp3Utils.noticePersonnel(RP_ERROR, showText);
+                    }
+                }
+                Toast.makeText(mContext, showText, Toast.LENGTH_LONG).show();
                 Looper.loop();
                 Looper.loop();
             }
             }
         }.start();
         }.start();
@@ -201,7 +219,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
 
 
                         @Override
                         @Override
                         public void onNext(String data) {
                         public void onNext(String data) {
-                            if(!TextUtils.isEmpty(data)){
+                            if (!TextUtils.isEmpty(data)) {
                                 BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
                                 BaseResult result = JsonUtils.parseObject(data, BaseResult.class);
                                 if (result != null && result.isSuccess()) {
                                 if (result != null && result.isSuccess()) {
                                     //上傳成功后刪除對應文件
                                     //上傳成功后刪除對應文件

base-module/src/main/java/com/gingersoft/gsa/cloud/base/utils/time/TimePickerUtils.java

@@ -119,6 +119,7 @@ public class TimePickerUtils {
                 .setTitleColor(Color.BLACK)//标题文字颜色
                 .setTitleColor(Color.BLACK)//标题文字颜色
                 .setSubmitColor(Color.BLUE)//确定按钮文字颜色
                 .setSubmitColor(Color.BLUE)//确定按钮文字颜色
                 .setCancelColor(Color.BLUE)//取消按钮文字颜色
                 .setCancelColor(Color.BLUE)//取消按钮文字颜色
+                .setDate(defaultTime)
                 .setRangDate(Calendar.getInstance(), endTime)//限制時間範圍
                 .setRangDate(Calendar.getInstance(), endTime)//限制時間範圍
                 .setLabel("", "", "", "", "", "")
                 .setLabel("", "", "", "", "", "")
                 .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。
                 .isCenterLabel(false) //是否只显示中间选中项的label文字，false则每项item全部都带有label。

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

@@ -10,7 +10,8 @@ public class AppConstans {
     public static final String RP_THIRE_LOGISTICS_ERROR = "RP_WL003";//第三方物流接口錯誤碼
     public static final String RP_THIRE_LOGISTICS_ERROR = "RP_WL003";//第三方物流接口錯誤碼
     public static final String RP_UPDATE_ORDER_STATE_ERROR = "RP_UO004";//修改訂單狀態失敗錯誤碼
     public static final String RP_UPDATE_ORDER_STATE_ERROR = "RP_UO004";//修改訂單狀態失敗錯誤碼
     public static final String RP_LOGIN_ERROR = "RP_LOGIN";//登陸報錯錯誤碼
     public static final String RP_LOGIN_ERROR = "RP_LOGIN";//登陸報錯錯誤碼
-    public static final String RP_REPRINT_CODE = "RP_REPRINT_CODE";//登陸報錯錯誤碼
+    public static final String RP_REPRINT_CODE = "RP_REPRINT_CODE";//重印推送
+    public static final String RP_ERROR = "RP_ERROR";//全局報錯錯誤碼
 
 
 
 
     public static final String SECRETKEY_VALUES = "2309485937845783";
     public static final String SECRETKEY_VALUES = "2309485937845783";
@@ -27,5 +28,5 @@ public class AppConstans {
     /**語言下標*/
     /**語言下標*/
     public static final String LANGUAGE_INDEX = "language_index";
     public static final String LANGUAGE_INDEX = "language_index";
 
 
-
+    //4個四通，四條腿
 }
 }

base-module/src/main/java/com/gingersoft/gsa/cloud/ui/view/timeselect/WheelTime.java

@@ -700,8 +700,8 @@ public class WheelTime {
                 sb.append((wv_year.getCurrentItem() + startYear)).append("-")
                 sb.append((wv_year.getCurrentItem() + startYear)).append("-")
                         .append((wv_month.getCurrentItem() + startMonth)).append("-")
                         .append((wv_month.getCurrentItem() + startMonth)).append("-")
                         .append((wv_day.getCurrentItem() + startDay)).append(" ")
                         .append((wv_day.getCurrentItem() + startDay)).append(" ")
-                        .append(wv_hours.getCurrentItem()).append(":")
-                        .append(wv_minutes.getCurrentItem()).append(":")
+                        .append(wv_hours.getCurrentItem() + startHour).append(":")
+                        .append(wv_minutes.getCurrentItem() + startMin).append(":")
                         .append(wv_seconds.getCurrentItem());
                         .append(wv_seconds.getCurrentItem());
             } else {
             } else {
                 sb.append((wv_year.getCurrentItem() + startYear)).append("-")
                 sb.append((wv_year.getCurrentItem() + startYear)).append("-")

delivery_pick_module/src/main/java/com/gingersoft/gsa/delivery_pick_mode/mvp/ui/activity/PrjQueryActivity.java

@@ -221,6 +221,11 @@ public class PrjQueryActivity extends BaseActivity<PrjQueryPresenter> implements
     }
     }
 
 
     private void printPrj(List<PrjBean.DataBean.Bean> printDatas) {
     private void printPrj(List<PrjBean.DataBean.Bean> printDatas) {
+        for (int i = 0; i < printDatas.size(); i++) {
+            printDatas.get(i).setTotalPrj(printDatas.size());
+            printDatas.get(i).setCurrentIndex(i);
+        }
+
         CC.obtainBuilder("Component.Print")
         CC.obtainBuilder("Component.Print")
                 .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN)
                 .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_KITCHEN)
                 .addParam("prjBeans", printDatas)
                 .addParam("prjBeans", printDatas)

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

@@ -53,6 +53,7 @@ import com.joe.print.mvp.ui.adapter.DialogPrinterListAdapter;
 import com.joe.print.mvp.ui.adapter.PrintProgressAdapter;
 import com.joe.print.mvp.ui.adapter.PrintProgressAdapter;
 import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
 import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
 
 
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -170,7 +171,18 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
 //            List<PrjBean.DataBean.Bean> printDatas = (List<PrjBean.DataBean.Bean>) getIntent().getSerializableExtra("prjBeans");
 //            List<PrjBean.DataBean.Bean> printDatas = (List<PrjBean.DataBean.Bean>) getIntent().getSerializableExtra("prjBeans");
             List<PrjBean.DataBean.Bean> printDatas = CCUtil.getNavigateParam(this, "prjBeans", null);
             List<PrjBean.DataBean.Bean> printDatas = CCUtil.getNavigateParam(this, "prjBeans", null);
             Map<String, List<PrjBean.DataBean.Bean>> prjMap = PrintPrjKitchen.getPrjMap();
             Map<String, List<PrjBean.DataBean.Bean>> prjMap = PrintPrjKitchen.getPrjMap();
-            prjMap.put("", printDatas);
+
+            for (PrjBean.DataBean.Bean prjBean : printDatas) {
+                if (prjMap.containsKey(prjBean.getPrintPosition())) {
+                    List<PrjBean.DataBean.Bean> beans = prjMap.get(prjBean.getPrintPosition());
+                    if (beans != null) {
+                        beans.add(prjBean);
+                    }
+                } else {
+                    prjMap.put(prjBean.getPrintPosition(), Collections.singletonList(prjBean));
+                }
+            }
+//            prjMap.put("", printDatas);
         }
         }
 
 
         if (defaultPrint == null) {
         if (defaultPrint == null) {