日志服务完善, 添加基本测试逻辑

This commit is contained in:
JIe Jie 2024-07-08 18:31:50 +08:00
parent 3ead5ce0b6
commit 8a12c47a1f
3 changed files with 28 additions and 5 deletions

View File

@ -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::<usize>(){
if let Ok(line) = set_dialog.line_textbox.value().parse::<usize>() {
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) {

View File

@ -35,7 +35,28 @@ impl WorkService {
pub fn write_and_check(&mut self, model: WorkModel) -> Result<bool, String> {
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)
}

Binary file not shown.