From 13351066752849ca8317d742fe0262c0c3e54ccb Mon Sep 17 00:00:00 2001
From: gongheng <gongheng@uniontech.com>
Date: Tue, 29 Jul 2025 14:49:07 +0800
Subject: [PATCH] Chore: [cppcheck] Resolve issue identified by cppcheck

-- Variable 'ret' is reassinged a value befor the old one has been used.
---
 .../src/DeviceManager/DeviceComputer.cpp      |  8 ++---
 .../src/DeviceManager/DeviceCpu.cpp           | 36 +++++++++----------
 .../src/DeviceManager/DeviceImage.cpp         | 12 +++----
 .../src/DeviceManager/DeviceInput.cpp         | 10 +++---
 .../src/DeviceManager/DeviceMemory.cpp        | 20 +++++------
 .../src/DeviceManager/DeviceMonitor.cpp       | 20 +++++------
 .../src/DeviceManager/DeviceNetwork.cpp       | 36 +++++++++----------
 .../src/DeviceManager/DeviceOtherPCI.cpp      | 16 ++++-----
 .../src/DeviceManager/DeviceOthers.cpp        | 14 ++++----
 .../src/DeviceManager/DevicePower.cpp         | 26 +++++++-------
 .../src/DeviceManager/DevicePrint.cpp         | 14 ++++----
 .../src/DeviceManager/DeviceStorage.cpp       | 16 ++++-----
 12 files changed, 114 insertions(+), 114 deletions(-)

diff --git a/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp b/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
index 5fc1c890e..a263e9262 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
@@ -24,10 +24,10 @@ TomlFixMethod DeviceComputer::setInfoFromTomlOneByOne(const QMap<QString, QStrin
         TomlFixMethod ret = TOML_None;
 //  must cover the  loadOtherDeviceInfo
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "HOME_URL", m_HomeUrl);
-    ret = setTomlAttribute(mapInfo, "Type", m_Type);
-    ret = setTomlAttribute(mapInfo, "vendor", m_Vendor);
-    ret = setTomlAttribute(mapInfo, "OS", m_OS);
+    setTomlAttribute(mapInfo, "HOME_URL", m_HomeUrl);
+    setTomlAttribute(mapInfo, "Type", m_Type);
+    setTomlAttribute(mapInfo, "vendor", m_Vendor);
+    setTomlAttribute(mapInfo, "OS", m_OS);
     ret = setTomlAttribute(mapInfo, "OsDescription", m_OsDescription);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
index 8c2a23353..5ec65742b 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
@@ -216,25 +216,25 @@ TomlFixMethod DeviceCpu::setInfoFromTomlOneByOne(const QMap<QString, QString> &m
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "CPU ID", m_PhysicalID);
-    ret = setTomlAttribute(mapInfo, "Core ID", m_CoreID);
-    ret = setTomlAttribute(mapInfo, "Threads", m_ThreadNum);
-    ret = setTomlAttribute(mapInfo, "Frequency", m_Frequency);
-    ret = setTomlAttribute(mapInfo, "Current Frequency", m_CurFrequency);
-    ret = setTomlAttribute(mapInfo, "Max Frequency", m_MaxFrequency);
-    ret = setTomlAttribute(mapInfo, "BogoMIPS", m_BogoMIPS);
-    ret = setTomlAttribute(mapInfo, "Architecture", m_Architecture);
-    ret = setTomlAttribute(mapInfo, "CPU Family", m_Familly);
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "CPU ID", m_PhysicalID);
+    setTomlAttribute(mapInfo, "Core ID", m_CoreID);
+    setTomlAttribute(mapInfo, "Threads", m_ThreadNum);
+    setTomlAttribute(mapInfo, "Frequency", m_Frequency);
+    setTomlAttribute(mapInfo, "Current Frequency", m_CurFrequency);
+    setTomlAttribute(mapInfo, "Max Frequency", m_MaxFrequency);
+    setTomlAttribute(mapInfo, "BogoMIPS", m_BogoMIPS);
+    setTomlAttribute(mapInfo, "Architecture", m_Architecture);
+    setTomlAttribute(mapInfo, "CPU Family", m_Familly);
+    setTomlAttribute(mapInfo, "Model", m_Model);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
-    ret = setTomlAttribute(mapInfo, "Flags", m_Flags);
-    ret = setTomlAttribute(mapInfo, "Extensions", m_Extensions);
-    ret = setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
-    ret = setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
-    ret = setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
-    ret = setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
-    ret = setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data);
+    setTomlAttribute(mapInfo, "Virtualization", m_HardwareVirtual);
+    setTomlAttribute(mapInfo, "Flags", m_Flags);
+    setTomlAttribute(mapInfo, "Extensions", m_Extensions);
+    setTomlAttribute(mapInfo, "L4 Cache", m_CacheL4);
+    setTomlAttribute(mapInfo, "L3 Cache", m_CacheL3);
+    setTomlAttribute(mapInfo, "L2 Cache", m_CacheL2);
+    setTomlAttribute(mapInfo, "L1i Cache", m_CacheL1Order);
+    setTomlAttribute(mapInfo, "L1d Cache", m_CacheL1Data);
     ret = setTomlAttribute(mapInfo, "Stepping", m_Step);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
index 53f3608a0..6a39ec33d 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
@@ -44,13 +44,13 @@ TomlFixMethod DeviceImage::setInfoFromTomlOneByOne(const QMap<QString, QString>
     TomlFixMethod ret = TOML_None;
 
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Version", m_Version);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Version", m_Version);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
     ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialID);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp b/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
index 3c04e15b3..23de65159 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
@@ -67,12 +67,12 @@ TomlFixMethod DeviceInput::setInfoFromTomlOneByOne(const QMap<QString, QString>
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Interface", m_Interface);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Interface", m_Interface);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Maximum Current", m_MaximumPower);   // 将最大功率改为最大电流
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Maximum Current", m_MaximumPower);   // 将最大功率改为最大电流
     ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
 
 //3. 获取设备的其它信息
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
index 01385cbe3..bd52da9ae 100755
--- a/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
@@ -54,17 +54,17 @@ TomlFixMethod DeviceMemory::setInfoFromTomlOneByOne(const QMap<QString, QString>
 {
     TomlFixMethod ret = TOML_None;
         // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Size", m_Size);
-    ret = setTomlAttribute(mapInfo, "Type", m_Type);
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Total Width", m_TotalBandwidth);
-    ret = setTomlAttribute(mapInfo, "Locator", m_Locator);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Size", m_Size);
+    setTomlAttribute(mapInfo, "Type", m_Type);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Total Width", m_TotalBandwidth);
+    setTomlAttribute(mapInfo, "Locator", m_Locator);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Configured Voltage", m_ConfiguredVoltage);
-    ret = setTomlAttribute(mapInfo, "Maximum Voltage", m_MaximumVoltage);
-    ret = setTomlAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
-    ret = setTomlAttribute(mapInfo, "Configured Speed", m_ConfiguredSpeed);
+    setTomlAttribute(mapInfo, "Configured Voltage", m_ConfiguredVoltage);
+    setTomlAttribute(mapInfo, "Maximum Voltage", m_MaximumVoltage);
+    setTomlAttribute(mapInfo, "Minimum Voltage", m_MinimumVoltage);
+    setTomlAttribute(mapInfo, "Configured Speed", m_ConfiguredSpeed);
     ret = setTomlAttribute(mapInfo, "Data Width", m_DataBandwidth);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
index b590dad69..cecadcdb8 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
@@ -136,17 +136,17 @@ TomlFixMethod DeviceMonitor::setInfoFromTomlOneByOne(const QMap<QString, QString
         m_IsTomlSet = true;
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Type", m_Model);
-    ret = setTomlAttribute(mapInfo, "Display Input", m_DisplayInput);
-    ret = setTomlAttribute(mapInfo, "Interface Type", m_Interface);
+    setTomlAttribute(mapInfo, "Type", m_Model);
+    setTomlAttribute(mapInfo, "Display Input", m_DisplayInput);
+    setTomlAttribute(mapInfo, "Interface Type", m_Interface);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Support Resolution", m_SupportResolution);
-    ret = setTomlAttribute(mapInfo, "Current Resolution", m_CurrentResolution);
-    ret = setTomlAttribute(mapInfo, "Display Ratio", m_AspectRatio);
-    ret = setTomlAttribute(mapInfo, "Primary Monitor", m_MainScreen);
-    ret = setTomlAttribute(mapInfo, "Size", m_ScreenSize);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
-    ret = setTomlAttribute(mapInfo, "Product Date", m_ProductionWeek);
+    setTomlAttribute(mapInfo, "Support Resolution", m_SupportResolution);
+    setTomlAttribute(mapInfo, "Current Resolution", m_CurrentResolution);
+    setTomlAttribute(mapInfo, "Display Ratio", m_AspectRatio);
+    setTomlAttribute(mapInfo, "Primary Monitor", m_MainScreen);
+    setTomlAttribute(mapInfo, "Size", m_ScreenSize);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Product Date", m_ProductionWeek);
     ret = setTomlAttribute(mapInfo, "Refresh Rate", m_RefreshRate);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp b/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
index 805bdee55..68799a50e 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
@@ -93,27 +93,27 @@ TomlFixMethod DeviceNetwork::setInfoFromTomlOneByOne(const QMap<QString, QString
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Type", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
-    ret = setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
+    setTomlAttribute(mapInfo, "Type", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Maximum Rate", m_Capacity);
-    ret = setTomlAttribute(mapInfo, "Negotiation Rate", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Port", m_Port);
-    ret = setTomlAttribute(mapInfo, "Multicast", m_Multicast);
-    ret = setTomlAttribute(mapInfo, "Link", m_Link);
-    ret = setTomlAttribute(mapInfo, "Latency", m_Latency);
-    ret = setTomlAttribute(mapInfo, "IP", m_Ip);
-    ret = setTomlAttribute(mapInfo, "Firmware", m_Firmware);
-    ret = setTomlAttribute(mapInfo, "Duplex", m_Duplex);
-    ret = setTomlAttribute(mapInfo, "Broadcast", m_Broadcast);
-    ret = setTomlAttribute(mapInfo, "Auto Negotiation", m_Autonegotiation);
+    setTomlAttribute(mapInfo, "Maximum Rate", m_Capacity);
+    setTomlAttribute(mapInfo, "Negotiation Rate", m_Speed);
+    setTomlAttribute(mapInfo, "Port", m_Port);
+    setTomlAttribute(mapInfo, "Multicast", m_Multicast);
+    setTomlAttribute(mapInfo, "Link", m_Link);
+    setTomlAttribute(mapInfo, "Latency", m_Latency);
+    setTomlAttribute(mapInfo, "IP", m_Ip);
+    setTomlAttribute(mapInfo, "Firmware", m_Firmware);
+    setTomlAttribute(mapInfo, "Duplex", m_Duplex);
+    setTomlAttribute(mapInfo, "Broadcast", m_Broadcast);
+    setTomlAttribute(mapInfo, "Auto Negotiation", m_Autonegotiation);
 //    ret = setTomlAttribute(mapInfo, "Clock", m_Clock);
 //    ret = setTomlAttribute(mapInfo, "Width", m_Width);
-    ret = setTomlAttribute(mapInfo, "Memory Address", m_Memory);
-    ret = setTomlAttribute(mapInfo, "IRQ", m_Irq);
-    ret = setTomlAttribute(mapInfo, "MAC Address", m_MACAddress);
+    setTomlAttribute(mapInfo, "Memory Address", m_Memory);
+    setTomlAttribute(mapInfo, "IRQ", m_Irq);
+    setTomlAttribute(mapInfo, "MAC Address", m_MACAddress);
     ret = setTomlAttribute(mapInfo, "Logical Name", m_LogicalName);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp b/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
index c50d4a247..2b234b7d9 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
@@ -23,17 +23,17 @@ DeviceOtherPCI::DeviceOtherPCI()
 TomlFixMethod DeviceOtherPCI::setInfoFromTomlOneByOne(const QMap<QString, QString> &mapInfo)
 {
     TomlFixMethod ret = TOML_None;
-   // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    // 添加基本信息
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
 
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Input/Output", m_InputOutput);
-    ret = setTomlAttribute(mapInfo, "Memory", m_Memory);
-    ret = setTomlAttribute(mapInfo, "IRQ", m_Irq);
-    ret = setTomlAttribute(mapInfo, "Latency", m_Latency);
+    setTomlAttribute(mapInfo, "Input/Output", m_InputOutput);
+    setTomlAttribute(mapInfo, "Memory", m_Memory);
+    setTomlAttribute(mapInfo, "IRQ", m_Irq);
+    setTomlAttribute(mapInfo, "Latency", m_Latency);
     ret = setTomlAttribute(mapInfo, "Capabilities", m_Version);
-//3. 获取设备的其它信息
+    //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp b/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
index 96e1b6486..e049ac577 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
@@ -53,14 +53,14 @@ TomlFixMethod DeviceOthers::setInfoFromTomlOneByOne(const QMap<QString, QString>
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
-    ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-////Others
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    // Others
     ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialID);
-//3. 获取设备的其它信息
+    // 3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DevicePower.cpp b/deepin-devicemanager/src/DeviceManager/DevicePower.cpp
index 81fc412ef..c55070a46 100644
--- a/deepin-devicemanager/src/DeviceManager/DevicePower.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DevicePower.cpp
@@ -44,19 +44,19 @@ TomlFixMethod DevicePower::setInfoFromTomlOneByOne(const QMap<QString, QString>
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息    
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);    
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
-    ret = setTomlAttribute(mapInfo, "Type", m_Type);
-    ret = setTomlAttribute(mapInfo, "Status", m_Status);
-    ret = setTomlAttribute(mapInfo, "Capacity", m_Capacity);
-    ret = setTomlAttribute(mapInfo, "Voltage", m_Voltage);
-    ret = setTomlAttribute(mapInfo, "Slot", m_Slot);
-    ret = setTomlAttribute(mapInfo, "Design Capacity", m_DesignCapacity);
-    ret = setTomlAttribute(mapInfo, "Design Voltage", m_DesignVoltage);
-    ret = setTomlAttribute(mapInfo, "SBDS Version", m_SBDSVersion);
-    ret = setTomlAttribute(mapInfo, "SBDS Serial Number", m_SBDSSerialNumber);
-    ret = setTomlAttribute(mapInfo, "SBDS Manufacture Date", m_SBDSManufactureDate);
-    ret = setTomlAttribute(mapInfo, "SBDS Chemistry", m_SBDSChemistry);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Type", m_Type);
+    setTomlAttribute(mapInfo, "Status", m_Status);
+    setTomlAttribute(mapInfo, "Capacity", m_Capacity);
+    setTomlAttribute(mapInfo, "Voltage", m_Voltage);
+    setTomlAttribute(mapInfo, "Slot", m_Slot);
+    setTomlAttribute(mapInfo, "Design Capacity", m_DesignCapacity);
+    setTomlAttribute(mapInfo, "Design Voltage", m_DesignVoltage);
+    setTomlAttribute(mapInfo, "SBDS Version", m_SBDSVersion);
+    setTomlAttribute(mapInfo, "SBDS Serial Number", m_SBDSSerialNumber);
+    setTomlAttribute(mapInfo, "SBDS Manufacture Date", m_SBDSManufactureDate);
+    setTomlAttribute(mapInfo, "SBDS Chemistry", m_SBDSChemistry);
     ret = setTomlAttribute(mapInfo, "Temperature", m_Temp);
 //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
diff --git a/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp b/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
index 3fe00334f..5da2da2e4 100644
--- a/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
@@ -31,15 +31,15 @@ TomlFixMethod DevicePrint::setInfoFromTomlOneByOne(const QMap<QString, QString>
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Shared", m_Shared);
-    ret = setTomlAttribute(mapInfo, "URI", m_URI);
-    ret = setTomlAttribute(mapInfo, "Status", m_Status);
-    ret = setTomlAttribute(mapInfo, "Interface Type", m_InterfaceType);
+    setTomlAttribute(mapInfo, "Shared", m_Shared);
+    setTomlAttribute(mapInfo, "URI", m_URI);
+    setTomlAttribute(mapInfo, "Status", m_Status);
+    setTomlAttribute(mapInfo, "Interface Type", m_InterfaceType);
     ret = setTomlAttribute(mapInfo, "printer-make-and-model", m_MakeAndModel);
-//3. 获取设备的其它信息
+    // 3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }
diff --git a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
index 2019a43c6..0c0d88e4a 100644
--- a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
+++ b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
@@ -41,16 +41,16 @@ TomlFixMethod DeviceStorage::setInfoFromTomlOneByOne(const QMap<QString, QString
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Media Type", m_MediaType);
-    ret = setTomlAttribute(mapInfo, "Size", m_Size);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Media Type", m_MediaType);
+    setTomlAttribute(mapInfo, "Size", m_Size);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Firmware Version", m_FirmwareVersion);
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
-    ret = setTomlAttribute(mapInfo, "Interface", m_Interface);
+    setTomlAttribute(mapInfo, "Firmware Version", m_FirmwareVersion);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Serial Number", m_SerialNumber);
+    setTomlAttribute(mapInfo, "Interface", m_Interface);
     ret = setTomlAttribute(mapInfo, "Rotation Rate", m_RotationRate);
-    //3. 获取设备的其它信息
+    // 3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }