From 8a12c47a1f12415adb1059cc781cea906d941e78 Mon Sep 17 00:00:00 2001 From: JIe Jie Date: Mon, 8 Jul 2024 18:31:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=9C=8D=E5=8A=A1=E5=AE=8C?= =?UTF-8?q?=E5=96=84=EF=BC=8C=20=E6=B7=BB=E5=8A=A0=E5=9F=BA=E6=9C=AC?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/services/ui_service.rs | 10 ++++++---- src/services/work_service.rs | 23 ++++++++++++++++++++++- test_excel.xlsx | Bin 11123 -> 10956 bytes 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/src/services/ui_service.rs b/src/services/ui_service.rs index 53e17e1..802d6c3 100644 --- a/src/services/ui_service.rs +++ b/src/services/ui_service.rs @@ -38,14 +38,14 @@ impl UiService { let mut set_dialog = UserInterface1::make_set_line_window(); let work_service_rc_clone = work_service_rc.clone(); set_dialog.ok_btn.set_callback(move |_| { - if let Ok(line) = set_dialog.line_textbox.value().parse::(){ + if let Ok(line) = set_dialog.line_textbox.value().parse::() { match work_service_rc_clone.borrow_mut().set_current_line(line) { Ok(_) => { ui_clone.borrow_mut().current_line_textbox.set_value(&line.to_string()) } Err(msg) => fltk::dialog::message_default(&msg) } - }else{ + } else { fltk::dialog::message_default(&"Only Support Number") } }) @@ -59,6 +59,9 @@ impl UiService { ui_rc.borrow_mut().start_btn.set_callback(move |_| { let mut ui = ui_rc_clone.borrow_mut(); let mut work_service = work_service_rc.borrow_mut(); + if let Some(mut buffer) = ui.log_content.buffer() { + buffer.set_text(""); + } match work_service.excel_service { None => { fltk::dialog::message_default("Please Select Excel File First;"); @@ -84,7 +87,7 @@ impl UiService { }); } - fn init_log(&mut self){ + fn init_log(&mut self) { let ui_rc = Rc::clone(&self.ui); let text_buffer = TextBuffer::default(); ui_rc.borrow_mut().log_content.set_buffer(text_buffer.clone()); @@ -93,7 +96,6 @@ impl UiService { let mut text_buffer = text_buffer_arc.lock().unwrap(); text_buffer.append(&msg); }); - } fn init_excel(&mut self) { diff --git a/src/services/work_service.rs b/src/services/work_service.rs index 1f864d8..c3d4720 100644 --- a/src/services/work_service.rs +++ b/src/services/work_service.rs @@ -35,7 +35,28 @@ impl WorkService { pub fn write_and_check(&mut self, model: WorkModel) -> Result { let msg = &format!("{}:{}:{}", model.imei, model.sn, model.line_number); - log::info!("Start Write:{}", msg); + log::info!("Write Start"); + if let Err(msg) = self.write_imei(model.imei.clone()) { + log::error!("Write Imei Error:{}", msg); + return Err(msg); + } + log::info!("Write Imei:{}", model.imei); + if let Err(msg) = self.write_sn(model.sn.clone()) { + log::error!("Write Sn Error:{}", msg); + return Err(msg); + } + log::info!("Write End"); + log::info!("Check Start"); + if let Err(msg) = self.check_imei(&model.imei) { + log::error!("Check Imei Error:{}", msg); + return Err(msg); + } + log::info!("Check Imei:{}", model.imei); + if let Err(msg) = self.check_sn(&model.sn) { + log::error!("Check Sn Error:{}", msg); + return Err(msg); + } + log::info!("Check End"); self.serial_service = None; Ok(true) } diff --git a/test_excel.xlsx b/test_excel.xlsx index 7aee25a74b2ca2ac0a75f60bb489add1a8941d9c..c2c7b89f6f2eeecb26d8105c9e5720e8d27b2c45 100644 GIT binary patch delta 2534 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