rpc正常使用版本备份

subModule/Hd_CameraModule_Basler_soft/Hd_CameraModule_Basler_soft.cpp

@@ -429,7 +429,7 @@ Hd_CameraModule_Basler_soft::~Hd_CameraModule_Basler_soft()
 	qDebug() << "[info] " << " delete success!";
 }
 //从类中读数据到实例对象
-bool Hd_CameraModule_Basler_soft::readData(std::vector<cv::Mat>& mat, QByteArray& data, nlohmann::json& json)
+bool Hd_CameraModule_Basler_soft::readData(std::vector<cv::Mat>& mat, QByteArray& data)
 {
 	int timeCnt = 0;
 	while (srcImage.empty())
@@ -444,7 +444,7 @@ bool Hd_CameraModule_Basler_soft::readData(std::vector<cv::Mat>& mat, QByteArray
 	return true;
 }
 //实例对象把数据写入到类
-bool Hd_CameraModule_Basler_soft::writeData(std::vector<cv::Mat>& mat, QByteArray& data, nlohmann::json& json)
+bool Hd_CameraModule_Basler_soft::writeData(std::vector<cv::Mat>& mat, QByteArray& data)
 {
 	Q_UNUSED(mat)
 		m_flag = false;
@@ -452,7 +452,7 @@ bool Hd_CameraModule_Basler_soft::writeData(std::vector<cv::Mat>& mat, QByteArra
 	return true;
 }
 
-bool Hd_CameraModule_Basler_soft::initParas(QByteArray&, nlohmann::json& json)
+bool Hd_CameraModule_Basler_soft::initParas(QByteArray&)
 {
 	return true;
 	return ConnctDevice();

subModule/Hd_CameraModule_Basler_soft/Hd_CameraModule_Basler_soft.h

@@ -28,7 +28,7 @@ static bool m_flag = false;
 static cv::Mat srcImage;
 static bool moduleStatus = true;
 static int index=-1;
-class  Hd_CameraModule_Basler_soft :public subModuleBase
+class  Hd_CameraModule_Basler_soft :public dsModuleBase
     , public Pylon::CImageEventHandler             // Allows you to get notified about images received and grab errors.
     , public Pylon::CConfigurationEventHandler     // Allows you to get notified about device removal.
     , public Pylon::CCameraEventHandler
@@ -38,10 +38,10 @@ public:
     Hd_CameraModule_Basler_soft();
     virtual ~Hd_CameraModule_Basler_soft();
     //从类中读数据到实例对象
-    bool  readData(std::vector<cv::Mat>& mat, QByteArray& data, nlohmann::json& json);
+    bool  readData(std::vector<cv::Mat>& mat, QByteArray& data);
     //实例对象把数据写入到类
-    bool  writeData(std::vector<cv::Mat>& mat, QByteArray& data, nlohmann::json& json);
-    bool  initParas(QByteArray&, nlohmann::json& json = nlohmann::json());
+    bool  writeData(std::vector<cv::Mat>& mat, QByteArray& data);
+    bool  initParas(QByteArray&);
     bool  run();
     bool  checkStatus();