update changelog,control,install,pc,网络，瞬时信息，地理位置

2022-10-18 09:21:30 +08:00 · 2022-10-18 09:21:30 +08:00 · 1cd8e4fb90
parent 6c9b8e0511
commit 1cd8e4fb90
11 changed files with 70 additions and 40 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -2,9 +2,17 @@ libkysdk-system (2.0.0.0) v101; urgency=medium

  *Bug号：
  *需求号：
-  *其他修改：sdk2.0开发
+  *其他修改：[新增] 新增获取网卡有线无线类型厂家信息、以及模块信息接口
+          [新增] 新增获取bios信息接口
+          [新增] 新增获取主板信息接口
+          [新增] 新增获取网关信息，获取指定端口状态接口
+          [新增] 新增获取系统中usb设备信息接口
+          [新增] 新增获取cpu温度，获取指定硬盘温度，获取瞬时网速接口
+          [新增] 新增获取分辨率接口
+          [新增] 新增根据进程号获取进程信息接口，根据进程名获取进程信息接口，获取进程全部信息接口
+          [修改] 新增获取磁盘信息接口

- -- shaozhimin <shaozhimin@kylinos.cn>  Fri, 14 Oct 2022 09:22:40 +0800
+ -- shaozhimin <shaozhimin@kylinos.cn>  Fri, 17 Oct 2022 09:22:40 +0800

 libkysdk-system (1.2.1.1) v101; urgency=medium

--- a/debian/control
+++ b/debian/control
@ -20,7 +20,6 @@ Build-Depends: debhelper-compat (= 12),
            libopencv-dev,
            libarchive-dev,
            libtesseract-dev,
-            libpython3.8-dev,
            libxrandr-dev
 Standards-Version: 4.4.1
 Homepage: http://gitlab2.kylin.com/kysdk/kysdk-system
@ -283,24 +282,23 @@ Depends:  ${shlibs:Depends},
 Multi-Arch: same
 Description: kysdk-system层公用数据包

-Package: libkysdk-location
-Architecture: any
-Section: utils
-Depends:  ${shlibs:Depends},
-        ${misc:Depends},
-        libkysdk-systemcommon,
-        libpython3.8
-Multi-Arch: same
-Description: 地理位置库
+# Package: libkysdk-location
+# Architecture: any
+# Section: utils
+# Depends:  ${shlibs:Depends},
+#         ${misc:Depends},
+#         libkysdk-systemcommon,
+# Multi-Arch: same
+# Description: 地理位置库

-Package: libkysdk-location-dev
-Architecture: any
-Section: utils
-Depends:  ${shlibs:Depends},
-        ${misc:Depends},
-        libkysdk-location
-Multi-Arch: same
-Description: 地理位置库 - 开发库
+# Package: libkysdk-location-dev
+# Architecture: any
+# Section: utils
+# Depends:  ${shlibs:Depends},
+#         ${misc:Depends},
+#         libkysdk-location
+# Multi-Arch: same
+# Description: 地理位置库 - 开发库

 Package: libkysdk-net
 Architecture: any
--- a/debian/libkysdk-location-dev.install
+++ b/debian/libkysdk-location-dev.install
@ -1,2 +0,0 @@
-usr/include/kysdk/kysdk-system/libkylocation.h
-development-files/kysdk-location.pc usr/share/pkgconfig/
--- a/debian/libkysdk-location.install
+++ b/debian/libkysdk-location.install
@ -1,2 +0,0 @@
-usr/lib/kysdk/kysdk-system/libkylocation.so*
-src/location/location.py usr/lib/kysdk/kysdk-system
--- a/development-files/kysdk-location.pc
+++ b/development-files/kysdk-location.pc
@ -1,6 +1,6 @@
 Name: libkysdk-location
 Description: kysdk system layer location
-Requires: libpython3.8
+Requires:
 Version: 2.0.0
 Libs: -L/usr/lib/kysdk/kysdk-system/ -lkylocation -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
 Cflags: -I/usr/include/kysdk/kysdk-system/
--- a/development-files/kysdk-system.pc
+++ b/development-files/kysdk-system.pc
@ -1,6 +1,6 @@
 Name: libkysdk-system
 Description: kysdk system layer
-Requires: kysdk-disk kysdk-filesystem kysdk-hardware kysdk-package kysdk-proc kysdk-sysinfo 
+Requires: kysdk-disk kysdk-filesystem kysdk-hardware kysdk-package kysdk-proc kysdk-sysinfo kysdk-location kysdk-net kysdk-realtime
 Version: 2.0.0
-Libs: -L/usr/lib/kysdk/kysdk-system/ -lkydiskinfo -lkyfilewatcher -lkyhw -lkypackage -lkysysinfo -lkyrtinfo -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
+Libs: -L/usr/lib/kysdk/kysdk-system/ -lkydiskinfo -lkyfilewatcher -lkyhw -lkypackage -lkysysinfo -lkyrtinfo -lkylocation -lkynetinfo -lkyrealtime -Wl,-rpath=/usr/lib/kysdk/kysdk-system/
 Cflags: -I/usr/include/kysdk/kysdk-system/
--- a/src/location/CMakeLists.txt
+++ b/src/location/CMakeLists.txt
@ -1,12 +1,12 @@
-include_directories("/usr/include/python3.8")
-add_library(kylocation SHARED libkylocation.c)
-set_target_properties(kylocation PROPERTIES VERSION 2.0.0 SOVERSION 1)
-target_link_libraries(kylocation -lpython3.8)
-add_executable(kylocation-test test/kylocation-test.c)
-target_link_libraries(kylocation-test kylocation)
+# include_directories("/usr/include/python3.8")
+# add_library(kylocation SHARED libkylocation.c)
+# set_target_properties(kylocation PROPERTIES VERSION 2.0.0 SOVERSION 1)
+# target_link_libraries(kylocation -lpython3.8)
+# add_executable(kylocation-test test/kylocation-test.c)
+# target_link_libraries(kylocation-test kylocation)

-install(TARGETS kylocation
-        DESTINATION lib/kysdk/kysdk-system)
+# install(TARGETS kylocation
+#         DESTINATION lib/kysdk/kysdk-system)

-install(FILES libkylocation.h
-        DESTINATION include/kysdk/kysdk-system)
+# install(FILES libkylocation.h
+#         DESTINATION include/kysdk/kysdk-system)
--- a/src/location/libkylocation.c
+++ b/src/location/libkylocation.c
@ -9,7 +9,7 @@ char *kdk_loaction_get()
    PyRun_SimpleString("import sys");

    //是将搜索路径设置为当前目录。
-    PyRun_SimpleString("sys.path.append('.')");
+    PyRun_SimpleString("sys.path.append('/usr/lib/kysdk/kysdk-system')");
    //    PyRun_SimpleString("from location import getAddress");
    //    PyRun_SimpleString("print(getAddress())");

--- a/src/net/libkynetinfo.c
+++ b/src/net/libkynetinfo.c
@ -30,7 +30,7 @@ static void parse_port_state(int *st, int port, FILE *fp)
                     "%d: %64[0-9A-Fa-f]:%X %64[0-9A-Fa-f]:%X %X %lX:%lX %X:%lX %lX %d %d %lu %*s\n",
                     &d, local_addr, &local_port, rem_addr, &rem_port, &state,
                     &txq, &rxq, &timer_run, &time_len, &retr, &uid, &timeout, &inode);
-        if (local_port = port)
+        if (local_port == port)
        {
            *st = state;
            break;
--- a/src/realtime/libkyrealtimeinfo.cpp
+++ b/src/realtime/libkyrealtimeinfo.cpp
@ -37,7 +37,24 @@ float RealTimeInfo::kdk_real_get_net_speed()
 float RealTimeInfo::kdk_real_get_cpu_temperature()
 {
    char tmp[32] = "\0";
-    FILE *fp = fopen("/sys/class/hwmon/hwmon1/temp1_input","r");
+    char path[64] = "\0";
+    for(int i = 1; i; i++)
+    {
+        memset(path,0,64);
+        snprintf(path,64,"/sys/class/hwmon/hwmon%d",i);
+        if (0 != access(path, F_OK))
+        {
+            snprintf(path,64,"/sys/class/hwmon/hwmon1/temp1_input");
+            break;
+        }
+        snprintf(path,64,"/sys/class/hwmon/hwmon%d/name",i);
+        if (0 != access(path, F_OK))
+            continue;
+        else
+        snprintf(path,64,"/sys/class/hwmon/hwmon%d/temp1_input",i);
+    }
+    
+    FILE *fp = fopen(path,"r");
    if(fp)
    {
        fgets(tmp,sizeof(tmp),fp);
@ -49,8 +66,13 @@ float RealTimeInfo::kdk_real_get_cpu_temperature()

 float RealTimeInfo::kdk_real_get_disk_temperature(const char *name)
 {
+    nvmeTemp = "";
+    sataTemp = "";
    if(0 == main_worker(name))
+    {
+        printf("Temp %s\n",nvmeTemp.empty() ? sataTemp.c_str() : nvmeTemp.c_str());
        return atof(nvmeTemp.empty() ? sataTemp.c_str() : nvmeTemp.c_str());
+    }
    return -1;
 }

--- a/src/systeminfo/libkysysinfo.c
+++ b/src/systeminfo/libkysysinfo.c
@ -923,6 +923,12 @@ char** kdk_system_get_resolving_power()
                                continue;
                            }
                        }
+                    }else{
+                        memset(mode,0,200*sizeof(char));
+                        memset(ret,0,200*sizeof(char));
+                        strcpy(ret, name);
+                        strcat(mode,ret);
+                        strcat(mode," ");
                    }
                }
                strcat(tmp, mode);