From e5443c6040e704417cb4062d7823abee0e831405 Mon Sep 17 00:00:00 2001 From: Matthew Date: Thu, 9 May 2024 18:58:45 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=8D=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/cpp/PhoneDevice.cpp | 6 +++--- app/src/main/cpp/camera2/ndkcamera.cpp | 4 ++-- app/src/main/cpp/camera2/ndkcamera.h | 2 +- .../main/java/com/xypower/mpapp/ChannelActivity.java | 6 ++++-- app/src/main/res/layout/activity_channel.xml | 10 ++++++++++ app/src/main/res/values/strings.xml | 1 + 6 files changed, 21 insertions(+), 8 deletions(-) diff --git a/app/src/main/cpp/PhoneDevice.cpp b/app/src/main/cpp/PhoneDevice.cpp index 8fd64279..5dc5b482 100644 --- a/app/src/main/cpp/PhoneDevice.cpp +++ b/app/src/main/cpp/PhoneDevice.cpp @@ -931,19 +931,19 @@ bool CPhoneDevice::TakePhoto(const IDevice::PHOTO_INFO& photoInfo, const vector< params.autoExposure = mPhotoInfo.autoExposure; params.focusTimeout = mPhotoInfo.focusTimeout * 1000; params.exposureTime = mPhotoInfo.exposureTime; - params.sensibility = mPhotoInfo.sensibility; + params.sensitivity = mPhotoInfo.sensitivity; params.compensation = mPhotoInfo.compensation; params.orientation = mPhotoInfo.orientation; params.zoom = mPhotoInfo.zoom; params.zoomRatio = mPhotoInfo.zoomRatio; - if (photoInfo.channel == 2 || photoInfo.channel == 3) + if (photoInfo.ldrEnabled) { if (GpioControl::getLightAdc() > 1400) { params.autoExposure = 0; params.exposureTime = 1200; - params.sensibility = 1200; + params.sensitivity = 1200; } } diff --git a/app/src/main/cpp/camera2/ndkcamera.cpp b/app/src/main/cpp/camera2/ndkcamera.cpp index ca0ff101..6259a7bd 100644 --- a/app/src/main/cpp/camera2/ndkcamera.cpp +++ b/app/src/main/cpp/camera2/ndkcamera.cpp @@ -534,9 +534,9 @@ int NdkCamera::open(const std::string& cameraId) { uint8_t aeMode = ACAMERA_CONTROL_AE_MODE_OFF; status = ACaptureRequest_setEntry_u8(capture_request, ACAMERA_CONTROL_AE_MODE, 1, &aeMode); - if (m_params.sensibility > 0) + if (m_params.sensitivity > 0) { - int32_t sensitivity = m_params.sensibility; + int32_t sensitivity = m_params.sensitivity; status = ACaptureRequest_setEntry_i32(capture_request, ACAMERA_SENSOR_SENSITIVITY, 1, &sensitivity); } if (m_params.exposureTime > 0) diff --git a/app/src/main/cpp/camera2/ndkcamera.h b/app/src/main/cpp/camera2/ndkcamera.h index 246287b7..0c943cda 100644 --- a/app/src/main/cpp/camera2/ndkcamera.h +++ b/app/src/main/cpp/camera2/ndkcamera.h @@ -77,7 +77,7 @@ public: unsigned int zoom; unsigned int reserved : 7; unsigned int exposureTime; // ms - unsigned int sensibility; + unsigned int sensitivity; int compensation; float zoomRatio; }; diff --git a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java index 91f19f46..9fb165ca 100644 --- a/app/src/main/java/com/xypower/mpapp/ChannelActivity.java +++ b/app/src/main/java/com/xypower/mpapp/ChannelActivity.java @@ -150,6 +150,7 @@ public class ChannelActivity extends AppCompatActivity { binding.btnUsbCamera.setChecked(jsonObject.optInt("usbCamera", 0) == 1); binding.btnAutoExplosure.setChecked(jsonObject.optInt("autoExposure", 1) == 1); binding.btnAutoFocus.setChecked(jsonObject.optInt("autoFocus", 1) == 1); + binding.ldrEnabled.setChecked(jsonObject.optInt("ldrEnabled", 0) == 1); // binding.btnHdrMode.setChecked(jsonObject.optInt("hdrMode", 0) == 1); // binding.btnNightMode.setChecked(jsonObject.optInt("nightMode", 0) == 1); int sceneMode = jsonObject.optInt("sceneMode", 0); @@ -162,7 +163,7 @@ public class ChannelActivity extends AppCompatActivity { } } binding.exposuretime.setText(Integer.toString(jsonObject.optInt("exposureTime", 0))); - binding.sensitivity.setText(Integer.toString(jsonObject.optInt("sensibility", 0))); + binding.sensitivity.setText(Integer.toString(jsonObject.optInt("sensitivity", 0))); binding.btnZoom.setChecked(jsonObject.optInt("zoom", 0) == 1); if (jsonObject.has("compensation")) { binding.compensation.setText(Integer.toString(jsonObject.optInt("compensation", 0))); @@ -254,6 +255,7 @@ public class ChannelActivity extends AppCompatActivity { jsonObject.put("usbCamera", binding.btnUsbCamera.isChecked() ? 1 : 0); jsonObject.put("autoExposure", binding.btnAutoExplosure.isChecked() ? 1 : 0); jsonObject.put("autoFocus", binding.btnAutoFocus.isChecked() ? 1 : 0); + jsonObject.put("ldrEnabled", binding.ldrEnabled.isChecked() ? 1 : 0); // jsonObject.put("hdrMode", binding.btnHdrMode.isChecked() ? 1 : 0); // jsonObject.put("nightMode", binding.btnNightMode.isChecked() ? 1 : 0); int sceneMode = 0; @@ -262,7 +264,7 @@ public class ChannelActivity extends AppCompatActivity { sceneMode = Integer.parseInt(sceneModeText); jsonObject.put("sceneMode", sceneMode); jsonObject.put("exposureTime", Integer.parseInt(binding.exposuretime.getText().toString())); - jsonObject.put("sensibility", Integer.parseInt(binding.sensitivity.getText().toString())); + jsonObject.put("sensitivity", Integer.parseInt(binding.sensitivity.getText().toString())); jsonObject.put("zoom", binding.btnZoom.isChecked() ? 1 : 0); jsonObject.put("orientation", binding.orientations.getSelectedItemPosition()); jsonObject.put("recognization", binding.recognization.getSelectedItemPosition()); diff --git a/app/src/main/res/layout/activity_channel.xml b/app/src/main/res/layout/activity_channel.xml index 07f79765..45f4db33 100644 --- a/app/src/main/res/layout/activity_channel.xml +++ b/app/src/main/res/layout/activity_channel.xml @@ -267,6 +267,16 @@ app:layout_constraintTop_toTopOf="@+id/textViewCompensation" app:layout_constraintBottom_toBottomOf="@+id/textViewCompensation" /> + + + USB Camera 短视频时长（秒） 曝光补偿 + 光敏控制 Hello blank fragment Record