diff --git a/app/src/main/java/com/example/ops_android/printer/PrintHelper.kt b/app/src/main/java/com/example/ops_android/printer/PrintHelper.kt index 3b132cc..7a7c3cd 100644 --- a/app/src/main/java/com/example/ops_android/printer/PrintHelper.kt +++ b/app/src/main/java/com/example/ops_android/printer/PrintHelper.kt @@ -4,7 +4,6 @@ import com.example.ops_android.data.model.Item import com.example.ops_android.data.model.PurchaseOrder import com.example.ops_android.data.model.WorkOrder import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.sync.Mutex import kotlinx.coroutines.sync.withLock import kotlinx.coroutines.withContext @@ -36,14 +35,7 @@ object PrintHelper { } else { printerManager.addLineFeed((unwindMm / 7).toInt().coerceAtLeast(2)) } - printerManager.commit().fold( - onSuccess = { - delay(1000) - printerManager.closeDevice() - Result.success(Unit) - }, - onFailure = { Result.failure(it) } - ) + printerManager.commit() } catch (e: Exception) { Result.failure(e) } @@ -73,14 +65,7 @@ object PrintHelper { } else { printerManager.addLineFeed((unwindMm / 7).toInt().coerceAtLeast(2)) } - printerManager.commit().fold( - onSuccess = { - delay(1000) - printerManager.closeDevice() - Result.success(Unit) - }, - onFailure = { Result.failure(it) } - ) + printerManager.commit() } catch (e: Exception) { Result.failure(e) } @@ -111,14 +96,7 @@ object PrintHelper { } else { printerManager.addLineFeed((unwindMm / 7).toInt().coerceAtLeast(2)) } - printerManager.commit().fold( - onSuccess = { - delay(1000) - printerManager.closeDevice() - Result.success(Unit) - }, - onFailure = { Result.failure(it) } - ) + printerManager.commit() } catch (e: Exception) { Result.failure(e) } @@ -149,14 +127,7 @@ object PrintHelper { } else { printerManager.addLineFeed((unwindMm / 7).toInt().coerceAtLeast(2)) } - printerManager.commit().fold( - onSuccess = { - delay(1000) - printerManager.closeDevice() - Result.success(Unit) - }, - onFailure = { Result.failure(it) } - ) + printerManager.commit() } catch (e: Exception) { Result.failure(e) } diff --git a/app/src/main/java/com/example/ops_android/printer/PrintJob.kt b/app/src/main/java/com/example/ops_android/printer/PrintJob.kt index 3c9eb64..4f6c6ef 100644 --- a/app/src/main/java/com/example/ops_android/printer/PrintJob.kt +++ b/app/src/main/java/com/example/ops_android/printer/PrintJob.kt @@ -46,8 +46,6 @@ class PrintJob(private val manager: PrinterManager) { if (lineFeeds > 0) manager.addLineFeed(lineFeeds).getOrThrow() manager.commit().getOrThrow() - Thread.sleep(1500) - manager.closeDevice().getOrThrow() } /** 初始化 → 添加内容 → 提交(不关闭) */ diff --git a/app/src/main/java/com/example/ops_android/printer/PrinterManager.kt b/app/src/main/java/com/example/ops_android/printer/PrinterManager.kt index 93e55e4..6f98893 100644 --- a/app/src/main/java/com/example/ops_android/printer/PrinterManager.kt +++ b/app/src/main/java/com/example/ops_android/printer/PrinterManager.kt @@ -301,8 +301,6 @@ class PrinterManager(private val context: Context) { initDevice().getOrThrow() addText(text).getOrThrow() commit().getOrThrow() - Thread.sleep(1500) - closeDevice().getOrThrow() } fun quickLabel(text: String): Result = runCatching { @@ -310,8 +308,6 @@ class PrinterManager(private val context: Context) { enableMarkDetection(true).getOrThrow() addText(text).getOrThrow() commit().getOrThrow() - Thread.sleep(1500) - closeDevice().getOrThrow() } /** 创建链式打印任务 */ diff --git a/app/src/main/java/com/example/ops_android/ui/settings/PrinterTestScreen.kt b/app/src/main/java/com/example/ops_android/ui/settings/PrinterTestScreen.kt index 00bebb1..9ddc743 100644 --- a/app/src/main/java/com/example/ops_android/ui/settings/PrinterTestScreen.kt +++ b/app/src/main/java/com/example/ops_android/ui/settings/PrinterTestScreen.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import com.example.ops_android.ui.LocalAppContainer import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -120,8 +119,6 @@ fun PrinterTestScreen(onBack: () -> Unit) { val pm = printerManager!! pm.initDevice().getOrThrow() pm.commit().getOrThrow() - delay(1000) - pm.closeDevice().getOrThrow() } }, modifier = Modifier.fillMaxWidth(), @@ -137,8 +134,6 @@ fun PrinterTestScreen(onBack: () -> Unit) { pm.initDevice().getOrThrow() pm.addLineFeed(5) pm.commit().getOrThrow() - delay(1000) - pm.closeDevice().getOrThrow() } }, modifier = Modifier.fillMaxWidth(), @@ -155,8 +150,6 @@ fun PrinterTestScreen(onBack: () -> Unit) { pm.initDevice().getOrThrow() pm.addLineFeed(10) pm.commit().getOrThrow() - delay(1000) - pm.closeDevice().getOrThrow() } }, modifier = Modifier.fillMaxWidth(),