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
37 changes: 35 additions & 2 deletions config/org.deepin.dde.network.json
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,7 @@
"visibility": "private"
},
"ConnectivityCheckInterval": {
"value": 30,
"value": 150,
"serial": 0,
"flags": [],
"name": "ConnectivityCheckInterval",
Expand Down Expand Up @@ -307,6 +307,39 @@
"description": "if network connect failure: true:do not notify message, false:notify message",
"permissions": "readwrite",
"visibility": "private"
}
},
"httpRequestTimeout":{
"value": 15,
"serial": 0,
"flags":["global"],
"name":"httpRequestTimeout",
"name[zh_CN]":"HTTP请求超时时间",
"description[zh_CN]":"HTTP请求超时时间(单位:秒),默认15秒",
"description":"HTTP request timeout in seconds, default 15 seconds",
"permissions":"readwrite",
"visibility":"private"
},
"httpConnectTimeout":{
"value": 10,
"serial": 0,
"flags":["global"],
"name":"httpConnectTimeout",
"name[zh_CN]":"HTTP连接超时时间",
"description[zh_CN]":"HTTP连接超时时间(单位:秒),默认10秒",
"description":"HTTP connection timeout in seconds, default 10 seconds",
"permissions":"readwrite",
"visibility":"private"
},
"ConnectivityIntervalWhenLimit":{
"value":30,
"serial":0,
"flags":["global"],
"name":"ConnectivityIntervalWhenLimit",
"name[zh_CN]":"网络不通的时候检测网络联通性的时间间隔(单位:秒)",
"description[zh_CN]":"网络不通的时候检测网络联通性的时间间隔(单位:秒)",
"description":"the span to check connectivity(unit:second) when limit",
"permissions":"readwrite",
"visibility":"private"
}
}
}
3 changes: 2 additions & 1 deletion debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ Build-Depends: debhelper-compat (= 12),
libdtk6core-dev,
libdtk6widget-dev,
libgsettings-qt6-dev,
libkf6networkmanagerqt-dev
libkf6networkmanagerqt-dev,
libcurl4-openssl-dev
Rules-Requires-Root: no
Standards-Version: 4.5.0
Homepage: https://gerrit.uniontech.com/admin/repos/dde-network-core
Expand Down
3 changes: 3 additions & 0 deletions network-service-plugin/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ set(CMAKE_PREFER_PTHREAD_FLAG ON)
find_package(Qt${QT_NS} COMPONENTS Core Widgets DBus Network LinguistTools REQUIRED)
find_package(KF${QT_NS}NetworkManagerQt REQUIRED)
find_package(${DTK_NS} COMPONENTS Core REQUIRED)
find_package(CURL REQUIRED)

pkg_check_modules(LibNM REQUIRED IMPORTED_TARGET libnm)
pkg_check_modules(QGSettings REQUIRED gsettings-qt6)
Expand All @@ -44,6 +45,7 @@ target_include_directories(${BIN_NAME} PUBLIC
KF${QT_NS}::NetworkManagerQt
${DTK_NS}::Core
${QGSettings_INCLUDE_DIRS}
${CURL_INCLUDE_DIRS}
src
src/system
src/session
Expand All @@ -61,6 +63,7 @@ target_link_libraries(${BIN_NAME} PRIVATE
KF${QT_NS}::NetworkManagerQt
${DTK_NS}::Core
${QGSettings_LIBRARIES}
${CURL_LIBRARIES}
)

if (CMAKE_BUILD_TYPE STREQUAL "Debug")
Expand Down
Loading