修改禁用RAW格式时的拍照数量设置的错误

优化日志

app/src/main/cpp/PhoneDevice.cpp

@@ -615,6 +615,7 @@ bool CPhoneDevice::SelfTest(std::string& result)
         int32_t width = 0;
         int32_t height = 0;
         NdkCamera::CAMERA_PARAMS params = { 0 };
+        params.burstCaptures = 1;
         if (usbCamera)
         {
             TurnOnOtg(NULL);
@@ -2972,6 +2973,7 @@ void CPhoneDevice::TurnOnCameraPower(JNIEnv* env)
 
 void CPhoneDevice::TurnOffCameraPower(JNIEnv* env)
 {
+    bool turnedOff = false;
     m_powerLocker.lock();
     if (mCameraPowerCount > 0)
     {
@@ -2979,9 +2981,15 @@ void CPhoneDevice::TurnOffCameraPower(JNIEnv* env)
         if (mCameraPowerCount == 0)
         {
             GpioControl::setCam3V3Enable(false);
+            turnedOff = true;
         }
     }
     m_powerLocker.unlock();
+
+    if (turnedOff)
+    {
+        XYLOG(XYLOG_SEVERITY_INFO, "CAM PWR Turned Off");
+    }
 }
 
 void CPhoneDevice::TurnOnOtg(JNIEnv* env)
@@ -2998,17 +3006,24 @@ void CPhoneDevice::TurnOnOtg(JNIEnv* env)
 
 void CPhoneDevice::TurnOffOtg(JNIEnv* env)
 {
+    bool turnedOff = false;
     m_powerLocker.lock();
     if (mOtgCount > 0)
     {
         mOtgCount--;
         if (mOtgCount == 0)
         {
-            ALOGD("setOtgState 0");
+            // ALOGD("setOtgState 0");
             GpioControl::setOtgState(false);
+            turnedOff = true;
         }
     }
     m_powerLocker.unlock();
+
+    if (turnedOff)
+    {
+        XYLOG(XYLOG_SEVERITY_INFO, "OTG PWR Turned Off");
+    }
 }
 
 void CPhoneDevice::UpdateSignalLevel(int signalLevel)

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

@@ -170,7 +170,7 @@ NdkCamera::NdkCamera(int32_t width, int32_t height, const NdkCamera::CAMERA_PARA
 	mResult = { 0 };
 	mLdr = ~0;
 	mFinalLdr = 0;
-	mFinalBurstCaptures = m_params.burstCaptures;
+	mFinalBurstCaptures = m_params.burstRawCapture == 0 ? 1 : m_params.burstCaptures;
 	if (mFinalBurstCaptures == 0)
 	{
 		mFinalBurstCaptures = 1;