From 35c0e8c98fca92a0b179d5ce5841d63e5d32850a Mon Sep 17 00:00:00 2001 From: lixiaopeng Date: Mon, 13 Mar 2023 15:34:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=B1=BD=E8=BD=A6=E4=BF=A1=E6=81=AF=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=9C=A8=E8=B0=83=E8=AF=95=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../binding/BindingCarNetWorkManager.kt | 38 ++++++------------- .../main/res/layout/view_debug_setting.xml | 2 +- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt index a6b0fccc0f..e7a8d157db 100644 --- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt +++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/binding/BindingCarNetWorkManager.kt @@ -72,36 +72,26 @@ class BindingCarNetWorkManager private constructor() { override fun onSubscribe(d: Disposable) {} override fun onNext(info: BindingCarInfo) { if (info != null && info.getData() != null) { - d( - SceneConstant.M_BINDING + TAG, - "getBindingCarInfo data =" + info.getData().toString() + d(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data =" + info.getData().toString()) + SharedPrefsMgr.getInstance(context).putString( + SharedPrefsConstants.CAR_INFO, + GsonUtils.toJson(info.getData()) ) - updateCarVrIconRes(info.getData().brandId); when (info.getData().compare) { "0" -> showBindingCarDialog() "3" -> showModifyBindingCarDialog() "null" -> TipToast.shortTip("当前工控机没有入库") } - SharedPrefsMgr.getInstance(context).putString( - SharedPrefsConstants.CAR_INFO, - GsonUtils.toJson(info.getData()) - ) + updateCarVrIconRes(info.getData().brandId); } else { -// SharedPrefsMgr.getInstance(context).putString( -// SharedPrefsConstants.CAR_INFO, "null") - e( - SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null " - ) + SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "") + e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo data = null ") } } override fun onError(e: Throwable) { -// SharedPrefsMgr.getInstance(context).putString( -// SharedPrefsConstants.CAR_INFO, e.message.toString()) - e( - SceneConstant.M_BINDING + TAG, - "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message - ) + SharedPrefsMgr.getInstance(context).putString(SharedPrefsConstants.CAR_INFO, "") + e(SceneConstant.M_BINDING + TAG, "getBindingCarInfo onError e = " + e.toString() + "---e.getMessage = " + e.message) } override fun onComplete() {} @@ -138,19 +128,13 @@ class BindingCarNetWorkManager private constructor() { override fun onNext(info: ModifyBindingcarInfo) { if (info != null) { callBack.invoke(info) - d( - SceneConstant.M_BINDING + TAG, - "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString() - ) + d(SceneConstant.M_BINDING + TAG, "modifyBindingCar onNext code = " + info.code + "---msg = " + info.msg + "--info.toString() = " + info.toString()) updateCarVrIconRes(info.data.brandId) } } override fun onError(e: Throwable) { - e( - SceneConstant.M_BINDING + TAG, - "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message - ) + e(SceneConstant.M_BINDING + TAG, "modifyBindingCar onError e = " + e.toString() + "---e.getMessage = " + e.message) } override fun onComplete() {} diff --git a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml index 8ba6b14009..0ab7cf9f74 100644 --- a/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml +++ b/core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_debug_setting.xml @@ -222,7 +222,7 @@ style="@style/DebugSettingText" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minLines="5" /> + android:minLines="4" /> Date: Mon, 13 Mar 2023 17:29:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[dev=5Farch=5Fopt=5F3.0]=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=AF=B9=E8=B1=A1=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../utilcode/mogo/logger/LoggerPrinter.java | 39 +++++-------------- 1 file changed, 9 insertions(+), 30 deletions(-) diff --git a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/LoggerPrinter.java b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/LoggerPrinter.java index ce7fde2c02..e67902356f 100644 --- a/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/LoggerPrinter.java +++ b/core/mogo-core-utils/src/main/java/com/mogo/eagle/core/utilcode/mogo/logger/LoggerPrinter.java @@ -132,32 +132,9 @@ final class LoggerPrinter implements Printer { } } - private synchronized void log( String tag, LogLevel logLevel, String msg, Object... args) { + private void log( String tag, LogLevel logLevel, String msg, Object... args) { String message = this.createMessage(msg, args); - int methodCount = this.getMethodCount(); - this.logTopBorder(logLevel, tag); - this.logHeaderContent(logLevel, tag, methodCount); - byte[] bytes = message.getBytes(); - int length = bytes.length; - if (length <= 4000) { - if (methodCount > 0) { - this.logDivider(logLevel, tag); - } - - this.logContent(logLevel, tag, message); - this.logBottomBorder(logLevel, tag); - } else { - if (methodCount > 0) { - this.logDivider(logLevel, tag); - } - - for (int i = 0; i < length; i += 4000) { - int count = Math.min(length - i, 4000); - this.logContent(logLevel, tag, new String(bytes, i, count)); - } - - this.logBottomBorder(logLevel, tag); - } + logContent(logLevel, tag, message); } private void logTopBorder(LogLevel logLevel, String tag) { @@ -198,11 +175,13 @@ final class LoggerPrinter implements Printer { } private void logContent( LogLevel logLevel, String tag, String chunk) { - String[] lines = chunk.split( System.getProperty("line.separator")); - - for ( String line : lines) { - this.logChunk(logLevel, tag, "║ " + line); - } +// String[] lines = chunk.split( System.getProperty("line.separator")); +// +// for ( String line : lines) { +// this.logChunk(logLevel, tag, "║ " + line); +// } +// + logChunk(logLevel, tag, chunk); } private void logChunk( LogLevel logLevel, String tag, String chunk) {