feat: 新增pgw判断

新增pgw判断 Log: 新增pgw判断
wyu71 · Jun 29, 2023 · ce8ab16 · ce8ab16
1 parent 9f39274
commit ce8ab16
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Thanks a lot for [Lily Rivers](https://github.com/VioletDarkKitty/system-monito
 
 ## Dependencies
 
-* sudo apt install libpcap-dev libncurses5-dev libprocps-dev libxtst-dev libxcb-util0-dev
+* sudo apt install libpcap-dev libncurses5-dev  libxtst-dev libxcb-util0-dev
 
 ## Installation
 

diff --git a/README.zh_CN.md b/README.zh_CN.md
@@ -6,7 +6,7 @@ Thanks a lot for [Lily Rivers](https://github.com/VioletDarkKitty/system-monito
 
 ## 依赖关系
 
-* sudo apt install libpcap-dev libncurses5-dev libprocps-dev libxtst-dev libxcb-util0-dev
+* sudo apt install libpcap-dev libncurses5-dev libxtst-dev libxcb-util0-dev
 
 ## 安装
 

diff --git a/debian/control b/debian/control
@@ -2,7 +2,7 @@ Source: deepin-system-monitor
 Section: utils
 Priority: optional
 Maintainer: Deepin Packages Builder <[email protected]>
-Build-Depends: debhelper (>= 11), cmake, pkg-config, qtbase5-dev, qttools5-dev, libdtkwidget-dev, libxcb1-dev, libqt5x11extras5-dev, libprocps-dev, libxext-dev, libpcap-dev, qttools5-dev-tools, libicu-dev, deepin-gettext-tools, libxcb-util0-dev, libxcb-icccm4-dev, libnl-3-dev, libnl-route-3-dev, libudev-dev, libgsettings-qt-dev, dde-dock-dev, libgtest-dev, libgmock-dev, libdwayland-dev
+Build-Depends: debhelper (>= 11), cmake, pkg-config, qtbase5-dev, qttools5-dev, libdtkwidget-dev, libxcb1-dev, libqt5x11extras5-dev, libxext-dev, libpcap-dev, qttools5-dev-tools, libicu-dev, deepin-gettext-tools, libxcb-util0-dev, libxcb-icccm4-dev, libnl-3-dev, libnl-route-3-dev, libudev-dev, libgsettings-qt-dev, dde-dock-dev, libgtest-dev, libgmock-dev, libdwayland-dev
 Standards-Version: 3.9.8
 Homepage: https://github.com/linuxdeepin/deepin-system-monitor
 

diff --git a/deepin-system-monitor-main/CMakeLists.txt b/deepin-system-monitor-main/CMakeLists.txt
@@ -52,7 +52,6 @@ find_package(DtkCore REQUIRED)
 find_package(DtkGui REQUIRED)
 find_package(DtkWidget REQUIRED)
 find_library(LIB_PCAP NAMES pcap REQUIRED)
-find_library(LIB_PROCPS NAMES procps REQUIRED)
 find_library(LIB_XCB NAMES xcb REQUIRED)
 find_library(LIB_XEXT NAMES Xext REQUIRED)
 find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
@@ -568,7 +567,6 @@ set(LIBS
     dtkwidget
     dtkgui
     ${LIB_PCAP}
-    ${LIB_PROCPS}
     ICU::i18n
     ICU::uc
     ${LIB_XCB}

diff --git a/deepin-system-monitor-main/model/process_table_model.cpp b/deepin-system-monitor-main/model/process_table_model.cpp
@@ -15,6 +15,7 @@
 #include <QPointer>
 using namespace common;
 using namespace common::format;
+DGUI_USE_NAMESPACE // using namespace Dtk::Gui;
 
 // model constructor
 ProcessTableModel::ProcessTableModel(QObject *parent)

diff --git a/deepin-system-monitor-main/system/cpu_set.cpp b/deepin-system-monitor-main/system/cpu_set.cpp
@@ -626,8 +626,15 @@ void CPUSet::read_dmi_cache_info()
     QString spnInfo = process.readAllStandardOutput();
     if (!spnInfo.contains("KLVV", Qt::CaseInsensitive) && !spnInfo.contains("L540", Qt::CaseInsensitive) && !spnInfo.contains("KLVU", Qt::CaseInsensitive)
             && !spnInfo.contains("PGUV", Qt::CaseInsensitive) && !spnInfo.contains("PGUW", Qt::CaseInsensitive) && !spnInfo.contains("W585", Qt::CaseInsensitive)) {
-        process.close();
-        return;
+
+        process.start("bash", QStringList() << "-c" << "dmidecode | grep -i \"String 4\"");
+        process.waitForStarted();
+        process.waitForFinished();
+        QString result = process.readAll();
+        if(!result.contains("PWC30", Qt::CaseInsensitive)){  //w525
+            process.close();
+            return;
+        }
     }
 
     process.start("dmidecode", QStringList() << "-t" << "cache");

diff --git a/deepin-system-monitor-plugin-popup/CMakeLists.txt b/deepin-system-monitor-plugin-popup/CMakeLists.txt
@@ -43,7 +43,6 @@ find_package(DtkCore REQUIRED)
 find_package(DtkGui REQUIRED)
 find_package(DtkWidget REQUIRED)
 find_package(Qt5Svg REQUIRED)
-find_library(LIB_PROPS NAMES procps REQUIRED)
 find_library(LIB_XCB NAMES xcb REQUIRED)
 find_library(LIB_XEXT NAMES Xext REQUIRED)
 find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
@@ -293,7 +292,6 @@ target_link_libraries(${PROJECT_NAME}
     dtkcore
     dtkwidget
     dtkgui
-    ${LIB_PROCPS}
     ICU::i18n
     ICU::uc
     ${LIB_XCB}

diff --git a/deepin-system-monitor-plugin-popup/model/process_table_model.cpp b/deepin-system-monitor-plugin-popup/model/process_table_model.cpp
@@ -16,6 +16,7 @@
 
 using namespace common;
 using namespace common::format;
+DGUI_USE_NAMESPACE // using namespace Dtk::Gui;
 
 // model constructor
 ProcessTableModel::ProcessTableModel(QObject *parent)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -70,7 +70,6 @@ find_package(DtkCore REQUIRED)
 find_package(DtkGui REQUIRED)
 find_package(DtkWidget REQUIRED)
 find_library(LIB_PCAP NAMES pcap REQUIRED)
-find_library(LIB_PROCPS NAMES procps REQUIRED)
 find_library(LIB_XCB NAMES xcb REQUIRED)
 find_library(LIB_XEXT NAMES Xext REQUIRED)
 find_library(LIB_ICCCM NAMES xcb-icccm REQUIRED)
@@ -642,7 +641,6 @@ target_link_libraries(${PROJECT_NAME_TEST}
     KF5::WaylandClient
     KF5::WaylandServer
     ${LIB_PCAP}
-    ${LIB_PROCPS}
     ICU::i18n
     ICU::uc
     ${LIB_XCB}