1、打印日志调试

75135167 · 宁斌 · b9b46771 · 75135167 · 75135167 · 75135167
Commit 75135167 authored Apr 21, 2021 by 宁斌
10 changed files
--- a/component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
+++ b/component-main/src/main/java/com/gingersoft/gsa/cloud/main/mvp/ui/activity/NewMainActivity.java
@@ -387,7 +387,6 @@ public class NewMainActivity extends BaseFragmentActivity<NewMainPresenter> impl
 //                    mActivityJumpStrategy.put(function, new IntentJumpStrategy());
 //                }
 //            }
        }
    }

--- a/component-print/src/main/java/com/joe/print/PrintComponent.java
+++ b/component-print/src/main/java/com/joe/print/PrintComponent.java
@@ -6,6 +6,7 @@ import com.billy.cc.core.component.CC;
 import com.billy.cc.core.component.CCResult;
 import com.billy.cc.core.component.CCUtil;
 import com.billy.cc.core.component.IComponent;
+import com.gingersoft.gsa.cloud.common.logan.LoganManager;
 import com.gingersoft.gsa.cloud.component.ComponentName;
 import com.joe.print.mvp.print.printerManger.PrjPtinterManager;
 import com.joe.print.mvp.print.service.PrjService;
@@ -15,6 +16,7 @@ import com.joe.print.mvp.ui.activity.PrinterListActivity;
 public class PrintComponent implements IComponent {
+    private final String TAG = getClass().getSimpleName();
    @Override
    public String getName() {
@@ -35,6 +37,7 @@ public class PrintComponent implements IComponent {
    @Override
    public boolean onCall(CC cc) {
        String actionName = cc.getActionName();
+        LoganManager.w_code(TAG, "onCall->actionName->" + actionName);
        switch (actionName) {
            case "killPrintActivity":
@@ -117,7 +120,9 @@ public class PrintComponent implements IComponent {
 //        //将cc的callId传给Activity，登录完成后通过这个callId来回传结果
 //        intent.putExtra("callId", cc.getCallId());
 //        context.startActivity(intent);
+        LoganManager.w_code(TAG, "print start" );
        CCUtil.navigateTo(cc, PrintActivity.class);
+        LoganManager.w_code(TAG, "print end" );
        //返回true，不立即调用CC.sendCCResult
        return true;
    }

--- a/component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
+++ b/component-print/src/main/java/com/joe/print/mvp/ui/activity/PrintActivity.java
@@ -101,6 +101,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    @Override
    public void setupActivityComponent(@NonNull AppComponent appComponent) {
+        LoganManager.w_code(TAG, "setupActivityComponent");
        DaggerPrintComponent //如找不到该类,请编译一下项目
                .builder()
                .appComponent(appComponent)
@@ -111,6 +112,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    @Override
    public int initView(@Nullable Bundle savedInstanceState) {
+        LoganManager.w_code(TAG, "initView");
        getWindow().addFlags(WindowManager.LayoutParams.FLAG_NOT_TOUCHABLE
                | WindowManager.LayoutParams.FLAG_WATCH_OUTSIDE_TOUCH);
        return 0;//R.layout.print_bitmap;如果你不需要框架帮你设置 setContentView(id) 需要 自行设置,请返回 0
@@ -118,6 +120,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    @Override
    public void configImmersionBar(ImmersionBar immersionBar) {
+        LoganManager.w_code(TAG, "configImmersionBar");
        immersionBar
                .fitsSystemWindows(true)
                .statusBarColor(R.color.trans)
@@ -127,6 +130,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    @Override
    public void initData(@Nullable Bundle savedInstanceState) {
+        LoganManager.w_code(TAG, "initData");
        PrinterFlowProxy.newInstance().registerPrinterFlowListener(printerFlowListener);
    }
@@ -138,7 +142,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        @Override
        public void connectionSuccess() {
-            if(printerLoadingDialog == null){
+            if (printerLoadingDialog == null) {
                return;
            }
            printerLoadingDialog.setStep(PrinterLoadingDialog.PROGRESS_PRINTING, PrinterLoadingDialog.STATUS_SUCCESS, null);
@@ -146,7 +150,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        @Override
        public void connectionError(Exception e) {
-            if(printerLoadingDialog == null){
+            if (printerLoadingDialog == null) {
                return;
            }
            printerLoadingDialog.setStep(PrinterLoadingDialog.PROGRESS_PRINTING, PrinterLoadingDialog.STATUS_ERROR, e.getMessage());
@@ -159,7 +163,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        @Override
        public void onPrinterDataBefore(int orderType, int printType, String printerData, String printerDeviceInfo) {
-            if(printerLoadingDialog == null){
+            if (printerLoadingDialog == null) {
                return;
            }
            printerLoadingDialog.setStep(PrinterLoadingDialog.PROGRESS_CONNECTING, PrinterLoadingDialog.STATUS_SUCCESS, null);
@@ -167,7 +171,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        @Override
        public void onPrinterBitmapBefore(int orderType, int printType, String directoryName, List<Bitmap> bitmaps) {
-            if(printerLoadingDialog == null){
+            if (printerLoadingDialog == null) {
                return;
            }
            printerLoadingDialog.setStep(PrinterLoadingDialog.PROGRESS_CONNECTING, PrinterLoadingDialog.STATUS_SUCCESS, null);
@@ -176,7 +180,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        @Override
        public void onPrintSuccess() {
            printerResult = true;
-            if(printerLoadingDialog == null){
+            if (printerLoadingDialog == null) {
                return;
            }
            printerLoadingDialog.setStep(PrinterLoadingDialog.PROGRESS_RESULT, PrinterLoadingDialog.STATUS_SUCCESS, null);
@@ -185,7 +189,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        @Override
        public void onPrintError(Exception e, int errorCode) {
-            if(printerLoadingDialog == null){
+            if (printerLoadingDialog == null) {
                return;
            }
            printerLoadingDialog.setStep(PrinterLoadingDialog.PROGRESS_RESULT, PrinterLoadingDialog.STATUS_ERROR, e.getMessage());
@@ -223,6 +227,8 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    private void actionPrinter() {
+        LoganManager.w_code(TAG, "actionPrinter start");
        showPrintLoadingDialog();
        callId = CCUtil.getNavigateCallId(this);
@@ -236,6 +242,8 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
        printerInIt = PrinterRoot.getPrinterByType(type, printContent);
        //初始化打印配置
        initPrintConfig(printContent);
+        LoganManager.w_code(TAG, "actionPrinter end");
    }
    private void showPrintLoadingDialog() {
@@ -264,6 +272,9 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
    private PrinterDeviceBean defaultPrint;
    private void initPrintConfig(PrintContent printContent) {
+        LoganManager.w_code(TAG, "initPrintConfig start");
        //開始
        PrinterFlowProxy.newInstance().dispatchPrinterDataBefore(type, type, GsonUtils.GsonString(printContent), GsonUtils.GsonString(defaultPrint));
@@ -295,6 +306,9 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
            defaultPrint = MyPrintUtils.configPrinterProperties(printCurrencyBean, defaultPrint);
            printByDevice(defaultPrint);
        }
+        LoganManager.w_code(TAG, "initPrintConfig defaultPrint-->" + defaultPrint.toString());
+        LoganManager.w_code(TAG, "initPrintConfig end");
    }
    /**
@@ -384,6 +398,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
     * @param defaultPrint 打印機
     */
    private void printByDevice(PrinterDeviceBean defaultPrint) {
+        LoganManager.w_code(TAG, "printByDevice start");
        //獲取對應的打印類
        if (printerInIt instanceof PrintInstruction) {
            //開錢箱
@@ -432,6 +447,7 @@ public class PrintActivity extends BaseActivity<PrintPresenter> implements Print
                printFailure("未找到對應的打印類型");
            }
        }
+        LoganManager.w_code(TAG, "printByDevice end");
    }
    /**

--- a/component-print/src/main/java/com/joe/print/mvp/ui/activity/PrinterAddActivity.java
+++ b/component-print/src/main/java/com/joe/print/mvp/ui/activity/PrinterAddActivity.java
@@ -24,6 +24,7 @@ import com.billy.cc.core.component.CC;
 import com.gingersoft.gsa.cloud.common.constans.PrintConstans;
 import com.gingersoft.gsa.cloud.common.core.restaurant.RestaurantInfoManager;
 import com.gingersoft.gsa.cloud.common.core.user.UserContext;
+import com.gingersoft.gsa.cloud.common.logan.LoganManager;
 import com.gingersoft.gsa.cloud.common.utils.other.TextUtil;
 import com.gingersoft.gsa.cloud.common.utils.toast.ToastUtils;
 import com.gingersoft.gsa.cloud.component.ComponentName;
@@ -560,6 +561,7 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
     * 添加或測試打印機
     */
    private void addOrTestPrint(View v) {
+        LoganManager.w_code(TAG, "addOrTestPrint start");
        if (!editTextIsNull(mEdPrintName)) {
            ToastUtils.show(mContext, "請輸入打印機名稱");
            return;
@@ -650,6 +652,8 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
            }
        } else if (v.getId() == R.id.print_test) {
            //打印測試
+            LoganManager.w_code(TAG, "打印測試 start");
+            LoganManager.w_code(TAG, "打印測試 printerDeviceBean->" + printerDeviceBean.toString());
            CC.obtainBuilder(ComponentName.COMPONENT_PRINT)
                    .addParam(PrintConstans.PRINT_TYPE, PrintConstans.PRINT_TEST)
                    .addParam("deviceBean", printerDeviceBean)
@@ -660,9 +664,11 @@ public class PrinterAddActivity extends BaseActivity<PrinterAddPresenter> implem
 //                        if (!result.isSuccess()) {
 //                            ToastUtils.show(this, "打印失敗");
 //                        }
+                        LoganManager.w_code(TAG, "打印測試 end");
                    });
        }
+        LoganManager.w_code(TAG, "addOrTestPrint end");
    }
    private boolean editTextIsNull(TextView edit) {

--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/app/printer/PrintPaymentStub.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/app/printer/PrintPaymentStub.java
-package com.gingersoft.gsa.cloud.table.app.printer;
-/**
- * 作者：ELEGANT_BIN
- * 版本：1.6.0
- * 创建日期：2019/6/18
- * 修订历史：2019/6/18
- * 描述：
- */
-public class PrintPaymentStub {
-    private String EVENT_NAME;
-    private String TXN_ID;
-    private boolean IS_REPRINT;
-    public String getEVENT_NAME() {
-        return EVENT_NAME;
-    }
-    public void setEVENT_NAME(String EVENT_NAME) {
-        this.EVENT_NAME = EVENT_NAME;
-    }
-    public String getTXN_ID() {
-        return TXN_ID;
-    }
-    public void setTXN_ID(String TXN_ID) {
-        this.TXN_ID = TXN_ID;
-    }
-    public boolean isIS_REPRINT() {
-        return IS_REPRINT;
-    }
-    public void setIS_REPRINT(boolean IS_REPRINT) {
-        this.IS_REPRINT = IS_REPRINT;
-    }
-    @Override
-    public String toString() {
-        return "PrintPaymentStub{" +
-                "EVENT_NAME='" + EVENT_NAME + '\'' +
-                ", TXN_ID='" + TXN_ID + '\'' +
-                ", IS_REPRINT=" + IS_REPRINT +
-                '}';
-    }
-}
--- a/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/RegionTableFragment.java
+++ b/component-table/src/main/java/com/gingersoft/gsa/cloud/table/mvp/ui/fragment/RegionTableFragment.java
@@ -69,9 +69,6 @@ public class RegionTableFragment extends BaseFragment<RegionTablePresenter> impl
    @BindView(R2.id.recycle_all_table)
    RecyclerView recycle_all_table;
-//    @BindView(R2.id.emptyView)
-//    QMUIEmptyView mEmptyView;
    private LoadService loadService;
    private TableActivity mTableActivity;

--- a/library-base/src/main/java/com/jess/arms/utils/DeviceUtils.java
+++ b/library-base/src/main/java/com/jess/arms/utils/DeviceUtils.java
@@ -101,6 +101,26 @@ public class DeviceUtils {
        throw new IllegalStateException("you can't instantiate me!");
    }
+    public static String getPhoneInfo() {
+        String phoneInfo = "Product: " + android.os.Build.PRODUCT + "\n";
+        phoneInfo += "CPU_ABI: " + android.os.Build.CPU_ABI + "\n";
+        phoneInfo += "TAGS: " + android.os.Build.TAGS + "\n";
+        phoneInfo += "VERSION_CODES.BASE: " + android.os.Build.VERSION_CODES.BASE + "\n";
+        phoneInfo += "MODEL: " + android.os.Build.MODEL + "\n";
+        phoneInfo += "SDK: " + android.os.Build.VERSION.SDK + "\n";
+        phoneInfo += "VERSION.RELEASE: " + android.os.Build.VERSION.RELEASE + "\n";
+        phoneInfo += "DEVICE: " + android.os.Build.DEVICE + "\n";
+        phoneInfo += "DISPLAY: " + android.os.Build.DISPLAY + "\n";
+        phoneInfo += "BRAND: " + android.os.Build.BRAND + "\n";
+        phoneInfo += "BOARD: " + android.os.Build.BOARD + "\n";
+        phoneInfo += "FINGERPRINT: " + android.os.Build.FINGERPRINT + "\n";
+        phoneInfo += "ID: " + android.os.Build.ID + "\n";
+        phoneInfo += "MANUFACTURER: " + android.os.Build.MANUFACTURER + "\n";
+        phoneInfo += "USER: " + android.os.Build.USER + "\n";
+        return phoneInfo;
+    }
    // 判断是否安装指定app
    public static boolean isInstallApp(Context context, String app_package) {
        final PackageManager packageManager = context.getPackageManager();
@@ -158,6 +178,7 @@ public class DeviceUtils {
    /**
     * 打開微信
+     *
     * @param context
     */
    public static void openWeChat(Context context) {
@@ -1183,7 +1204,6 @@ public class DeviceUtils {
                return true; //判断服务是否运行
            }
        }
        return false;
    }
 }

--- a/library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/globalconfig/applyOptions/intercept/HeadersInterceptor.java
+++ b/library-common/src/main/java/com/gingersoft/gsa/cloud/common/config/globalconfig/applyOptions/intercept/HeadersInterceptor.java
@@ -28,8 +28,9 @@ public class HeadersInterceptor implements Interceptor {
        String cacheControl = originalRequest.cacheControl().toString();
        Headers.Builder builder = new Headers.Builder();
-        builder.set("mobileVersion", android.os.Build.VERSION.RELEASE);
+        builder.set("mobileVersion", android.os.Build.VERSION.RELEASE); //安卓版本号
-        builder.set("mobielModel", android.os.Build.MODEL);
+        builder.set("mobileModel", android.os.Build.MODEL);//手机型号
+        builder.set("mobileBrand", android.os.Build.BRAND);//手机品牌
        builder.set("apptype", AppConstans.APP_TYPE);
        builder.set("appinfo", DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()));
        builder.set("mobileId", "1");

--- a/library-common/src/main/java/com/gingersoft/gsa/cloud/common/logan/LoganManager.java
+++ b/library-common/src/main/java/com/gingersoft/gsa/cloud/common/logan/LoganManager.java
@@ -10,6 +10,7 @@ import com.dianping.logan.SendLogCallback;
 import com.gingersoft.gsa.cloud.common.core.user.UserContext;
 import com.gingersoft.gsa.cloud.app.GsaCloudApplication;
 import com.gingersoft.gsa.cloud.common.BuildConfig;
+import com.gingersoft.gsa.cloud.common.oaId.DeviceID;
 import com.gingersoft.gsa.cloud.common.utils.log.LogUtil;
 import com.gingersoft.gsa.cloud.common.utils.okhttpUtils.OkHttp3Utils;
 import com.gingersoft.gsa.cloud.common.utils.time.TimeUtils;
@@ -29,6 +30,9 @@ public class LoganManager {
    public static void w_code(String TAG, String log) {
        Logan.w(log, LoganConfig.CODE_LEVLE);
+        if (BuildConfig.DEBUG) {
+            Logan.f();
+        }
        printLog(TAG, log);
    }
@@ -64,6 +68,7 @@ public class LoganManager {
    public static void w_heart(String log) {
        Logan.w(log, LoganConfig.heart_LEVLE);
    }
    /*******************************自定義業務日誌類型**************************************/
    private static final String LOGIN_BUSINESS_TAG = "login-> ";
    private static final String HOME_BUSINESS_TAG = "home-> ";
@@ -94,15 +99,15 @@ public class LoganManager {
    public static final String EVENT_ERROR = "錯誤->";
-    public static void w_login(String TAG,String... eventAndLog) {
+    public static void w_login(String TAG, String... eventAndLog) {
        w_business(LOGIN_BUSINESS_TAG, TAG, eventAndLog);
    }
-    public static void w_home(String TAG,String... eventAndLog) {
+    public static void w_home(String TAG, String... eventAndLog) {
        w_business(HOME_BUSINESS_TAG, TAG, eventAndLog);
    }
-    public static void w_database(String TAG,String... eventAndLog) {
+    public static void w_database(String TAG, String... eventAndLog) {
        w_business(DATABASE_BUSINESS_TAG, TAG, eventAndLog);
    }
@@ -125,6 +130,7 @@ public class LoganManager {
    public static void w_delivery(String TAG, String... eventAndLog) {
        w_business(DELIVERY_PICK_TAG, TAG, eventAndLog);
    }
    private static void w_business(String BUSINESS_TAG, String TAG, String... eventAndLog) {
        if (eventAndLog != null) {
            if (eventAndLog.length > 1) {
@@ -148,7 +154,7 @@ public class LoganManager {
     */
    public static void uploadLog(Context context, boolean showToast) {
        String memberId = UserContext.newInstance().getMemberName() + "_" + UserContext.newInstance().getMemberId();
-        String deviceId = DeviceUtils.getDeviceId(GsaCloudApplication.getAppContext());
+        String deviceId = DeviceID.getDeviceId();
        String AppVersion = DeviceUtils.getVersionName(GsaCloudApplication.getAppContext()) + "_" + DeviceUtils.getVersionCode(GsaCloudApplication.getAppContext());
        String BuildVersion = android.os.Build.VERSION.RELEASE + "";
        Logan.s(LoganConfig.UPLOAD_LOG_URL, TimeUtils.getCurrentDate(TimeUtils.DATE_FORMAT_DATE), LoganConfig.APP_ID, memberId, deviceId,

--- a/library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/crash/AppCrashHandler.java
+++ b/library-common/src/main/java/com/gingersoft/gsa/cloud/common/utils/crash/AppCrashHandler.java
@@ -9,6 +9,7 @@ import android.os.Looper;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Toast;
 import com.gingersoft.gsa.cloud.common.Api;
 import com.gingersoft.gsa.cloud.common.bean.BaseResult;
 import com.gingersoft.gsa.cloud.common.constans.HttpsConstans;
@@ -144,6 +145,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
     * @return true:如果处理了该异常信息;否则返回false
     */
    private boolean handleException(Throwable ex) {
+        LoganManager.w_crash("handleException start--->" + ex.getMessage());
        if (ex == null) {
            return false;
        }
@@ -190,7 +192,7 @@ public class AppCrashHandler implements UncaughtExceptionHandler {
        String stacktrace = result.toString();
        printWriter.close();
-        LoganManager.w_crash(stacktrace);
+        LoganManager.w_crash("handleException end--->" + stacktrace);
        //保存错误报告到文件
        saveCrashInfo2File(ex);