Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions deepin-devicemanager/src/DeviceManager/DeviceComputer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
36 changes: 18 additions & 18 deletions deepin-devicemanager/src/DeviceManager/DeviceCpu.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions deepin-devicemanager/src/DeviceManager/DeviceImage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
10 changes: 5 additions & 5 deletions deepin-devicemanager/src/DeviceManager/DeviceInput.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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. 获取设备的其它信息
Expand Down
20 changes: 10 additions & 10 deletions deepin-devicemanager/src/DeviceManager/DeviceMemory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
20 changes: 10 additions & 10 deletions deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
36 changes: 18 additions & 18 deletions deepin-devicemanager/src/DeviceManager/DeviceNetwork.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
16 changes: 8 additions & 8 deletions deepin-devicemanager/src/DeviceManager/DeviceOtherPCI.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
14 changes: 7 additions & 7 deletions deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
26 changes: 13 additions & 13 deletions deepin-devicemanager/src/DeviceManager/DevicePower.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
14 changes: 7 additions & 7 deletions deepin-devicemanager/src/DeviceManager/DevicePrint.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
16 changes: 8 additions & 8 deletions deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down