From 0fe2c6cc7286d4a4d640e6e8a853c400995110cb Mon Sep 17 00:00:00 2001
From: mali <mali81@huawei.com>
Date: Wed, 9 Nov 2022 11:17:05 +0800
Subject: [PATCH] Code static alarm modification

Signed-off-by: mali <mali81@huawei.com>
---
 .../cameraApp/src/main/cpp/camera_manager.cpp     | 15 ++++++---------
 cameraApp/cameraApp/src/main/cpp/camera_manager.h |  3 +--
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
index 2748366..974350a 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
+++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp
@@ -58,11 +58,7 @@ static int32_t SampleDealThumb(char* psrc, uint32_t srcSize, uint32_t* dstSize,
                 }
             }
             if (0 == memcmp(tempbuf + bufpos - 1, endflag, sizeof(endflag))) {
-                if (u16THMLen == s32I) {
-                    endpos = s32I;
-                } else {
-                    endpos = s32I;
-                }
+                endpos = s32I;
                 break;
             }
         }
@@ -407,7 +403,7 @@ SampleCameraStateMng::~SampleCameraStateMng()
         recorder_->Release();
         delete recorder_;
     }
-    if (gRecFd_ >= 0) {
+    if (gRecFd_ > 0) {
         FILE *fp = fdopen(gRecFd_, "w+");
         if (fp) {
             fflush(fp);
@@ -614,10 +610,11 @@ int SampleCameraManager::SampleCameraCreate()
     }
 
     list<string> camList = camKit->GetCameraIds();
-    for (auto &cam : camList) {
-        camId = cam;
-        break;
+    if (camList.size() == 0) {
+        cout << "SampleCameraCreate camList.size() = 0" << endl;
+        return -1;
     }
+    camId = camList.front();
 
     if (camId.empty()) {
         cout << "No available camera.(1080p wanted)" << endl;
diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.h b/cameraApp/cameraApp/src/main/cpp/camera_manager.h
index 47791c5..7c1f81f 100755
--- a/cameraApp/cameraApp/src/main/cpp/camera_manager.h
+++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.h
@@ -104,10 +104,9 @@ private:
 
 class SampleCameraManager {
 public:
-    SampleCameraManager()
+    SampleCameraManager():camId("")
     {
         camKit = nullptr;
-        camId = "";
         CamStateMng = nullptr;
     }
     ~SampleCameraManager();
-- 
Gitee