Skip to content

S
supplier
Commit a4496333 by Wyh
Options

1、合併代碼、針式打印優化

parent a45cdb6d
Showing with 56 additions and 74 deletions
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/activity/OrderDetailsActivity.java
......@@ -194,7 +194,6 @@ public class OrderDetailsActivity extends BaseActivity<OrderDetailsPresenter> im
@Override
public void hideLoading() {
Log.e("eee", "hideLoading");
LoadingDialog.cancelDialogForLoading();
}
......
component-coldchain/src/main/java/com/gingersoft/coldchain_module/mvp/ui/fragment/OrderListFragment.java
......@@ -281,7 +281,6 @@ public class OrderListFragment extends BaseFragment<OrderListPresenter> implemen
// if (resultCode == 1001 && data != null && mPresenter != null) {
// int position = data.getIntExtra("position", -1);
// boolean isPrint = data.getBooleanExtra("printPdf", false);
// Log.e("eee", "Position：" + position + "----isPrint：" + isPrint);
// if (isPrint) {
// mPresenter.notifyDataPrintStateByPosition(position, true);
// } else {
......
component-login/build.gradle
......@@ -75,6 +75,10 @@ android {
outputFileName = fileName
}
}
dexOptions {
// incremental true
javaMaxHeapSize "4g"
}
}
//dokit 扩展
dokitExt {
......
component-print/src/main/java/com/joe/print/mvp/print/EpsonPrint.java
......@@ -15,6 +15,7 @@ import com.gingersoft.gsa.cloud.print.PrintSocketHolder;
import com.joe.print.mvp.model.bean.PrintInfoBean;
import com.joe.print.mvp.print.utils.MyPrintUtils;
import java.net.ConnectException;
import java.util.ArrayList;
import java.util.List;
......@@ -269,11 +270,16 @@ public class EpsonPrint implements ReceiveListener {
}
}
public void putPrintData(String ip, Bitmap bitmap,String foodId) {
public void putPrintData(String ip, Bitmap bitmap, String foodId) {
//把bitmap存隊列中，下次打印
if (bitmaps.size() <= 0) {
isPrint = false;
}
bitmaps.add(bitmap);
ids.add(foodId);
if (isPrint) {
Log.d("eee", "針式打印機隊列中，前面還有" + bitmaps.size() + "個任務");
PrinterPlugins.getOnPrinterFlowHandler().connectionBefore("針式打印機隊列中，前面還有" + bitmaps.size() + "個任務", ip, 0, 0, 0);
return;
}
isPrint = true;
......@@ -281,33 +287,52 @@ public class EpsonPrint implements ReceiveListener {
}
private void printData(String ip, Bitmap bitmap) {
PrinterPlugins.getOnPrinterFlowHandler().connectionBefore("針式打印機開始連接", ip, 0, 0, 0);
mPrinter.clearCommandBuffer();
Log.d("eee", "針式打印機創建數據中，任務數：" + bitmaps.size());
if (!createPrintData(bitmap)) {
Log.d("eee", "針式打印機創建數據失敗");
//如果是創建數據失敗，說明這個數據有問題，移除掉
bitmaps.remove(bitmap);
PrinterPlugins.getOnPrinterFlowHandler().connectionError(new Exception("針式打印機添加數據失敗" + ip));
updatePrintState(PrintSocketHolder.ERROR_6);
isPrint = false;
return;
}
//連接打印機
connectByIp(ip, mPrinter.getStatus());
if (mPrinter == null) {
Log.d("eee", "針式打印機為空");
//連接失敗
updatePrintState(PrintSocketHolder.ERROR_7);
PrinterPlugins.getOnPrinterFlowHandler().connectionError(new Exception("連接針式打印機失敗：" + ip));
PrinterPlugins.getOnPrinterFlowHandler().connectionError(new ConnectException("針式打印機連接失敗" + ip));
isPrint = false;
return;
}
PrinterStatusInfo statusInfo = mPrinter.getStatus();
Log.d("eee", "針式打印機：" + "紙張狀態：" + statusInfo.getPaper() + "連接狀態：" + statusInfo.getConnection() + "，任務數：" + bitmaps.size());
if (statusInfo.getPaper() == 2) {
//沒紙了
updatePrintState(PrintSocketHolder.ERROR_11);
PrinterPlugins.getOnPrinterFlowHandler().connectionError(new Exception("針式打印機缺紙，打印失敗" + ip));
isPrint = false;
return;
} else if (statusInfo.getConnection() != 1) {
//未連接到打印機
updatePrintState(PrintSocketHolder.ERROR_7);
PrinterPlugins.getOnPrinterFlowHandler().connectionError(new ConnectException("針式打印機連接失敗" + ip));
isPrint = false;
return;
}
try {
mPrinter.sendData(Printer.PARAM_DEFAULT);
isPrint = false;
PrinterPlugins.getOnPrinterFlowHandler().onPrintSuccess();
Log.d("eee", "針式打印機打印成功" + "，任務數：" + bitmaps.size());
} catch (Exception e) {
Log.d("eee", "針式打印機打印失敗" + "，任務數：" + bitmaps.size() + e.getMessage());
updatePrintState(PrintSocketHolder.ERROR_10);
PrinterPlugins.getOnPrinterFlowHandler().connectionError(new Exception("針式打印機打印報錯" + ip));
mPrinter.clearCommandBuffer();
disconnectPrinter();
isPrint = false;
......@@ -316,7 +341,7 @@ public class EpsonPrint implements ReceiveListener {
private void connectByIp(String ip, PrinterStatusInfo statusInfo) {
if (statusInfo != null) {
LoganManager.w_printer(TAG, "連接狀態1111："+statusInfo.getConnection());
LoganManager.w_printer(TAG, "連接狀態1111：" + statusInfo.getConnection());
if (statusInfo.getConnection() != 1) {
//未連接
if (connectPrinter(ip)) {
......@@ -337,7 +362,7 @@ public class EpsonPrint implements ReceiveListener {
ipAddress = ip;
}
}
LoganManager.w_printer(TAG, "連接狀態222："+statusInfo.getConnection());
LoganManager.w_printer(TAG, "連接狀態222：" + statusInfo.getConnection());
}
private void loginfo(PrinterStatusInfo statusInfo) {
......@@ -366,7 +391,7 @@ public class EpsonPrint implements ReceiveListener {
} catch (Exception e) {
Log.e(TAG, "連接打印機報錯" + e.getMessage() + e.getClass().getName());
e.printStackTrace();
LoganManager.w_printer(TAG, "連接打印機報錯："+ e.getMessage());
LoganManager.w_printer(TAG, "連接打印機報錯：" + e.getMessage());
disconnectPrinter();
finalizeObject();
PrinterPlugins.getOnPrinterFlowHandler().connectionError(e);
......@@ -390,6 +415,7 @@ public class EpsonPrint implements ReceiveListener {
if (receiveListener != null) {
receiveListener.onPtrReceive(printer, i, printerStatusInfo, ids.get(0));
}
Log.d("eee", "移除前：onPtrReceive" + ids.get(0) + "，任務數：" + bitmaps.size());
bitmaps.remove(0);
ids.remove(0);
}
......
component-print/src/main/java/com/joe/print/mvp/print/PrinterRoot.java
......@@ -280,7 +280,7 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
@Override
public void onRaiseException(int code, String msg) {
//接⼝执⾏失败时，返回的异常状态
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(code);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null, code);
LoganManager.w_printer(TAG, "商米onRaiseException: " + code + msg);
}
......@@ -305,7 +305,7 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
} else {
//打印失敗
listener.printFailure("打印失敗");
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(i);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null, i);
}
}
......@@ -459,7 +459,7 @@ public abstract class PrinterRoot<T extends PrintContent> implements PrintSocket
LoganManager.w_printer(TAG, "关闭Socket出错");
break;
}
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null,errorCode);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null, errorCode);
setPrintState(errorCode);
}
......
component-print/src/main/java/com/joe/print/mvp/print/service/PrjService.java
......@@ -12,11 +12,9 @@ import android.util.Log;
import androidx.annotation.Nullable;
import com.epson.epos2.Epos2Exception;
import com.epson.epos2.printer.Printer;
import com.epson.epos2.printer.PrinterStatusInfo;
import com.epson.epos2.printer.ReceiveListener;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
......@@ -43,9 +41,7 @@ import com.hyweb.n5.lib.constant.PrinterConstant;
import com.hyweb.n5.lib.util.PrinterUtil;
import com.hyweb.n5.server.aidl.IOnPrintCallback;
import com.joe.print.mvp.print.EpsonPrint;
import com.joe.print.mvp.print.IpPrintMaker;
import com.joe.print.mvp.print.PrintPrjKitchen;
import com.joe.print.mvp.print.PrinterRoot;
import com.joe.print.mvp.print.common.PrinterFinderCallback;
import com.joe.print.mvp.print.common.SendResultCode;
import com.joe.print.mvp.print.maker.PrjPrintMaker;
......@@ -56,7 +52,6 @@ import com.joe.print.mvp.print.usb.UsbPrinterFinder;
import com.joe.print.mvp.print.utils.MyPrintUtils;
import com.sunmi.peripheral.printer.InnerResultCallbcak;
import com.xuexiang.rxutil2.rxjava.RxJavaUtils;
import com.xuexiang.rxutil2.rxjava.task.RxIOTask;
import org.json.JSONArray;
import org.json.JSONException;
......@@ -73,9 +68,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import io.reactivex.Observer;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.schedulers.Schedulers;
import jcifs.smb.SmbFile;
import jcifs.smb.SmbFileOutputStream;
......@@ -529,10 +522,11 @@ public class PrjService extends Service implements ReceiveListener {
updatePrjState(UpdateBean.FAIL_EPSON_INIT, epsonIds);
return;
}
PrinterPlugins.getOnPrinterFlowHandler().connectionBefore("針式打印機", printerDeviceBean.getIp(), printerDeviceBean.getPort(), 0, 0);
PrinterPlugins.getOnPrinterFlowHandler().connectionBefore("針式打印機" + bitmapMaps.size(), printerDeviceBean.getIp(), printerDeviceBean.getPort(), 0, 0);
Log.d("eee", "針式打印機本次PRJ數量：" + bitmapMaps.size());
for (int i = 0; i < bitmapMaps.size(); i++) {
for (Map.Entry<String, Bitmap> mapEntry : bitmapMaps.get(i).entrySet()) {
mPrinter.putPrintData(printerDeviceBean.getIp(), mapEntry.getValue(), epsonIds);
mPrinter.putPrintData(printerDeviceBean.getIp(), mapEntry.getValue(), mapEntry.getKey());
}
}
}
......@@ -687,7 +681,7 @@ public class PrjService extends Service implements ReceiveListener {
@Override
public void onRaiseException(int code, String msg) {
//接⼝执⾏失败时，返回的异常状态
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(code);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null, code);
LoganManager.w_printer(TAG, "商米onRaiseException: " + code + msg);
switch (code) {
case 3:
......@@ -751,7 +745,7 @@ public class PrjService extends Service implements ReceiveListener {
} else {
//打印失敗
updatePrjFailure(ids);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(i);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null, i);
}
}
......@@ -874,7 +868,7 @@ public class PrjService extends Service implements ReceiveListener {
updateBeans.add(new UpdateBean(id, printState, time));
}
String json = JsonUtils.toJson(updateBeans);
Log.e(TAG, "" + json);
Log.e(TAG, "修改打印狀態：" + json);
RequestBody requestBody = RequestBody.create(MediaType.parse("application/json"), json);
//打印過後，直接再讀數據，不用管是否已更新狀態。
......@@ -912,7 +906,7 @@ public class PrjService extends Service implements ReceiveListener {
//打印成功
updatePrjSuccess(s);
} else {
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null,i);
PrinterPlugins.getOnPrinterFlowHandler().onPrintError(null, i);
//打印失敗
updatePrjFailure(s);
}
......
component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
package com.joe.print.mvp.ui.activity;
import android.app.Dialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Build;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;
import android.widget.LinearLayout;
import android.widget.PopupWindow;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.billy.cc.core.component.CC;
import com.billy.cc.core.component.CCResult;
import com.billy.cc.core.component.CCUtil;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.listener.OnItemClickListener;
import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.printer.plugins.PrinterFlowListener;
import com.gingersoft.gsa.cloud.common.printer.plugins.PrinterPlugins;
import com.gingersoft.gsa.cloud.common.utils.gson.GsonUtils;
import com.gingersoft.gsa.cloud.print.PrintExecutor;
import com.gingersoft.gsa.cloud.print.PrintSocketHolder;
import com.gingersoft.gsa.cloud.print.bean.PrintContent;
import com.gingersoft.gsa.cloud.print.bean.PrjBean;
import com.gingersoft.gsa.cloud.common.utils.other.SPUtils;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
import com.gingersoft.gsa.cloud.database.bean.PrintCurrencyBean;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.gingersoft.gsa.cloud.ui.utils.DialogUtils;
import com.gingersoft.gsa.cloud.print.PrintExecutor;
import com.gingersoft.gsa.cloud.print.PrintSocketHolder;
import com.gingersoft.gsa.cloud.print.bean.PrintContent;
import com.gingersoft.gsa.cloud.print.bean.PrjBean;
import com.jess.arms.base.BaseActivity;
import com.jess.arms.di.component.AppComponent;
import com.jess.arms.utils.ArmsUtils;
import com.joe.print.R;
import com.joe.print.di.component.DaggerPrintComponent;
import com.joe.print.mvp.contract.PrintContract;
import com.joe.print.mvp.presenter.PrintPresenter;
import com.joe.print.mvp.print.EpsonPrint;
import com.joe.print.mvp.print.OpenCashBoxMaker;
import com.joe.print.mvp.print.PrintInstruction;
import com.joe.print.mvp.print.PrintListener;
import com.joe.print.mvp.print.PrintPrjKitchen;
import com.joe.print.mvp.print.PrinterRoot;
import com.joe.print.mvp.print.maker.OpenCashBoxMaker;
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.joe.print.mvp.ui.view.PrinterLoadingDialog;
import com.joe.print.mvp.ui.view.SelectPrintDevicePopup;
import com.lxj.xpopup.XPopup;
import com.lxj.xpopup.core.CenterPopupView;
import com.lxj.xpopup.enums.PopupAnimation;
import com.lxj.xpopup.impl.LoadingPopupView;
import com.xuexiang.rxutil2.rxjava.RxJavaUtils;
import com.xuexiang.rxutil2.rxjava.task.RxAsyncTask;
import com.xuexiang.rxutil2.rxjava.task.RxUITask;
import com.yanzhenjie.recyclerview.widget.DefaultItemDecoration;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import static com.gingersoft.gsa.cloud.common.constans.PrintConstans.PRINT_BILL;
import static com.gingersoft.gsa.cloud.common.constans.PrintConstans.PRINT_OTHER_CLOSING;
import static com.gingersoft.gsa.cloud.common.constans.PrintConstans.PRINT_OTHER_ORDER;
......
component-scan/src/main/java/com/gingersoft/gsa/cloud/scan/ComponentScan.java
......@@ -37,7 +37,6 @@ public class ComponentScan implements IComponent {
@Override
public boolean onCall(CC cc) {
String actionName = cc.getActionName();
Log.e("eee", "調用掃碼" + actionName);
switch (actionName) {
case "openScanActivity":
openScanActivity(cc);
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/ui/adapter/FoodListAdapter.java
......@@ -202,7 +202,6 @@ public class FoodListAdapter extends BaseQuickAdapter<PurchaseFoodBean, BaseView
viewHolder.getView(R.id.btn_food_operation_sub).setOnLongClickListener(new View.OnLongClickListener() {
@Override
public boolean onLongClick(View v) {
// Log.e("eee", "長按：" + System.currentTimeMillis());
return false;
}
});
......
component-supply-chain/src/main/java/com/gingersoft/supply_chain/mvp/utils/HideUtil.java
......@@ -113,7 +113,6 @@ public class HideUtil {
content.setOnTouchListener(new View.OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
Log.e("eee", "出賣人");
dispatchTouchEvent(activity, motionEvent);
return false;
......
component-webview/src/main/java/com/gingersoft/gsa/cloud/webview/ComponentWebview.java
......@@ -36,7 +36,6 @@ public class ComponentWebview implements IComponent {
@Override
public boolean onCall(CC cc) {
String actionName = cc.getActionName();
Log.e("eee", "調用webview組件" + actionName);
switch (actionName) {
case "openWebActivity":
openWebActivity(cc);
......
library-common/src/main/java/com/gingersoft/gsa/cloud/app/GsaCloudApplication.java
......@@ -166,6 +166,7 @@ public class GsaCloudApplication extends BaseApplication {
//上傳餐廳擴展信息
ExpandInfoSetting.initUpdateExtendedConfiguration(uiStyleConfiguration, functionConfiguration);
LoganManager.w_action(TAG, TAG + ": onCreate end.....");
}
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/PrintSocketHolder.java
package com.gingersoft.gsa.cloud.print;
import android.util.Log;
import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
import com.gingersoft.gsa.cloud.common.logan.LoganManager;
import com.gingersoft.gsa.cloud.common.printer.plugins.PrinterPlugins;
import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
import com.gingersoft.gsa.cloud.database.bean.PrinterDeviceBean;
import com.scwang.smartrefresh.layout.listener.OnStateChangedListener;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.ref.WeakReference;
import java.net.ConnectException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.net.SocketTimeoutException;
import java.util.List;
/**
......@@ -79,10 +77,6 @@ public class PrintSocketHolder {
e.printStackTrace();
LoganManager.w_printer(TAG, "連接打印機失敗: " + ip + ":" + port + "." + e.getMessage());
return ERROR_7;
} catch (SocketException e) {
e.printStackTrace();
PrinterPlugins.getOnPrinterFlowHandler().connectionError(e);
return ERROR_7;
} catch (IOException e) {
e.printStackTrace();
PrinterPlugins.getOnPrinterFlowHandler().connectionError(e);
......
library-print/src/main/java/com/gingersoft/gsa/cloud/print/bean/UpdateBean.java
......@@ -83,7 +83,7 @@ public class UpdateBean {
*/
public static final int FAIL_SUNMI_NO_BLACK_MARK_DETECTED = 16;
/**
* 18 本地打印但是沒有找到這個型號的打印機
* 17 本地打印但是沒有找到這個型號的打印機
*/
public static final int FAIL_LOCAL_PRINT_NOT_DEVICE = 17;
/**
......@@ -137,7 +137,7 @@ public class UpdateBean {
case FAIL_NOT_PAPER:
return "打印機缺紙，請檢查打印紙";
case FAIL_EPSON_INIT:
return "打印機初始化失敗，請檢查設備";
return "針式打印機初始化失敗，請檢查設備";
case FAIL_SUNMI_PRINT_HOT:
return "sunmi打印機過熱，導致無法打印，請檢查設備";
case FAIL_LID_NOT_CLOSED_SUNMI:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment