Skip to content
项目
群组
代码片段
帮助
正在加载...
登录
切换导航
E
evsuits
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
分枝图
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
分枝图
统计图
创建新议题
作业
提交
议题看板
打开侧边栏
OpsTeam
evsuits
Commits
42aea38a
提交
42aea38a
authored
11月 06, 2019
作者:
blu
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
feature: report status
上级
f27c7b20
全部展开
显示空白字符变更
内嵌
并排
正在显示
8 个修改的文件
包含
20 行增加
和
13 行删除
+20
-13
config.json
opencv-motion-detect/deployment/config.json
+1
-0
evcloudsvc.cpp
opencv-motion-detect/evcloudsvc.cpp
+0
-0
evcloudsvc_terminal_status.json
opencv-motion-detect/evcloudsvc_terminal_status.json
+0
-1
evmgr.cpp
opencv-motion-detect/evmgr.cpp
+8
-1
evmlmotion.cpp
opencv-motion-detect/evmlmotion.cpp
+2
-2
evpuller.cpp
opencv-motion-detect/evpuller.cpp
+2
-2
evpusher.cpp
opencv-motion-detect/evpusher.cpp
+5
-5
evslicer.cpp
opencv-motion-detect/evslicer.cpp
+2
-2
没有找到文件。
opencv-motion-detect/deployment/config.json
浏览文件 @
42aea38a
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
"pre"
:
4
,
"pre"
:
4
,
"sn"
:
"V2I0C7KC"
,
"sn"
:
"V2I0C7KC"
,
"thresh"
:
30
,
"thresh"
:
30
,
"fpsProc"
:
3
,
"entropy"
:
0.3
,
"entropy"
:
0.3
,
"type"
:
"motion"
"type"
:
"motion"
}
}
...
...
opencv-motion-detect/evcloudsvc.cpp
浏览文件 @
42aea38a
差异被折叠。
点击展开。
opencv-motion-detect/evcloudsvc_terminal_status.json
浏览文件 @
42aea38a
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
},
},
"issues"
:
{
"issues"
:
{
"MODID"
:
{
"MODID"
:
{
"runTerminalOnline"
:
true
,
"REPORT_CATID"
:
{
"REPORT_CATID"
:
{
"status"
:
"active"
"status"
:
"active"
}
}
...
...
opencv-motion-detect/evmgr.cpp
浏览文件 @
42aea38a
...
@@ -87,6 +87,7 @@ private:
...
@@ -87,6 +87,7 @@ private:
bool
inited
=
false
;
bool
inited
=
false
;
int
opt_notify
=
ZMQ_NOTIFY_DISCONNECT
|
ZMQ_NOTIFY_CONNECT
;
int
opt_notify
=
ZMQ_NOTIFY_DISCONNECT
|
ZMQ_NOTIFY_CONNECT
;
string
addr
;
string
addr
;
string
portRouter
;
try
{
try
{
//
//
...
@@ -102,7 +103,13 @@ private:
...
@@ -102,7 +103,13 @@ private:
goto
error_exit
;
goto
error_exit
;
}
}
addr
=
"tcp://*:"
+
to_string
(
config
[
"portRouter"
]);
if
(
config
.
count
(
"portRouter"
)
!=
0
)
{
portRouter
=
to_string
(
config
[
"portRouter"
]);
}
else
if
(
config
.
count
(
"port-router"
)
!=
0
)
{
portRouter
=
to_string
(
config
[
"port-router"
]);
}
addr
=
"tcp://*:"
+
portRouter
;
// setup zmq
// setup zmq
// router service
// router service
pRouterCtx
=
zmq_ctx_new
();
pRouterCtx
=
zmq_ctx_new
();
...
...
opencv-motion-detect/evmlmotion.cpp
浏览文件 @
42aea38a
...
@@ -829,11 +829,11 @@ protected:
...
@@ -829,11 +829,11 @@ protected:
data
[
"modId"
]
=
selfId
;
data
[
"modId"
]
=
selfId
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEPIPE
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEPIPE
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"status"
]
=
"recover"
;
data
[
"status"
]
=
"recover"
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
spdlog
::
info
(
msg
);
spdlog
::
info
(
msg
);
}
}
...
...
opencv-motion-detect/evpuller.cpp
浏览文件 @
42aea38a
...
@@ -336,11 +336,11 @@ protected:
...
@@ -336,11 +336,11 @@ protected:
data
[
"modId"
]
=
selfId
;
data
[
"modId"
]
=
selfId
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVOPENINPUT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVOPENINPUT
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"status"
]
=
"recover"
;
data
[
"status"
]
=
"recover"
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
spdlog
::
info
(
msg
);
spdlog
::
info
(
msg
);
}
}
...
...
opencv-motion-detect/evpusher.cpp
浏览文件 @
42aea38a
...
@@ -413,11 +413,11 @@ private:
...
@@ -413,11 +413,11 @@ private:
data
[
"modId"
]
=
selfId
;
data
[
"modId"
]
=
selfId
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVOPENOUTPUT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVOPENOUTPUT
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"status"
]
=
"recover"
;
data
[
"status"
]
=
"recover"
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
spdlog
::
info
(
msg
);
spdlog
::
info
(
msg
);
}
}
...
@@ -441,11 +441,11 @@ private:
...
@@ -441,11 +441,11 @@ private:
data
[
"modId"
]
=
selfId
;
data
[
"modId"
]
=
selfId
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEHEADER
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEHEADER
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"status"
]
=
"recover"
;
data
[
"status"
]
=
"recover"
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
return
ret
;
return
ret
;
...
@@ -568,7 +568,7 @@ protected:
...
@@ -568,7 +568,7 @@ protected:
data
[
"modId"
]
=
selfId
;
data
[
"modId"
]
=
selfId
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEPIPE
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEPIPE
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"status"
]
=
"recover"
;
data
[
"status"
]
=
"recover"
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
...
...
opencv-motion-detect/evslicer.cpp
浏览文件 @
42aea38a
...
@@ -624,11 +624,11 @@ protected:
...
@@ -624,11 +624,11 @@ protected:
data
[
"modId"
]
=
selfId
;
data
[
"modId"
]
=
selfId
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEPIPE
;
data
[
"catId"
]
=
EV_MSG_REPORT_CATID_AVWRITEPIPE
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
data
[
"level"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"time"
]
=
chrono
::
duration_cast
<
chrono
::
seconds
>
(
chrono
::
system_clock
::
now
().
time_since_epoch
()).
count
();
data
[
"status"
]
=
"recover"
;
data
[
"status"
]
=
"recover"
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"type"
]
=
EV_MSG_META_TYPE_REPORT
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
INFO
;
meta
[
"value"
]
=
EV_MSG_META_VALUE_REPORT_LEVEL_
ERROR
;
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
z_send
(
pDaemon
,
"evcloudsvc"
,
meta
.
dump
(),
data
.
dump
());
}
}
}
}
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论