From a58d739404d31f3376d7e39f8bd9cb615a3e210c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=BB=86?= Date: Tue, 12 Apr 2022 08:34:58 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=BF=E7=94=A8nullptr=E4=BD=9C=E4=B8=BA?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88=E5=B8=B8=E9=87=8F=EF=BC=8C=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=89=80=E6=9C=89=E5=A3=B0=E6=98=8E=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E4=B8=8E=E5=AE=9A=E4=B9=89=E5=85=B7=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E5=90=8D=E7=A7=B0=E5=92=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=99=90=E5=AE=9A=E7=AC=A6=20Signed-off-by:=20yangtikun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cameraApp/src/main/cpp/camera_manager.cpp | 18 +++++++++--------- .../src/main/cpp/time_weather_view.cpp | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp index 5855a3f..2748366 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp +++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp @@ -599,7 +599,7 @@ SampleCameraManager::~SampleCameraManager() if (CamStateMng) { CamStateMng->SetStop(1); delete CamStateMng; - CamStateMng = NULL; + CamStateMng = nullptr; } } @@ -626,7 +626,7 @@ int SampleCameraManager::SampleCameraCreate() } CamStateMng = new SampleCameraStateMng(eventHdlr_); - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { printf("create SampleCameraStateMng failed! \n"); return -1; } @@ -656,7 +656,7 @@ bool SampleCameraManager::SampleCameraExist(void) int SampleCameraManager::SampleCameraStart(Surface *surface) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return -1; } CamStateMng->StartPreview(surface); @@ -674,7 +674,7 @@ int SampleCameraManager::SampleCameraStop(void) int SampleCameraManager::SampleCameraCaptrue(int type) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return -1; } CamStateMng->Capture(type); @@ -683,7 +683,7 @@ int SampleCameraManager::SampleCameraCaptrue(int type) int SampleCameraManager::SampleCameraStartRecord(Surface *surface) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return -1; } CamStateMng->StartRecord(surface); @@ -692,7 +692,7 @@ int SampleCameraManager::SampleCameraStartRecord(Surface *surface) int SampleCameraManager::SampleCameraPauseRecord(void) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return -1; } CamStateMng->SetPause(); @@ -701,7 +701,7 @@ int SampleCameraManager::SampleCameraPauseRecord(void) int SampleCameraManager::SampleCameraResumeRecord(Surface *mSurface) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return -1; } CamStateMng->SetResume(mSurface); @@ -710,7 +710,7 @@ int SampleCameraManager::SampleCameraResumeRecord(Surface *mSurface) int SampleCameraManager::SampleCameraStopRecord(void) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return -1; } CamStateMng->SetStop(0); @@ -718,7 +718,7 @@ int SampleCameraManager::SampleCameraStopRecord(void) } bool SampleCameraManager::SampleCameraGetRecord(void) { - if (CamStateMng == NULL) { + if (CamStateMng == nullptr) { return false; } return CamStateMng->RecordState(); diff --git a/launcher/launcher/src/main/cpp/time_weather_view.cpp b/launcher/launcher/src/main/cpp/time_weather_view.cpp index b63619a..fbb11e2 100755 --- a/launcher/launcher/src/main/cpp/time_weather_view.cpp +++ b/launcher/launcher/src/main/cpp/time_weather_view.cpp @@ -41,9 +41,9 @@ void TimeWeatherView::SetStyle(Style sty) viewGroup_->Invalidate(); } -void TimeWeatherView::SetPosion(int16_t x, int16_t y, int16_t height, int16_t width) +void TimeWeatherView::SetPosion(int16_t i16X, int16_t i16Y, int16_t i16H, int16_t i16W) { - viewGroup_->SetPosition(x, y, width, height); + viewGroup_->SetPosition(i16X, i16Y, i16W, i16H); } void TimeWeatherView::SetUpView() -- Gitee From 6931ef721c37da8835cd951bc747529a6051481c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=BB=86?= Date: Tue, 12 Apr 2022 09:04:23 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E6=88=96=E5=87=BD?= =?UTF-8?q?=E6=95=B0=E7=9A=84=E6=89=80=E6=9C=89=E5=A3=B0=E6=98=8E=E5=BF=85?= =?UTF-8?q?=E9=A1=BB=E4=B8=8E=E5=AE=9A=E4=B9=89=E5=85=B7=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E5=90=8D=E7=A7=B0=E5=92=8C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E9=99=90=E5=AE=9A=E7=AC=A6=E3=80=90c=E3=80=91=20Signed-off-by:?= =?UTF-8?q?=20yangtikun?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/launcher/src/main/cpp/time_weather_view.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/launcher/src/main/cpp/time_weather_view.cpp b/launcher/launcher/src/main/cpp/time_weather_view.cpp index fbb11e2..5fe89a3 100755 --- a/launcher/launcher/src/main/cpp/time_weather_view.cpp +++ b/launcher/launcher/src/main/cpp/time_weather_view.cpp @@ -41,9 +41,9 @@ void TimeWeatherView::SetStyle(Style sty) viewGroup_->Invalidate(); } -void TimeWeatherView::SetPosion(int16_t i16X, int16_t i16Y, int16_t i16H, int16_t i16W) +void TimeWeatherView::SetPosion(int16_t width, int16_t height, int16_t x, int16_t y) { - viewGroup_->SetPosition(i16X, i16Y, i16W, i16H); + viewGroup_->SetPosition(width, height, y, x); } void TimeWeatherView::SetUpView() -- Gitee From 19835d43ca337e9244ce05010ac158178ec0518d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=BB=86?= Date: Mon, 18 Apr 2022 08:43:26 +0000 Subject: [PATCH 3/3] =?UTF-8?q?Signed-off-by:=20yangtikun=20=E5=B7=B2=E6=8A=A5=E5=A4=87=EF=BC=8C=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E5=88=B0=E4=B9=8B=E5=89=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- launcher/launcher/src/main/cpp/time_weather_view.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/launcher/launcher/src/main/cpp/time_weather_view.cpp b/launcher/launcher/src/main/cpp/time_weather_view.cpp index 5fe89a3..b63619a 100755 --- a/launcher/launcher/src/main/cpp/time_weather_view.cpp +++ b/launcher/launcher/src/main/cpp/time_weather_view.cpp @@ -41,9 +41,9 @@ void TimeWeatherView::SetStyle(Style sty) viewGroup_->Invalidate(); } -void TimeWeatherView::SetPosion(int16_t width, int16_t height, int16_t x, int16_t y) +void TimeWeatherView::SetPosion(int16_t x, int16_t y, int16_t height, int16_t width) { - viewGroup_->SetPosition(width, height, y, x); + viewGroup_->SetPosition(x, y, width, height); } void TimeWeatherView::SetUpView() -- Gitee