Commit Graph

118 Commits

Author SHA1 Message Date
puhui e2ba2a2964 代码格式化修复编程规范问题
Signed-off-by: puhui <puhui1@huawei.com>
2022-01-14 09:41:04 +08:00
puhui e6b825a852 Merge branch 'master' of https://gitee.com/openharmony/device_manager
Signed-off-by: puhui <puhui1@huawei.com>
2022-01-14 00:25:12 +08:00
puhui 3d6d4d6f89 修改编译问题
Signed-off-by: puhui <puhui1@huawei.com>
2022-01-14 00:13:44 +08:00
蒲辉 592a267ba5 !10 修改L2编译报错问题
Merge pull request !10 from 曹刘超/master

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-13 13:33:24 +00:00
caochao 60b0ea16a6 修改L2编译报错问题
Signed-off-by: cao_liu_chao <caochao12@huawei.com>
2022-01-13 21:26:24 +08:00
openharmony_ci 8f069cc66b !86 软总线FrameInfo改为StreamFrameInfo
Merge pull request !86 from jiangkuaixue/master
2022-01-13 12:25:45 +00:00
蒲辉 09d98fd2ea !9 修复编译报错问题
Merge pull request !9 from renguang1116/master+

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-13 11:49:28 +00:00
renguang1116 2233e8d154 修复编译报错问题
Signed-off-by: renguang1116 <renguang@huawei.com>
2022-01-13 19:42:26 +08:00
jiangkuaixue 1a35f59ff5 FrameInfo to StreamFrameInfo
Signed-off-by: jiangkuaixue <jiangchenzhou@huawei.com>
2022-01-13 19:26:08 +08:00
蒲辉 eb51022e08 !6 修复codecheck
Merge pull request !6 from renguang1116/master

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-13 08:07:35 +00:00
renguang1116 44c100bb71 修复codecheck
Signed-off-by: renguang1116 <renguang@huawei.com>
2022-01-13 15:43:58 +08:00
renguang1116 83d08c0a42 修复codecheck
Signed-off-by: renguang1116 <renguang@huawei.com>
2022-01-13 15:32:26 +08:00
renguang1116 34e0961d28 修复codecheck
Signed-off-by: renguang1116 <renguang@huawei.com>
2022-01-13 15:05:39 +08:00
puhui d9a9f60882 Merge branch 'master' of https://gitee.com/skypuhui/device_manager_master
Signed-off-by: puhui <puhui1@huawei.com>
2022-01-13 11:15:01 +08:00
puhui cb56a494f4 修改format check问题
Signed-off-by: puhui <puhui1@huawei.com>
2022-01-13 11:12:29 +08:00
蒲辉 8eac670b43 !4 消除L1编译报错的问题
Merge pull request !4 from 曹刘超/master

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-13 01:57:30 +00:00
caochao 325821f959 消除L1编译报错的问题
Signed-off-by: cao_liu_chao <caochao12@huawei.com>
2022-01-13 09:19:34 +08:00
蒲辉 a1bf15ef53 !3 新device_manager_master工程代码上库
Merge pull request !3 from 曹刘超/master

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-12 14:14:37 +00:00
caochao 6bda7ecf9b 新device manager工程代码上库
Signed-off-by: cao_liu_chao <caochao12@huawei.com>
2022-01-12 22:11:55 +08:00
puhui 931b58ca70 提交DM框架与服务模块
Signed-off-by: puhui <puhui1@huawei.com>
2022-01-12 22:00:55 +08:00
蒲辉 e75612c55b !2 提交DM模块TDD代码
Merge pull request !2 from renguang1116/master

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-12 13:59:34 +00:00
renguang1116 99a90e19e1 提交DM模块TDD代码
Signed-off-by: renguang1116 <renguang@huawei.com>
2022-01-12 21:57:49 +08:00
蒲辉 2281cc09e1 !1 新device manager工程代码上库
Merge pull request !1 from 曹刘超/master

Signed-off-by: puhui <puhui1@huawei.com>
2022-01-12 13:47:58 +00:00
caochao e31769b681 新device manager工程代码上库
Signed-off-by: cao_liu_chao <caochao12@huawei.com>
2022-01-12 21:46:01 +08:00
openharmony_ci b83ecf2702 !80 clear sensitive words
Merge pull request !80 from renguang1116/master
2021-12-28 06:39:28 +00:00
renguang1116 d01f15e543 update interfaces/inner_kits/native_cpp/include/dm_device_info.h.
按照要求删除敏感词PC
Signed-off-by: renguang1116 <renguang@huawei.com>
2021-12-28 03:46:38 +00:00
openharmony_ci f185813ea3 !77 增加L2对mbedtls的依赖
Merge pull request !77 from xiongjun_gitee/master
2021-11-08 06:48:45 +00:00
xiongjun_gitee 43d7b80681 add mbedtls deps
Signed-off-by: xiongjun_gitee <xiongjun28@huawei.com>
Change-Id: I4a2c029a4048c5f98267f1f05bb06aa6deb4632c
2021-11-04 19:46:14 +08:00
openharmony_ci 9c3dbc6d0c !75 修改包名,设备名称bug修复
Merge pull request !75 from yqy2012/master
2021-10-30 10:01:54 +00:00
yuqianyuan 99b713bf1b 调整头文件顺序
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
2021-10-30 17:02:36 +08:00
yuqianyuan 155a0d9e04 修改包名,修复设备名称bug
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
2021-10-29 09:40:01 +08:00
openharmony_ci 9ce5b538cb !74 支持三方直接编译&LiteOS IPC bug修复
Merge pull request !74 from 郑建明/master
2021-10-27 03:38:32 +00:00
想不出别名 54bea6188d bug fix
Signed-off-by: 想不出别名 <zhengjianming1@huawei.com>
2021-10-27 10:47:35 +08:00
openharmony_ci d586df62ce !73 Modify DM L1 Service Config
Merge pull request !73 from 郑建明/master
2021-10-19 14:29:59 +00:00
想不出别名 1c5f8c69a1 modidy L1 service config
Signed-off-by: 想不出别名 <zhengjianming1@huawei.com>
2021-10-19 22:08:05 +08:00
openharmony_ci f25628c739 !71 samgr part name rectify
Merge pull request !71 from zmx/master-dev
2021-10-19 02:10:12 +00:00
zmx c2dfd37c50 samgr part name rectify
Signed-off-by: zmx <1029211721@qq.com>
Change-Id: I2bba05b8f0e462dedbaa5cc4c58d4129f882aa27
2021-10-18 20:09:13 +08:00
openharmony_ci f1532d8f28 !70 fix gcc compile errors
Merge pull request !70 from 郑建明/master
2021-10-17 13:27:58 +00:00
想不出别名 e3f7bc8cfc fix gcc compile error
Signed-off-by: 想不出别名 <zhengjianming1@huawei.com>
2021-10-15 14:19:46 +08:00
openharmony_ci 0faf5746ac !69 修复hichain重复创建的错误
Merge pull request !69 from yqy2012/master
2021-10-14 14:10:19 +00:00
yuqianyuan eba4b7a0a0 bug fix, hichain group bug
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
2021-10-14 14:33:33 +08:00
openharmony_ci 3f3591918f !67 sync hichain group
Merge pull request !67 from 郑建明/master
2021-10-12 10:15:56 +00:00
想不出别名 c4a503492b sync hichain group
Signed-off-by: 想不出别名 <zhengjianming1@huawei.com>
2021-10-12 14:41:03 +08:00
openharmony_ci 1f2ff303ab !64 server端同步群组
Merge pull request !64 from yqy2012/master
2021-09-29 09:27:55 +00:00
yuqianyuan dced5ea684 sync group
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
2021-09-27 17:02:47 +08:00
yuqianyuan 18805f2d80 sync group
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
2021-09-27 16:49:47 +08:00
yuqianyuan 58347b9324 server sync group
Signed-off-by: yuqianyuan <yuqianyuan@huawei.com>
2021-09-27 15:32:29 +08:00
openharmony_ci 9b0c24ccab !58 codestyle
Merge pull request !58 from 郑建明/master
2021-09-26 08:37:32 +00:00
想不出别名 54bc21c2c6 codestyle
Signed-off-by: 想不出别名 <zhengjianming1@huawei.com>
2021-09-26 15:19:03 +08:00
openharmony_ci 13b6fda412 !54 code style & bug fix
Merge pull request !54 from 郑建明/master
2021-09-26 06:02:51 +00:00