jie/wisun_download
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复Warning

Browse Source
This commit is contained in:
JIe
2024-12-11 14:13:19 +08:00
parent 410a2ad5e1
commit 969e2c2d5e
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.rs
View File

@@ -12,7 +12,7 @@ use iced::widget::text_editor::Edit;
use iced::widget::{
button, checkbox, column, container, progress_bar, radio, row, text_editor, text_input,
};
use iced::{event, time, window, Background, Border, Color, Element, Event, Length, Subscription, Task};
use iced::{event, time, window, Border, Color, Element, Event, Length, Subscription, Task};
use serde_json::Map;
use std::any::Any;
use std::fs;
@@ -210,10 +210,10 @@ impl MainWindow {
}
Message::WindowEvent(event) => {
//println!("{:?}", event);
if let Event::Window(window::Event::Opened { position, size }) = event {
if let Event::Window(window::Event::Opened { position: _position, size: _size }) = event {
println!("Opened");
self.read_config();
return Task::none();
return Task::none()
};
if let Event::Window(window::Event::CloseRequested) = event {
println!("Request Close");
@@ -336,14 +336,14 @@ impl MainWindow {
}
}
add_log("正在检查JLink连接".to_string());
if let Err(e) = download_wrapper.check_jlink() {
if let Err(_) = download_wrapper.check_jlink() {
add_log("JLink检查失败, 请检查是否安装驱动或连接是否异常".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
}
add_log("JLink检查成功".to_string());
add_log("正在检查设备连接".to_string());
if let Err(e) = download_wrapper.check_device() {
if let Err(_) = download_wrapper.check_device() {
add_log("设备检查失败, 请检查设备是否连接".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
@@ -353,14 +353,14 @@ impl MainWindow {
DownloadType::Bootloader => {}
DownloadType::App => {
add_log("正在擦除Flash".to_string());
if let Err(e) = download_wrapper.erase(Some(label.clone())) {
if let Err(_) = download_wrapper.erase(Some(label.clone())) {
add_log("擦除失败".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
}
add_log("擦除成功".to_string());
add_log("正在下载BootLoader".to_string());
if let Err(e) =
if let Err(_) =
download_wrapper.download(DownloadType::Bootloader, Some(label.clone()))
{
add_log("下载BootLoader失败".to_string());
@@ -369,7 +369,7 @@ impl MainWindow {
}
add_log("下载BootLoader成功".to_string());
add_log("正在下载App".to_string());
if let Err(e) = download_wrapper.download(download_type, Some(label.clone())) {
if let Err(_) = download_wrapper.download(download_type, Some(label.clone())) {
add_log("下载App失败".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;
@@ -378,7 +378,7 @@ impl MainWindow {
}
DownloadType::Rail => {
add_log("正在下载Rail".to_string());
if let Err(e) = download_wrapper.download(download_type, Some(label.clone())) {
if let Err(_) = download_wrapper.download(download_type, Some(label.clone())) {
add_log("下载Rail失败".to_string());
sender.send(Message::DownloadEnd((label, false))).unwrap();
return;