9.05 打印食品文字問題

Signed-off-by: Wyh <1239658231>

9.05 打印食品文字問題
Signed-off-by: Wyh <1239658231>
84550b77 · Wyh · fa8153f6 · 84550b77 · 84550b77 · 84550b77
Commit 84550b77 authored Sep 05, 2020 by Wyh
9 changed files
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/base/Api.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/base/Api.java
@@ -32,6 +32,4 @@ public interface Api {
    String printerDevice_list = "printerDevice/list";
    //日誌上傳
    String upload_app_log = "public/cloud/gsa/upload";
 }
--- a/base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/LoadingDialog.java
+++ b/base-module/src/main/java/com/gingersoft/gsa/cloud/ui/widget/dialog/LoadingDialog.java
@@ -43,10 +43,13 @@ public class LoadingDialog {
            mLoadingDialog = new Dialog(context, R.style.ui_loading_dialog);
        }
        //不設置會有黑邊
-        Window window = mLoadingDialog.getWindow();
+        try {
-        window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            Window window = mLoadingDialog.getWindow();
-        window.getDecorView().setBackgroundResource(android.R.color.transparent);
+            window.setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+            window.getDecorView().setBackgroundResource(android.R.color.transparent);
+        } catch (IllegalArgumentException e) {
+            e.printStackTrace();
+        }
        mLoadingDialog.setCancelable(cancelable);
        mLoadingDialog.setCanceledOnTouchOutside(false);
        mLoadingDialog.setContentView(view, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT));

--- a/base-module/src/main/res/layout/print_item_food.xml
+++ b/base-module/src/main/res/layout/print_item_food.xml
@@ -11,7 +11,7 @@
        android:layout_width="0dp"
        android:layout_height="wrap_content"
        android:layout_marginRight="@dimen/dp_5"
-        tools:text="食品名食品名食品名食品名食品名食品名"
+        tools:text="食品名食品名食品1111111111111111111111111111名食品名食品名食品名"
        android:layout_weight="0.6" />
    <TextView
@@ -21,17 +21,16 @@
        android:layout_height="wrap_content"
        android:layout_weight="0.15"
        android:layout_gravity="bottom"
-        tools:text="x111111"
+        tools:text="x1111111111111111111111111"
        android:gravity="right|center_vertical" />
    <TextView
        android:id="@+id/tv_food_price"
        style="@style/Print_text_style"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_gravity="bottom"
        android:layout_marginLeft="@dimen/dp_5"
-        tools:text="100000000"
+        tools:text="100000000000000"
-        android:layout_weight="0.25"
        android:gravity="right|center_vertical" />
 </LinearLayout>
\ No newline at end of file
--- a/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
+++ b/coldchain-module/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
@@ -46,6 +46,8 @@ import java.util.ArrayList;
 import java.util.List;
 import butterknife.BindView;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import static com.jess.arms.utils.Preconditions.checkNotNull;
@@ -165,13 +167,14 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
    @Override
    public void showLoading(String message) {
-        runOnUiThread(() -> {
+        Observable.just(1)
-            if (message != null)
+                .observeOn(AndroidSchedulers.mainThread())
-                LoadingDialog.showDialogForLoading(mContext, message, true);
+                .subscribe(integer -> {
-            else
+                    if (message != null)
-                LoadingDialog.showDialogForLoading(mContext);
+                        LoadingDialog.showDialogForLoading(mContext, message, true);
-        });
+                    else
+                        LoadingDialog.showDialogForLoading(mContext);
+                });
    }
    @Override

--- a/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
+++ b/delivery_pick_mode/src/main/java/com/gingersoft/gsa/delivery_pick_mode/ui/activity/DeliveryOrderMainActivity.kt
@@ -9,6 +9,7 @@ import android.graphics.drawable.GradientDrawable
 import android.os.Build
 import android.os.Bundle
 import android.os.IBinder
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.widget.TextView
@@ -118,6 +119,7 @@ class DeliveryOrderMainActivity : BaseActivity() {
            getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity))
            balanceBean.observe(this@DeliveryOrderMainActivity, Observer {
+                Log.e("eee", "刷新餘額")
                it?.let {
                    tv_balance.text = "餘額：${it.balance}" + "（保證金: ${it.bond} )"
                    if (it.balance <= it.threshold) {
@@ -359,9 +361,9 @@ class DeliveryOrderMainActivity : BaseActivity() {
                        if (type == 3 || type == 4 || type == 5
                                || type == 6 || type == 7) {
                            pageViewModel.refreshState.postValue(selectPosition)
-                            //刷新餘額
-                            pageViewModel.getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity))
                        }
+                        //刷新餘額
+                        pageViewModel.getBanlance(GsaCloudApplication.getBrandId(this@DeliveryOrderMainActivity))
                    }
                })
                it.execute {

--- a/login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
+++ b/login-module/src/main/java/com/gingersoft/gsa/cloud/login/mvp/ui/activity/mvp/ui/activity/WelcomeActivity.java
@@ -17,6 +17,7 @@ import androidx.annotation.Nullable;
 import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.viewpager2.widget.ViewPager2;
+import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.base.utils.encryption.Aes;
 import com.gingersoft.gsa.cloud.base.utils.other.SPUtils;
 import com.gingersoft.gsa.cloud.constans.UserConstans;
@@ -96,7 +97,7 @@ public class WelcomeActivity extends LoginInterfaceImpl<WelcomePresenter> implem
                    //是第一次進入，顯示引導頁
                    showGuide();
                } else {
-                    if ((boolean) SPUtils.get(mContext, UserConstans.AUTO_LOGIN, false)) {
+                    if ((boolean) SPUtils.get(mContext, UserConstans.AUTO_LOGIN, false) && GsaCloudApplication.isLogin) {
                        //自動登陸
                        String pwd = Aes.aesDecrypt((String) SPUtils.get(mContext, UserConstans.LOGIN_PASSWORD, ""));
                        mPresenter.login(SPUtils.get(mContext, UserConstans.LOGIN_USERNAME, "") + "", pwd);

--- a/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
+++ b/main-module/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
@@ -555,6 +555,7 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
                .setActionName("showActivityA")
                .build()
                .call();
        finish();
    }

--- a/print-module/src/main/java/com/joe/print/mvp/print/utils/MyPrintUtils.java
+++ b/print-module/src/main/java/com/joe/print/mvp/print/utils/MyPrintUtils.java
@@ -3,8 +3,6 @@ package com.joe.print.mvp.print.utils;
 import android.content.Context;
 import android.widget.TextView;
-import com.epson.epos2.Epos2Exception;
-import com.epson.epos2.printer.Printer;
 import com.gingersoft.gsa.cloud.base.application.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
 import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
@@ -12,7 +10,6 @@ import com.gingersoft.gsa.cloud.database.utils.PrintCurrencyDaoUtils;
 import com.gingersoft.gsa.cloud.database.utils.PrinterDeviceDaoUtils;
 import com.joe.print.R;
-import java.util.ArrayList;
 import java.util.List;
 public class MyPrintUtils {
@@ -138,10 +135,10 @@ public class MyPrintUtils {
            // 如果沒有預設，那麼判斷打印機字體大小是不是設置為預設
            // 如果是預設，那麼手動給設置食品字體大小，不然打印不出來食品
            if (defaultPrint.getFoodFont().equals("0")) {
-                defaultPrint.setFoodFont("20");
+                defaultPrint.setFoodFont("18");
            }
            if (defaultPrint.getModifierFont().equals("0")) {
-                defaultPrint.setModifierFont("18");
+                defaultPrint.setModifierFont("16");
            }
        }
        return defaultPrint;

--- a/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
+++ b/print-module/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
@@ -49,8 +49,13 @@ import com.joe.print.mvp.print.utils.MyPrintUtils;
 import com.joe.print.mvp.ui.adapter.DialogPrinterListAdapter;
 import com.joe.print.mvp.ui.adapter.PrintProgressAdapter;
 import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
 import java.util.List;
 import java.util.Map;
+import io.reactivex.Observable;
+import io.reactivex.android.schedulers.AndroidSchedulers;
 import static com.gingersoft.gsa.cloud.constans.PrintConstans.PRINT_TYPE;
 import static com.jess.arms.utils.Preconditions.checkNotNull;
@@ -130,7 +135,9 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        }
        initPrintConfig();
    }
    private int selectPrint = -1;
    private void initPrintConfig() {
        PrintCurrencyBean printCurrencyBean = null;
        PrinterDeviceBean defaultPrint;
@@ -179,7 +186,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
                        .setHeight(ArmsUtils.getScreenHeidth(mContext) / 2)
                        .setWidth((int) (ArmsUtils.getScreenWidth(mContext) * 0.8))
                        .setOnDismissListener(dialog -> {
-                            if(selectPrint == -1){
+                            if (selectPrint == -1) {
                                printFile("未選擇打印機");
                            }
                        })
@@ -234,9 +241,11 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
            }
        }
    }
    private PrintProgressAdapter adapter;
-    private void setPrintProgress(int state){
-        if(adapter != null){
+    private void setPrintProgress(int state) {
+        if (adapter != null) {
            adapter.setProgress(state);
        }
    }
@@ -270,11 +279,13 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    }
    private void setLoadingText(String tip) {
-        runOnUiThread(() -> {
+        Observable.just(1)
-            if (mLoadingDialog != null && mLoadingDialog.isShowing()) {
+                .observeOn(AndroidSchedulers.mainThread())
-                mTvLoadingTip.setText(tip);
+                .subscribe(integer -> {
-            }
+                    if (mLoadingDialog != null && mLoadingDialog.isShowing()) {
-        });
+                        mTvLoadingTip.setText(tip);
+                    }
+                });
    }
    @Override
@@ -476,11 +487,13 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    }
    private void disLoadingDialog() {
-        runOnUiThread(() -> {
+        Observable.just(1)
-            if (mLoadingDialog != null) {
+                .observeOn(AndroidSchedulers.mainThread())
-                mLoadingDialog.dismiss();
+                .subscribe(integer -> {
-            }
+                    if (mLoadingDialog != null) {
-        });
+                        mLoadingDialog.dismiss();
+                    }
+                });
    }
    @Override