From d206a59d9af8c96554f58843c73e0bfaaa3456bf Mon Sep 17 00:00:00 2001
From: Matthew <wakinchau@msn.com>
Date: Wed, 12 Mar 2025 22:10:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=AF=91=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/cpp/netcamera/HangYuCtrl.cpp | 14 +++++++++++---
 app/src/main/cpp/netcamera/VendorCtrl.cpp |  2 +-
 app/src/main/cpp/netcamera/VendorCtrl.h   |  2 +-
 app/src/main/cpp/netcamera/YuShiCtrl.cpp  | 13 +++++++++----
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/app/src/main/cpp/netcamera/HangYuCtrl.cpp b/app/src/main/cpp/netcamera/HangYuCtrl.cpp
index b40e6450..bb779b2d 100644
--- a/app/src/main/cpp/netcamera/HangYuCtrl.cpp
+++ b/app/src/main/cpp/netcamera/HangYuCtrl.cpp
@@ -2,9 +2,12 @@
 // Created by Matthew on 2025/3/4.
 //
 
-#include "YuShiCtrl.h"
+#include "HangYuCtrl.h"
+#include "netcamera.h"
 #include "httpclient.h"
 
+#include <cstring>
+
 HangYuCtrl::~HangYuCtrl()
 {
 
@@ -17,7 +20,7 @@ bool HangYuCtrl::SetOsd()
 
 void HangYuCtrl::EnableOsd(bool enable)
 {
-    return false;
+    // return false;
 }
 
 std::string HangYuCtrl::GetStreamingUrl(uint8_t channel)
@@ -35,7 +38,7 @@ std::string HangYuCtrl::GetStreamingUrl(uint8_t channel)
     }
 
     resData.push_back(0);
-    const char* start = strstr(&resData[0], "<RTSPURI>");
+    const char* start = strstr((const char*)&resData[0], "<RTSPURI>");
     if (start == NULL)
     {
         return "";
@@ -84,4 +87,9 @@ bool HangYuCtrl::UpdateTime(time_t ts)
 bool HangYuCtrl::TakePhoto(std::vector<uint8_t>& img)
 {
     return false;
+}
+
+bool HangYuCtrl::TakeVideo(uint32_t duration, std::string path)
+{
+
 }
\ No newline at end of file
diff --git a/app/src/main/cpp/netcamera/VendorCtrl.cpp b/app/src/main/cpp/netcamera/VendorCtrl.cpp
index e89fa58e..96ee7913 100644
--- a/app/src/main/cpp/netcamera/VendorCtrl.cpp
+++ b/app/src/main/cpp/netcamera/VendorCtrl.cpp
@@ -3,7 +3,7 @@
 //
 #include "VendorCtrl.h"
 
-VendorCtrl::VendorCtrl(const std::string& ip, const std::string& userName, const std::string& password) :
+VendorCtrl::VendorCtrl(const std::string& ip, const std::string& userName, const std::string& password, uint8_t channel, net_handle_t netHandle) :
     m_ip(ip), m_userName(userName), m_password(password), m_channel(channel), m_netHandle(netHandle)
 {
 }
diff --git a/app/src/main/cpp/netcamera/VendorCtrl.h b/app/src/main/cpp/netcamera/VendorCtrl.h
index d12e80f8..faf4b7ae 100644
--- a/app/src/main/cpp/netcamera/VendorCtrl.h
+++ b/app/src/main/cpp/netcamera/VendorCtrl.h
@@ -12,7 +12,7 @@
 class VendorCtrl {
 public:
     VendorCtrl(const std::string& ip, const std::string& userName, const std::string& password, uint8_t channel, net_handle_t netHandle);
-    virtual ~VendorCtrl() = 0;
+    virtual ~VendorCtrl() {}
 
     virtual bool SetOsd() = 0;
     virtual void EnableOsd(bool enable) = 0;
diff --git a/app/src/main/cpp/netcamera/YuShiCtrl.cpp b/app/src/main/cpp/netcamera/YuShiCtrl.cpp
index 9c51f8f0..24eeacf7 100644
--- a/app/src/main/cpp/netcamera/YuShiCtrl.cpp
+++ b/app/src/main/cpp/netcamera/YuShiCtrl.cpp
@@ -17,10 +17,10 @@ bool YuShiCtrl::SetOsd()
 
 void YuShiCtrl::EnableOsd(bool enable)
 {
-    return false;
+    // return false;
 }
 
-std::string GetStreamingUrl(uint8_t channel)
+std::string YuShiCtrl::GetStreamingUrl(uint8_t channel)
 {
     // /LAPI/V1.0/Channels/<ID>/Media/Video/Streams/<ID>/LiveStreamURL?TransType=<Tran
     // sType>&TransProtocol=<TransProtocol>
@@ -29,12 +29,12 @@ std::string GetStreamingUrl(uint8_t channel)
 
 bool YuShiCtrl::UpdateTime(time_t ts)
 {
-    /LAPI/V1.0/System/Time
+    // /LAPI/V1.0/System/Time
 
     Json::Value jsonData(Json::objectValue);
 
     jsonData["TimeZone"] = "GMT+08:00";
-    jsonData["DeviceTime"] = ts;
+    jsonData["DeviceTime"] = (int64_t)ts;
     jsonData["DateFormat"] = 0; // YYYY-MM-DD
     jsonData["HourFormat"] = 1; // 24H
 
@@ -44,4 +44,9 @@ bool YuShiCtrl::UpdateTime(time_t ts)
 bool YuShiCtrl::TakePhoto(std::vector<uint8_t>& img)
 {
     return false;
+}
+
+bool YuShiCtrl::TakeVideo(uint32_t duration, std::string path)
+{
+
 }
\ No newline at end of file