From 1deca69a6708addabd790065ac4390cd3f7501f0 Mon Sep 17 00:00:00 2001 From: YANG JIANKUAN Date: Tue, 27 Jan 2026 08:39:30 +0800 Subject: [PATCH] feat: opt print --- module_base/build.gradle | 10 +++++----- .../java/com/lukouguoji/module_base/LoginActivity.kt | 2 +- .../com/lukouguoji/module_base/util/PrinterUtils.kt | 2 +- .../gjc/viewModel/GjcBoxWeighingAddViewModel.kt | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/module_base/build.gradle b/module_base/build.gradle index de82b25..469b3ee 100644 --- a/module_base/build.gradle +++ b/module_base/build.gradle @@ -152,11 +152,11 @@ dependencies { api 'me.jessyan:autosize:1.2.+' // 佳博打印SDK -// api('com.gainscha:sdk2:2.0.3@aar') { -// exclude group: 'com.jcraft' -// } -// api(name: 'sdk2-2.1.6-20250901.051214-1', ext: 'aar') { - api(name: 'sdk2-2.0.3', ext: 'aar') { + api('com.gainscha:sdk2:2.0.3@aar') { exclude group: 'com.jcraft' } +// api(name: 'sdk2-2.1.6-20250901.051214-1', ext: 'aar') { +// api(name: 'sdk2-2.0.3', ext: 'aar') { +// exclude group: 'com.jcraft' +// } } \ No newline at end of file diff --git a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt index bb22afa..0d6b880 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/LoginActivity.kt @@ -41,7 +41,7 @@ import me.jessyan.autosize.internal.CustomAdapt * ========== 开发调试开关 ========== * TODO: 正式发布前务必设置为 false */ -private const val DEV_AUTO_LOGIN = false // 自动登录开关 +private const val DEV_AUTO_LOGIN = true // 自动登录开关 @Route(path = ARouterConstants.ACTIVITY_URL_LOGIN) class LoginActivity : BaseActivity(), diff --git a/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt b/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt index d679705..0c87437 100644 --- a/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt +++ b/module_base/src/main/java/com/lukouguoji/module_base/util/PrinterUtils.kt @@ -459,7 +459,7 @@ object PrinterUtils { addSize(100, 100) addGap(3) addCls() - addTextByBitmap(80, 80, 0, 130, "扬州泰州机场", Typeface.DEFAULT) + addTextByBitmap(80, 80, 0, 130, "合肥新桥国际机场", Typeface.DEFAULT) // 绘制表格横线 for (i in 0..rows.size) { diff --git a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt index c9d2f3f..e18e580 100644 --- a/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt +++ b/module_gjc/src/main/java/com/lukouguoji/gjc/viewModel/GjcBoxWeighingAddViewModel.kt @@ -396,7 +396,7 @@ class GjcBoxWeighingAddViewModel : BaseViewModel() { viewModelScope.launch { FlowBus.with(ConstantEvent.EVENT_REFRESH).emit("refresh") } - getTopActivity().finish() +// getTopActivity().finish() } else { showToast(result.msg.noNull("添加失败")) }