From 91fbc7bca400b7ce958e306f09133e4cfc6db63b Mon Sep 17 00:00:00 2001
From: chenshijun <csj_sky@126.com>
Date: 星期三, 03 四月 2019 11:23:25 +0800
Subject: [PATCH] Merge branch 'yangwu1.3' of ssh://192.168.1.226:29418/development/c++ into yangwu1.3
---
QiaoJiaSystem/DataManagerServer/demo.cpp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/QiaoJiaSystem/DataManagerServer/demo.cpp b/QiaoJiaSystem/DataManagerServer/demo.cpp
index 9334952..4217194 100644
--- a/QiaoJiaSystem/DataManagerServer/demo.cpp
+++ b/QiaoJiaSystem/DataManagerServer/demo.cpp
@@ -12,7 +12,7 @@
// json["rtsp"] = "rtsp://admin:a1234567@192.168.1.201:554/h264/ch1/main/av_stream";
//
// std::string publish_basepath = "rtmp://localhost:1934/live/cam" + std::to_string(554);
-// appPref.setLongData("gpu.index", 0);
+// appPref.setIntData("gpu.index", 0);
// appPref.setStringData("publish.basepath", publish_basepath);
// appPref.setIntData("pulish.width", 640);
// appPref.setIntData("pulish.height", 360);
@@ -24,7 +24,7 @@
//
// a.stop();
// a.wait();
-
+ std::cout<<__DATE__<<" "<<__TIME__<<std::endl;
string img = "http://192.168.1.182:8080/ManCarAnaly/group2/M00/02/B5/wKgBnFw3TB-AfsrIAAah4WWyHJ0555.jpg";
auto pos = img.find("group");
--
Gitblit v1.8.0