修复手机app拍照总是通道1的bug

修复停止服务时crash bug
nx2024TEMP
Matthew 7 months ago
parent 802fa5f5ca
commit 059c90cfb0

@ -396,6 +396,10 @@ Java_com_xypower_mpapp_MicroPhotoService_takePhoto(
std::string configFilePathStr = jstring2string(env, configFilePath); std::string configFilePathStr = jstring2string(env, configFilePath);
CFG_CHANNEL cfg; CFG_CHANNEL cfg;
cfg.camera_id = channel - 1;
cfg.quality = DEFAULT_JPEG_QUALITY;
cfg.requestTemplate = 2;
IDevice::PHOTO_INFO photoInfo(channel, preset); IDevice::PHOTO_INFO photoInfo(channel, preset);
CTerminal::LoadChannelConfig(channel, configFilePathStr, cfg); CTerminal::LoadChannelConfig(channel, configFilePathStr, cfg);
CTerminal::ConvertChannelConfigToPhotoInfo(cfg, photoOrVideo != JNI_FALSE, photoInfo); CTerminal::ConvertChannelConfigToPhotoInfo(cfg, photoOrVideo != JNI_FALSE, photoInfo);
@ -508,6 +512,7 @@ Java_com_xypower_mpapp_MicroPhotoService_uninit(
} }
pTerminal->SignalExit(); pTerminal->SignalExit();
pTerminal->Shutdown(); pTerminal->Shutdown();
dev = pTerminal->GetDevice();
if (dev != NULL) if (dev != NULL)
{ {
delete dev; delete dev;

Loading…
Cancel
Save