From 0dfd785784d0610220f4d088004f15ae26700a60 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 7 May 2024 02:39:39 +0000 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9launcher/launcher/src/mai?= =?UTF-8?q?n/cpp/time=5Fweather=5Fview.cpp=E6=96=87=E4=BB=B6=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=87=BD=E6=95=B0=E8=A1=8C=E6=95=B0=E8=BF=87?= =?UTF-8?q?=E5=A4=9A=E5=91=8A=E8=AD=A6=20=E4=BF=AE=E6=94=B9TimeWeatherView?= =?UTF-8?q?::SetUpTimeView=E5=87=BD=E6=95=B0=E5=86=85=E5=AE=B9=EF=BC=8C?= =?UTF-8?q?=E6=B6=88=E9=99=A4=E5=87=BD=E6=95=B0=E8=A1=8C=E6=95=B0=E8=BF=87?= =?UTF-8?q?=E5=A4=9A=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- .../src/main/cpp/time_weather_view.cpp | 24 +++++-------------- 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/launcher/launcher/src/main/cpp/time_weather_view.cpp b/launcher/launcher/src/main/cpp/time_weather_view.cpp index 2d6699e..c855bde 100755 --- a/launcher/launcher/src/main/cpp/time_weather_view.cpp +++ b/launcher/launcher/src/main/cpp/time_weather_view.cpp @@ -63,22 +63,14 @@ void TimeWeatherView::SetUpTimeView() const int16_t commonYear = 1970; time_t t = time(nullptr); struct tm* st = localtime(&t); - if (st == nullptr) { - return; - } + if (st == nullptr) { return; } int ret = sprintf_s(hour_min, sizeof(hour_min), "%02d : %02d", st->tm_hour, st->tm_min); - if (ret == LAUNCHER_PARAMERROR) { - return; - } + if (ret == LAUNCHER_PARAMERROR) { return; } ret = sprintf_s(mont_day, sizeof(mont_day), "%02d月%02d日", st->tm_mon + january, st->tm_mday); - if (ret == LAUNCHER_PARAMERROR) { - return; - } + if (ret == LAUNCHER_PARAMERROR) { return; } GetWeekdayByYearday(st->tm_year + commonYear, st->tm_mon + january, st->tm_mday, week_day, sizeof(week_day)); ret = sprintf_s(date, sizeof(date), "%s %s", mont_day, week_day); - if (ret == LAUNCHER_PARAMERROR) { - return; - } + if (ret == LAUNCHER_PARAMERROR) { return; } if (viewTime_ == nullptr) { viewTime_ = new UIViewGroup(); viewTime_->SetPosition(BLANK_TW, BLANK_H, viewGroup_->GetWidth() - BLANK_W, @@ -111,13 +103,9 @@ void TimeWeatherView::SetUpTimeView() } else { UILabel* label = nullptr; label = static_cast(viewTime_->GetChildById("labletime")); - if (label) { - label->SetText(hour_min); - } + if (label) { label->SetText(hour_min); } label = static_cast(viewTime_->GetChildById("labledate")); - if (label) { - label->SetText(date); - } + if (label) { label->SetText(date); } viewTime_->Invalidate(); } } -- Gitee From fa1fff5d0b328918123eb886c3cd61e31cb78f79 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Tue, 7 May 2024 03:46:37 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9media/camera=5Fsample.cpp?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=9A=84Recorder=20*SampleCreateRecorder?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=86=99=E6=B3=95=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E8=A1=8C=E6=95=B0=E8=BF=87=E5=A4=9A=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=20=E4=BF=AE=E6=94=B9Recorder=20*SampleCreateRecorder?= =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=86=99=E6=B3=95=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?G.FUN.01=20-CPP=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- media/camera_sample.cpp | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/media/camera_sample.cpp b/media/camera_sample.cpp index 801644d..0ccbcc2 100755 --- a/media/camera_sample.cpp +++ b/media/camera_sample.cpp @@ -87,6 +87,15 @@ Recorder *SampleCreateRecorder() int32_t height = 1080; VideoCodecFormat encoder = HEVC; Recorder *recorder = new Recorder(); + HandleVideoAudio(recorder); + return recorder; + +ERROR: + delete recorder; + return nullptr; +} + +void HandleVideoAudio(Recorder *recorder) { if ((ret = recorder->SetVideoSource(source, sourceId)) != SUCCESS) { cout << "SetVideoSource failed." << ret << endl; goto ERROR; @@ -135,11 +144,6 @@ Recorder *SampleCreateRecorder() cout << "SetAudioEncodingBitRate failed." << ret << endl; goto ERROR; } - return recorder; - -ERROR: - delete recorder; - return nullptr; } class SampleFrameStateCallback : public FrameStateCallback { -- Gitee From a39debe601fc3b9e3708170560d3955450dc7a89 Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Wed, 8 May 2024 02:05:04 +0000 Subject: [PATCH 3/5] =?UTF-8?q?=E5=9B=9E=E9=80=80media/camera=5Fsample.cpp?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=20=E5=9B=9E=E9=80=80cpp?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=EF=BC=8C=E5=85=88=E8=A7=A3?= =?UTF-8?q?=E5=86=B3=E9=BB=84=E5=8C=BA=E4=BB=A3=E7=A0=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E5=91=8A=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- media/camera_sample.cpp | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/media/camera_sample.cpp b/media/camera_sample.cpp index 0ccbcc2..801644d 100755 --- a/media/camera_sample.cpp +++ b/media/camera_sample.cpp @@ -87,15 +87,6 @@ Recorder *SampleCreateRecorder() int32_t height = 1080; VideoCodecFormat encoder = HEVC; Recorder *recorder = new Recorder(); - HandleVideoAudio(recorder); - return recorder; - -ERROR: - delete recorder; - return nullptr; -} - -void HandleVideoAudio(Recorder *recorder) { if ((ret = recorder->SetVideoSource(source, sourceId)) != SUCCESS) { cout << "SetVideoSource failed." << ret << endl; goto ERROR; @@ -144,6 +135,11 @@ void HandleVideoAudio(Recorder *recorder) { cout << "SetAudioEncodingBitRate failed." << ret << endl; goto ERROR; } + return recorder; + +ERROR: + delete recorder; + return nullptr; } class SampleFrameStateCallback : public FrameStateCallback { -- Gitee From 0a0b6bc45528cbee8eadd4cc9bc848cf8e0fe31a Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Wed, 8 May 2024 02:11:23 +0000 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9setting/setting/src/main/?= =?UTF-8?q?cpp/wpa=5Fwork.c=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E9=BB=84=E5=8C=BA=E4=BB=A3=E7=A0=81=E6=A3=80=E6=9F=A5=E6=8A=A5?= =?UTF-8?q?=E9=94=99=20=E6=A0=B9=E6=8D=AE=E9=BB=84=E5=8C=BA=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B6=88?= =?UTF-8?q?=E9=99=A4=E9=BB=84=E5=8C=BA=E4=BB=A3=E7=A0=81=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 140c15f..a55d01c 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -316,7 +316,7 @@ static void CliRecvPending(void) { int pendingResult = -1; pthread_mutex_lock(&g_monitorConnMutex); - if (g_monitorConn!= NULL) { + if (g_monitorConn != NULL) { pendingResult = wpa_ctrl_pending(g_monitorConn); } while (pendingResult > 0) { @@ -433,7 +433,7 @@ int InitControlInterface() ret = -1; pthread_mutex_lock(&g_monitorConnMutex); - if (g_monitorConn!= NULL) { + if (g_monitorConn != NULL) { ret = wpa_ctrl_attach(g_monitorConn); } pthread_mutex_unlock(&g_monitorConnMutex); @@ -489,8 +489,8 @@ static void *ThreadMain() char argstr1[] = "/storage/app/run/com.huawei.setting/setting/assets"; char argstr2[] = "/setting/resources/base/element/wpa_supplicant.conf"; char argstr[120]; - strcpy(argstr, argstr1); - strcat(argstr, argstr2); + strcpy_s(argstr, argstr1); + strcat_s(argstr, argstr2); arg[i] = (char *)"wpa_supplicant"; arg[++i] = (char *)"-i"; arg[++i] = (char *)"wlan0"; -- Gitee From 39a0ad79815baec2834b024edb71d8108466d8db Mon Sep 17 00:00:00 2001 From: tongkai0808fh Date: Wed, 8 May 2024 02:38:06 +0000 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9setting/setting/src/main/?= =?UTF-8?q?cpp/wpa=5Fwork.c=E6=96=87=E4=BB=B6=EF=BC=8C=E6=B6=88=E9=99=A4?= =?UTF-8?q?=E9=97=A8=E7=A6=81=E6=8A=A5=E9=94=99=20=E4=BF=AE=E6=94=B9strcpy?= =?UTF-8?q?=5Fs=E5=92=8Cstrcat=5Fs=E5=87=BD=E6=95=B0=E7=94=A8=E6=B3=95?= =?UTF-8?q?=EF=BC=8C=E6=B6=88=E9=99=A4=E9=97=A8=E7=A6=81=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E4=B8=AA=E6=95=B0=E4=B8=8D=E5=AF=B9=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: tongkai0808fh --- setting/setting/src/main/cpp/wpa_work.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index a55d01c..7f93487 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -489,8 +489,8 @@ static void *ThreadMain() char argstr1[] = "/storage/app/run/com.huawei.setting/setting/assets"; char argstr2[] = "/setting/resources/base/element/wpa_supplicant.conf"; char argstr[120]; - strcpy_s(argstr, argstr1); - strcat_s(argstr, argstr2); + strcpy_s(argstr, strlen(argstr1) + 1, argstr1); + strcat_s(argstr, strlen(argstr2) + 1, argstr2); arg[i] = (char *)"wpa_supplicant"; arg[++i] = (char *)"-i"; arg[++i] = (char *)"wlan0"; -- Gitee