优化拍照参数设置

app/src/main/cpp/camera2/ndkcamera.cpp

@@ -467,8 +467,11 @@ int NdkCamera::open(const std::string& cameraId) {
 
         if (!m_params.zoom)
         {
-            uint8_t trig = ACAMERA_CONTROL_AF_TRIGGER_START;
+            uint8_t trig = ACAMERA_CONTROL_AF_TRIGGER_CANCEL;
-            status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
+            // status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
+
+            trig = ACAMERA_CONTROL_AF_TRIGGER_START;
+            // status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AF_TRIGGER, 1, &trig);
         }
         if (status == ACAMERA_OK)
         {
@@ -486,6 +489,12 @@ int NdkCamera::open(const std::string& cameraId) {
 
 
     {
+        if (m_params.sceneMode != 0)
+        {
+            uint8_t sceneMode = m_params.sceneMode;
+            status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_SCENE_MODE, 1, &sceneMode);
+        }
+
         if (m_params.autoExposure) {
             uint8_t aeMode = ACAMERA_CONTROL_AE_MODE_ON;
             status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AE_MODE, 1, &aeMode);
@@ -542,12 +551,6 @@ int NdkCamera::open(const std::string& cameraId) {
         uint8_t awbMode = ACAMERA_CONTROL_AWB_MODE_AUTO;
         status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AWB_MODE, 1, &awbMode);
 
-        if (m_params.sceneMode != 0)
-        {
-            uint8_t sceneMode = m_params.sceneMode;
-            status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_SCENE_MODE, 1, &sceneMode);
-        }
-
         status = ACameraOutputTarget_create(image_reader_surface, &image_reader_target);
         status = ACaptureRequest_addTarget(capture_request, image_reader_target);
     }