V0.8.6

1、

CPlayer/cameraplayer.cpp

@@ -221,7 +221,7 @@ void CameraPlayer::do_updateFrame()
     /* 获取一帧 */
     if(m_imageQueue.isEmpty())
     {
-        LH_WRITE_LOG("图像环形队列为空");
+        // LH_WRITE_LOG("图像环形队列为空");
         return;
     }
     // LH_WRITE_LOG("环形队列图片个数:" + QString::number(m_imageQueue.QueueSize()));

show1/CMakeLists.txt

@@ -8,6 +8,7 @@ file(GLOB LOCAL_SRC
     ${CMAKE_CURRENT_SOURCE_DIR}/*.qrc
     ${CMAKE_CURRENT_SOURCE_DIR}/*.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/*.ui
+    # ${CMAKE_CURRENT_SOURCE_DIR}/FromWebAPI/*.cpp
 
     ${CMAKE_SOURCE_DIR}/CPlayer/*.cpp
     # ${CMAKE_SOURCE_DIR}/CPlayer/VideoPlayer/*.cpp
@@ -15,7 +16,9 @@ file(GLOB LOCAL_SRC
     ${CMAKE_SOURCE_DIR}/CPlayer/transcode/*.cpp
     ${CMAKE_SOURCE_DIR}/CPlayer/HKSDKAPI/*.cpp
 
+
     ${CMAKE_SOURCE_DIR}/External/module/Logs/*.cpp
+    # ${LHHTTPAPI_SOURCE_DIRS}/*.cpp
     
 )
 
@@ -29,6 +32,7 @@ set_target_properties(${execName} PROPERTIES
 #包含头文件
 target_include_directories(${execName} PRIVATE 
     ${CMAKE_CURRENT_SOURCE_DIR}
+    # ${CMAKE_CURRENT_SOURCE_DIR}/FromWebAPI
 
     ${CMAKE_SOURCE_DIR}/CPlayer
     # ${CMAKE_SOURCE_DIR}/CPlayer/VideoPlayer
@@ -46,13 +50,14 @@ target_include_directories(${execName} PRIVATE
 
     ${spdlog_INCLUDE_DIR}
     # ${FFMPEG_INCLUDE_DIR}
+    # ${LHHTTPAPI_INCLUDE_DIRS}
 )
 
 target_link_libraries(${execName} PRIVATE
     Qt5::Widgets
     Qt5::Core
     # Qt5::Network
-    Qt5::OpenGL
+    # Qt5::OpenGL
 
     ${spdlog_LIBRARY}
     # ${FFMPEG_LIBRARY}

show1/FromWebAPI/FromWebAPI.cpp

@@ -0,0 +1,67 @@
+
+#include "FromWebAPI.h"
+
+
+FromEQM::FromEQM()
+{
+    m_logger = spdlog::get("WebAPI");
+    if(m_logger == nullptr)
+    {
+        SPDLOG_ERROR("WebAPI logger is nullptr");
+        return;
+    }
+}
+
+FromEQM::~FromEQM()
+{
+    if(m_httpApi != nullptr)
+    {
+        delete m_httpApi;
+        m_httpApi = nullptr;
+    }
+}
+
+
+/* 初始化WebApi */
+bool FromEQM::initWebApi(const QString& url, const QString& serverIP, const QString& serID)
+{
+    if(m_httpApi == nullptr)
+    {
+        m_httpApi = new lhhttpapi;
+    }
+    if(!m_httpApi->Load())
+    {
+        SPDLOG_LOGGER_ERROR(m_logger,"Load WebApi failed");
+        return false;
+    }
+
+    int ret = 0;
+    m_httpApi->DBInit(url.toStdString().c_str());
+    // if(ret < 0)
+    // {
+    //     SPDLOG_LOGGER_ERROR(m_logger,"Init WebApi failed:{}, error Info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
+    //     return false;
+    // }
+    // SPDLOG_LOGGER_TRACE(m_logger,"初始化WebApi成功!");
+    // QString serverList;
+    char serverList[8192] = {0};
+    ret = m_httpApi->DBGetServerList(serverList, 8192);
+    if(ret < 0)
+    {
+        SPDLOG_LOGGER_ERROR(m_logger,"Get server list failed:{}, error info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
+        // return false;
+    }
+    // SPDLOG_LOGGER_TRACE(m_logger,"Server list:{}",serverList.toStdString());
+    SPDLOG_LOGGER_DEBUG(m_logger,"WebAPI Sucess!");
+    /* 登录，第二个参数是限制的服务 */
+    ret = m_httpApi->DBLogin(serverIP, serID, "FACS", m_userToken);
+    if(ret < 0)
+    {
+        SPDLOG_LOGGER_ERROR(m_logger,"WebAPI Login failed:{}, error info:{}",ret,m_httpApi->DoGetLastError(&ret).toStdString());
+        return false;
+    }
+    SPDLOG_LOGGER_INFO(m_logger,"WebAPI Login sucess!");
+
+    return true;
+}
+

show1/FromWebAPI/FromWebAPI.h

@@ -0,0 +1,30 @@
+#ifndef FROMWEBAPI_H
+#define FROMWEBAPI_H
+
+#include "spdlog/spdlog.h"
+#include "lhhttpapi.h"
+
+
+
+class FromEQM
+{
+public:
+    FromEQM();
+    ~FromEQM();
+
+    /* 初始化WebAPI */
+    bool initWebApi(const QString& url,const QString& serverIP,const QString& serID);
+
+
+private:
+
+
+private:
+    std::shared_ptr<spdlog::logger> m_logger = nullptr;
+
+    lhhttpapi* m_httpApi = nullptr;
+    QString m_userToken;
+};
+
+
+#endif /* FROMWEBAPI_H */

show1/main.cpp

@@ -4,6 +4,9 @@
 
 #include "Logs/loginit.h"
 
+#include <QLibrary>
+#include <QDebug>
+
 int main(int argc, char *argv[])
 {
     QApplication a(argc, argv);
@@ -11,7 +14,15 @@ int main(int argc, char *argv[])
     /* 初始化log */
     init_log();
 
+    QString libFile = QString("%1/libLHSqlWebInterface.so").arg(QCoreApplication::applicationDirPath());
+    QLibrary* lib = new QLibrary(libFile);
+    if (!lib->load())
+    {
+        
+        qDebug() << QString("模块%1加载失败: %2").arg(libFile).arg(lib->errorString());
+    }
 
+    
     widget w;
     w.show();
     return a.exec();

show1/widget.cpp

@@ -3,6 +3,8 @@
 
 #include <QResizeEvent>
 #include <QApplication>
+#include <QLibrary>
+#include <QDebug>
 
 #include "cameraplayer.h"
 
@@ -102,6 +104,7 @@ void widget::showEvent(QShowEvent *event)
 
 void widget::initCameraPlayer()
 {
+
     /* 创建摄像机播放器 */
     m_cameraPlayer1 = new CameraPlayer;
 
@@ -120,10 +123,10 @@ void widget::initCameraPlayer()
     /* 创建其他播放窗口 */
     m_cameraPlayer2 = new CameraPlayer;
     m_cameraPlayer2->setImage(image);
-    m_cameraPlayer2->initCamera("172.16.9.31", 8000, "admin", "LH123456");
-    m_cameraPlayer2->startRealPlay(1);
-    m_cameraPlayer2->setPlayWndParent(ui->widget_display2);
-    m_cameraPlayer2->setPlayWndSize(ui->widget_display2->size());
+    // m_cameraPlayer2->initCamera("172.16.9.31", 8000, "admin", "LH123456");
+    // m_cameraPlayer2->startRealPlay(1);
+    // m_cameraPlayer2->setPlayWndParent(ui->widget_display2);
+    // m_cameraPlayer2->setPlayWndSize(ui->widget_display2->size());
 
     m_cameraPlayer3 = new CameraPlayer;
     m_cameraPlayer3->setImage(image);

show1/widget.h

@@ -2,6 +2,7 @@
 #define WIDGET_H
 
 #include <QWidget>
+// #include "FromWebAPI.h"
 
 class CameraPlayer;
 
@@ -35,6 +36,8 @@ private:
 private:
     Ui::widget *ui;
 
+    // FromWebAPI m_fromWebAPI;
+
     CameraPlayer *m_cameraPlayer1 = nullptr;
     CameraPlayer *m_cameraPlayer2 = nullptr;
     CameraPlayer *m_cameraPlayer3 = nullptr;