Merge branch 'main' of http://61.169.135.146:8081/git/xymp/TermApp

app/src/main/cpp/PhoneDevice.cpp

@@ -1674,7 +1674,6 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
     {
         // Hang Yu
         strcpy(netPhotoInfo.url, "/cgi-bin/snapshot.cgi");
-        vendorCtrl->EnableOsd(false, localPhotoInfo.channel);
     }
     else if (localPhotoInfo.vendor == 3)
     {
@@ -1691,6 +1690,7 @@ bool CPhoneDevice::TakePhotoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
         // http://192.168.1.101/Snapshot/1/2/RemoteImageCaptureV2?ImageFormat=jpg
         // http://192.168.1.101/Snapshot/1/1/RemoteImageCaptureV2?ImageFormat=jpg
         snprintf(netPhotoInfo.url, sizeof(netPhotoInfo.url), "/Snapshot/%u/1/RemoteImageCaptureV2?ImageFormat=jpg", (uint32_t)localPhotoInfo.cameraId);
+        vendorCtrl->EnableOsd(false, localPhotoInfo.cameraId);
     }
     else
     {
@@ -1875,7 +1875,11 @@ bool CPhoneDevice::TakeVideoWithNetCamera(IDevice::PHOTO_INFO& localPhotoInfo, c
     }
 
     if(localPhotoInfo.vendor == 5)
-        vendorCtrl->SetOsd(localPhotoInfo.channel, osds[0].text, 0);
+    {
+        vendorCtrl->SetOsd(localPhotoInfo.cameraId, osds[0].text, 0);
+        vendorCtrl->SetResolution(localPhotoInfo.cameraId, 1, localPhotoInfo.width, localPhotoInfo.height);
+    }
+
 
     std::string streamingUrl = vendorCtrl->GetStreamingUrl(localPhotoInfo.cameraId);
 

app/src/main/cpp/netcamera/HangYuCtrl.cpp

@@ -17,7 +17,7 @@ bool HangYuCtrl::SetResolution(uint8_t channel, uint8_t streamID, uint32_t resX,
 {
     //流类型范围1-4,1为主流
     char url[128] = { 0 };
-    snprintf(url, sizeof(url), "http://%s/Streams/%u/%u", m_ip.c_str(), (uint32_t)channel, (uint32_t)streamID);
+    snprintf(url, sizeof(url), "http://%s/Streams/%u/1", m_ip.c_str(), (uint32_t)channel);
 
     std::vector<uint8_t> resData;
 
@@ -61,7 +61,7 @@ bool HangYuCtrl::SetOsd(uint8_t channel, std::string osdstring, uint8_t pos)
     size_t posi = osdstring.find("$$DATETIME$$");
     if (posi != std::string::npos) {
         size_t endPos = posi + 12;
-        while (endPos < osdstring.size() && osdstring[endPos] == ' ') {
+        while (endPos < osdstring.size() && (osdstring[endPos] == ' ' || osdstring[endPos] == '\n')) {
             endPos++;
         }
         osdstring.erase(posi, endPos - posi);
@@ -71,7 +71,7 @@ bool HangYuCtrl::SetOsd(uint8_t channel, std::string osdstring, uint8_t pos)
     snprintf(url, sizeof(url), "http://%s/Pictures/%u/MultiOSDV2", m_ip.c_str(), (uint32_t)channel);
     std::vector<uint8_t> resData;
     std::replace(osdstring.begin(), osdstring.end(), '\n', '^');
-    string xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><MultiLineOSD><DisplayTime><Enable>" + string(hasDateTime ? "true" : "false") + "</Enable><PosX>8</PosX><PosY>0</PosY></DisplayTime><OSD><ID>1</ID><Enable>true</Enable><Text>"+ osdstring+ "</Text><x>8</x><y>" + string(hasDateTime ? "24" : "0") + "</y></MultiLineOSD>";
+    string xmlString = "<?xml version=\"1.0\" encoding=\"UTF-8\" ?><MultiLineOSD><DisplayTime><Enable>" + string(hasDateTime ? "true" : "false") + "</Enable><PosX>8</PosX><PosY>0</PosY></DisplayTime><OSD><ID>1</ID><Enable>false</Enable><Text>"+ osdstring+ "</Text><x>8</x><y>" + string(hasDateTime ? "24" : "0") + "</y></MultiLineOSD>";
     int res = DoPutRequest(url, HTTP_AUTH_TYPE_BASIC, m_userName.c_str(), m_password.c_str(), m_netHandle, xmlString.c_str(), resData);
     return res;
 }

app/src/main/cpp/netcamera/HangYuCtrl.h

@@ -20,9 +20,8 @@ public:
     virtual bool TakePhoto(std::vector<uint8_t>& img);
     virtual bool TakeVideo(uint32_t duration, std::string path);
     virtual bool HasAuthOnStreaming() const { return true; }
+    virtual bool SetResolution(uint8_t channel, uint8_t streamID, uint32_t resX, uint32_t resY);
 
-private:
-    bool SetResolution(uint8_t channel, uint8_t streamID, uint32_t resX, uint32_t resY);
 
 };
 

app/src/main/cpp/netcamera/VendorCtrl.h

@@ -26,6 +26,7 @@ public:
     virtual bool TakePhoto(std::vector<uint8_t>& img) = 0;
     virtual bool TakeVideo(uint32_t duration, std::string path) = 0;
     virtual bool HasAuthOnStreaming() const { return false; }
+    virtual bool SetResolution(uint8_t channel, uint8_t streamID, uint32_t resX, uint32_t resY) = 0;
 
 protected:
 

app/src/main/cpp/netcamera/YuShiCtrl.cpp

@@ -13,6 +13,11 @@ YuShiCtrl::~YuShiCtrl()
 
 }
 
+bool YuShiCtrl::SetResolution(uint8_t channel, uint8_t streamID, uint32_t resX, uint32_t resY)
+{
+    return false;
+}
+
 bool YuShiCtrl::SetOsd(uint8_t channel, std::string osd, uint8_t pos)
 {
     // /LAPI/V1.0/Channels/<ID>/Media/OSDs/Contents

app/src/main/cpp/netcamera/YuShiCtrl.h

@@ -19,6 +19,7 @@ public:
     virtual bool UpdateTime(time_t ts);
     virtual bool TakePhoto(std::vector<uint8_t>& img);
     virtual bool TakeVideo(uint32_t duration, std::string path);
+    virtual bool SetResolution(uint8_t channel, uint8_t streamID, uint32_t resX, uint32_t resY);
 
 private:
     void OSDJson(int id, bool enabled, std::string osdString, int x, int y, bool timeOn, std::string& jsonString);