Commit Graph

165 Commits

Author SHA1 Message Date
shaozhimin c58d050dc9 修改control文件 2022-10-20 18:44:52 +08:00
shaozhimin 01fb8f4a11 Merge branch 'printer' into 'v2.0'
Printer

See merge request shaozhimin/kysdk-system!1
2022-10-20 09:25:40 +00:00
shaozhimin 84e5e4984f Merge branch 'v2.0' into 'printer'
# Conflicts:
#   debian/changelog
#   debian/control
#   debian/libkysdk-hardware-dev.install
#   src/hardware/CMakeLists.txt
2022-10-20 09:25:33 +00:00
wangjingwen e9fd41286f update 2022-10-20 17:15:02 +08:00
wangjingwen b7cc9ac5e4 更新打印机相关接口 2022-10-20 16:51:34 +08:00
shaozhimin 8099028329 修改网速入参,磁盘温度 2022-10-20 16:20:40 +08:00
shaozhimin dabc2a7e5a 修改头文件中宏定义的位置 2022-10-19 15:49:52 +08:00
tianshaoshuai 853cec704b 增加获取多个端口状态接口,防火墙状态接口.location实现方式 修改为调用dbus.部分接口增加入参空值判定 2022-10-19 15:05:12 +08:00
shaozhimin 97039202cf [新增]获取磁盘转速接口,修改获取进程信息错误 2022-10-19 09:41:40 +08:00
shaozhimin 1cd8e4fb90 update changelog,control,install,pc,网络,瞬时信息,地理位置 2022-10-18 09:21:30 +08:00
shaozhimin 6c9b8e0511 修改return值和编译依赖 2022-10-14 14:51:49 +08:00
shaozhimin ee4b4d485b [新增]网络连接,外设设备枚举,网卡信息,BIOS信息,主板信息,运行时信息,网络,地理位置接口 2022-10-14 10:48:41 +08:00
shaozhimin f8b106a50c 新增获取硬件信息,固件版本号,扇区数量,磁盘类型 2022-10-13 19:16:35 +08:00
shaozhimin e8802a7c99 修改获取进程command的空间大小 2022-10-13 11:10:30 +08:00
shaozhimin 3661015ad7 修改分辨率相关control文件,free 2022-10-13 10:48:08 +08:00
shaozhimin 2d8ea02d7b 修改获取进程的cup利用率实现 2022-10-13 10:46:27 +08:00
wangjingwen ffbf9190b6 增加打印机相关接口 2022-10-12 16:15:03 +08:00
shaozhimin 9a2df68ee1 [新增]分辨率,进程信息进口 2022-09-26 16:54:10 +08:00
陈志开 a4bf694cf2 Merge branch 'v1.2.1' into 'v1.2.1'
update changelog

See merge request kysdk/kysdk-system!31
2022-08-29 02:34:36 +00:00
陈志开 e855faa310 Merge branch 'v1.2.1' into 'v1.2.1'
【修改】ocr增加armhf编译支持

See merge request kysdk/kysdk-system!32
2022-08-29 02:34:22 +00:00
shaozhimin 02a2327cff 修改sysinfo头文件 2022-08-24 15:32:17 +08:00
wangweiran 31c0f0d9fb ocr增加armhf支持 2022-08-24 11:06:38 +08:00
shaozhimin eabfa7babf update changelog 2022-08-24 10:49:44 +08:00
陈志开 e4cbc0dd99 Merge branch 'v1.2.1' into 'v1.2.1'
[修改]control文件,增加cJSON.h依赖

See merge request kysdk/kysdk-system!30
2022-08-23 10:15:37 +00:00
shaozhimin cb0e7dffe5 [修改]control文件,增加cJSON.h依赖 2022-08-23 14:42:09 +08:00
陈志开 da7b6cc7bf Merge branch 'v1.2.1' into 'v1.2.1'
[修改]获取系统版本号代码格式

See merge request kysdk/kysdk-system!28
2022-08-22 09:15:53 +00:00
shaozhimin df42f45eab [修改]bug#134984,获取运行时资源信息-swap分区使用率demo显示swap分区使用率为0 2022-08-22 16:47:15 +08:00
shaozhimin f0122a61d4 [修改]bug#134990,获取运行时资源信息-已用内存及占比、空闲内存、剩余可用内存信息显示错误 2022-08-22 16:45:10 +08:00
shaozhimin f2ad3834fd [修改]获取系统版本号代码格式 2022-08-15 08:41:46 +08:00
陈志开 32dd63cb90 Merge branch 'v1.2.1' into 'v1.2.1'
【修改】RISC-V架构编译错误

See merge request kysdk/kysdk-system!27
2022-08-12 01:11:17 +00:00
shaozhimin 9f49556352 【修改】control文件指定与base相关包的的依赖版本号 2022-08-10 10:29:10 +08:00
shaozhimin f834822250 【修改】RISC-V架构编译错误 2022-08-10 10:05:25 +08:00
shaozhimin f4e6edcb76 需求#12748,【更新升级】麒麟桌面操作系统版本号体系建设;合并获取系统版本号 2022-08-10 08:57:20 +08:00
陈志开 3a0d1cd8a4 Merge branch 'v1.2.0' into 'v1.2.1'
【修改】ocr增加RISC-V架构编译

See merge request kysdk/kysdk-system!25
2022-08-04 06:13:02 +00:00
wangweiran@kylinos.cn 4bec28f935 【修改】ocr增加RISC-V架构编译 2022-08-04 11:10:38 +08:00
hanpinlong 17fc984a33 Merge branch 'v1.2.1' of https://gitlab2.kylin.com/kysdk/kysdk-system into v1.2.1 2022-07-28 15:34:32 +08:00
hanpinlong 30b3fe6ce0 取消版本号依赖 2022-07-28 15:33:52 +08:00
陈志开 052f6c4fec Merge branch 'v1.2.1' into 'v1.2.1'
【新增】时区修改时间监测报时

See merge request kysdk/kysdk-system!24
2022-07-28 03:23:59 +00:00
shaozhimin cf776a7c49 【新增】时区修改时间监测报时 2022-07-28 11:13:52 +08:00
wangweiran@kylinos.cn ae9b595e90 Merge branch 'v1.2.0' of gitlab2.kylin.com:kysdk/kysdk-system into v1.2.0 2022-07-21 11:01:35 +08:00
陈志开 737ae17b3b Merge branch 'v1.2.0' into 'v1.2.1'
【修改】避免编译时由于OCR没有二进制文件导致失败

See merge request kysdk/kysdk-system!21
2022-07-20 06:08:55 +00:00
wangweiran@kylinos.cn f735577d95 【修改】避免编译时由于OCR没有二进制文件导致失败 2022-07-18 17:14:12 +08:00
hanpinlong 424c603092 安装libkysdk-system及libkysdk-system-dev时,自动升级其依赖的子包 2022-07-18 13:59:43 +08:00
hanpinlong 9171255e4a 修改changelog 2022-07-15 16:34:39 +08:00
hanpinlong c1885b6453 修改changelog 2022-07-15 14:46:15 +08:00
Debaucher 0da1e3dc4e [修改] kdk_system_get_productFeatures 接口名称变更,由 kdk_system_get_product_features变更为kdk_system_get_productFeatures 2022-07-14 16:59:28 +08:00
Debaucher 951ea3488e [新增] 增加 kdk_system_get_projectSubName 接口,用于获取操作系统项目子编号名
[新增] 增加 kdk_system_get_productFeatures 接口,用于获取操作系统产品标识码
2022-07-14 16:55:52 +08:00
陈志开 ef41cd315c Merge branch 'v1.2.0' into 'v1.2.0'
【修改】修改control文件增加sw的ocr包

See merge request kysdk/kysdk-system!20
2022-07-13 07:33:39 +00:00
wangweiran@kylinos.cn edb99be27f 【修改】修改control文件增加sw的ocr包 2022-07-13 15:22:58 +08:00
陈志开 963e05ac92 Merge branch 'v1.2.0' into 'v1.2.0'
#fix bug 126922

See merge request kysdk/kysdk-system!19
2022-07-13 06:18:23 +00:00