不能ip打印問題，打印時間格式問題

9455d475 · 王宇航 · 0c0053e4 · 9455d475 · 9455d475 · 9455d475
Commit 9455d475 authored Feb 29, 2020 by 王宇航
6 changed files
--- a/print-module/src/main/res/layout/printer_item.xml
+++ b/print-module/src/main/res/layout/printer_item.xml
@@ -58,6 +58,7 @@
        android:id="@+id/tv_printer_edit"
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
+        android:layout_marginRight="@dimen/dp_10"
        android:text="編輯"
        android:textColor="@color/theme_color"
        android:textSize="@dimen/dp_14"

--- a/public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/PrintUtils.java
+++ b/public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/PrintUtils.java
@@ -160,7 +160,8 @@ public class PrintUtils {
        tableNum.setText(tableBean.getTableName());
        people.setText(OpenTableManage.getDefault().getPeopleNumber() + "");
-        orderData.setText(tableBean.getCreateTime());
+        orderData.setText(TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT));
        checkOutTime.setText(TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT));
@@ -233,8 +234,8 @@ public class PrintUtils {
        tableNum.setText(tableBean.getTableName());
        people.setText(OpenTableManage.getDefault().getPeopleNumber() + "");
-        orderData.setText(tableBean.getCreateTime());
+        orderData.setText(TimeUtils.getFormatTime(tableBean.getCreateTime(), TimeUtils.DEFAULT_DATE_FORMAT));
        checkOutTime.setText(TimeUtils.getCurrentTimeInString(TimeUtils.DEFAULT_DATE_FORMAT));
        FoodAdapter foodAdapter = new FoodAdapter(foodList);

--- a/public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/time/TimeUtils.java
+++ b/public-base/src/main/java/com/gingersoft/gsa/cloud/base/utils/time/TimeUtils.java
@@ -6,6 +6,9 @@ import java.util.Calendar;
 import java.util.Date;
 import java.util.GregorianCalendar;
 import java.util.Locale;
+import java.util.TimeZone;
+import timber.log.Timber;
 /**
 * @ClassName: TimeUtils
@@ -55,6 +58,9 @@ public class TimeUtils {
        throw new AssertionError();
    }
+    public static String getFormatTime(String time, SimpleDateFormat simpleDateFormat){
+        return simpleDateFormat.format(new Date(time));
+    }
    public static String getYesterdayTime(SimpleDateFormat simpleDateFormat) {
        Calendar calendar = Calendar.getInstance();
@@ -189,7 +195,6 @@ public class TimeUtils {
     * @return date
     */
    public static Date StrToDate(String str) {
        Date date = null;
        try {
            date = DEFAULT_DATE_FORMAT.parse(str);
@@ -407,4 +412,19 @@ public class TimeUtils {
        }
        return after;
    }
+    public static Date parseServerTime(String serverTime, String format) {
+        if (format == null || format.isEmpty()) {
+            format = "yyyy-MM-dd HH:mm:ss";
+        }
+        SimpleDateFormat sdf = new SimpleDateFormat(format, Locale.CHINESE);
+        sdf.setTimeZone(TimeZone.getTimeZone("GMT+8:00"));
+        Date date = null;
+        try {
+            date = sdf.parse(serverTime);
+        } catch (Exception e) {
+            Timber.e(e, "");
+        }
+        return date;
+    }
 }
--- a/public-base/src/main/res/layout/print_layout_print.xml
+++ b/public-base/src/main/res/layout/print_layout_print.xml
@@ -123,7 +123,6 @@
            style="@style/Print_text_style"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="日期："
            app:layout_constraintLeft_toLeftOf="parent"
            app:layout_constraintTop_toBottomOf="@id/tv_order_number_text" />

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/presenter/TablePresenter.java
@@ -4,28 +4,35 @@ import android.app.Application;
 import android.os.CountDownTimer;
 import android.view.View;
+import com.billy.cc.core.component.CC;
 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.OrderBean;
 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.JsonUtils;
-import com.gingersoft.gsa.cloud.database.bean.Food;
-import com.gingersoft.gsa.cloud.table.mvp.model.bean.BaseRespose;
 import com.gingersoft.gsa.cloud.database.bean.Function;
 import com.gingersoft.gsa.cloud.table.R;
 import com.gingersoft.gsa.cloud.table.app.GoldConstants;
-import com.gingersoft.gsa.cloud.base.common.bean.TableBean;
 import com.gingersoft.gsa.cloud.table.app.TableOperatTypeConstant;
+import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
+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.ui.activity.TableActivity;
 import com.gingersoft.gsa.cloud.table.mvp.ui.adapter.BottomFunctionAdapter;
 import com.jess.arms.base.DefaultAdapter;
-import com.jess.arms.integration.AppManager;
 import com.jess.arms.di.scope.ActivityScope;
-import com.jess.arms.mvp.BasePresenter;
 import com.jess.arms.http.imageloader.ImageLoader;
+import com.jess.arms.integration.AppManager;
+import com.jess.arms.mvp.BasePresenter;
+import com.jess.arms.utils.RxLifecycleUtils;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
+import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
+import java.util.ArrayList;
+import java.util.List;
+import javax.inject.Inject;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.annotations.NonNull;
@@ -36,17 +43,6 @@ import me.jessyan.rxerrorhandler.handler.ErrorHandleSubscriber;
 import okhttp3.FormBody;
 import okhttp3.RequestBody;
-import javax.inject.Inject;
-import com.gingersoft.gsa.cloud.table.mvp.contract.TableContract;
-import com.jess.arms.utils.ArmsUtils;
-import com.jess.arms.utils.RxLifecycleUtils;
-import com.qmuiteam.qmui.widget.dialog.QMUIDialog;
-import com.qmuiteam.qmui.widget.dialog.QMUIDialogAction;
-import java.util.ArrayList;
-import java.util.List;
 /**
 * ================================================
@@ -146,6 +142,18 @@ public class TablePresenter extends BasePresenter<TableContract.Model, TableCont
                    mRootView.setCurrentOperatType(TableOperatTypeConstant.move_table_4);
                    return;
                }
+                if (mBottomFunctionList.get(position).getResName().equals("上菜紙")) {
+                    CC.obtainBuilder("Component.Print")
+                            .setActionName("printActivity")
+                            .addParam("type", 0)
+                            .build()
+                            .callAsync((cc, result) -> {
+                                if (result.isSuccess()) {
+                                    //打印成功
+                                }
+                            });
+                    return;
+                }
 //                if (mBottomFunctionList.get(position).getResName().equals("↑")) {
 //                    mBottomFunctionList.add(new Function((long) 5, 1, 2025, "skyorder", "", ""));
 //                    mBottomFunctionList.add(new Function((long) 6, 1, 2025, "上菜紙", "", ""));

--- a/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
+++ b/table-mode/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/activity/MealStandActivity.java
@@ -28,6 +28,7 @@ import com.gingersoft.gsa.cloud.base.common.bean.mealManage.OpenTableManage;
 import com.gingersoft.gsa.cloud.base.utils.VibratorUtils;
 import com.gingersoft.gsa.cloud.base.utils.constans.Constans;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
+import com.gingersoft.gsa.cloud.base.utils.time.TimeUtils;
 import com.gingersoft.gsa.cloud.base.utils.view.ViewUtils;
 import com.gingersoft.gsa.cloud.base.widget.DialogUtils;
 import com.gingersoft.gsa.cloud.database.bean.Food;
@@ -282,6 +283,10 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
                return;
            mPresenter.toFindMeal(inputText);
        });
+        TableBean.DataBean tableBean = OpenTableManage.getDefault().getTableBean();
+        String time = TimeUtils.DEFAULT_DATE_FORMAT.format(tableBean.getCreateTime());
+        int x = 0;
    }
    @Override
@@ -974,7 +979,7 @@ public class MealStandActivity extends BaseActivity<MealStandPresenter> implemen
                        dialog.dismiss();
                    });
                    hepler.setViewClick(R.id.internet_print, v -> {
-                        SPUtils.put(mContext, Constans.DEFAULT_PRINT_METHOD, Constans.LOCAL_PRINT);
+                        SPUtils.put(mContext, Constans.DEFAULT_PRINT_METHOD, Constans.IP_PRINT);
                        dialog.dismiss();
                    });
                }