openharmony/applications_sample_camera
1
0
Fork 0
mirror of https://github.com/openharmony/applications_sample_camera.git synced 2026-07-19 21:26:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

!148 applications_sample_camera部件编译整改主干告警消除

Browse Source 
Merge pull request !148 from tongkai0808fh/master
This commit is contained in:
openharmony_ci
2024-05-08 06:13:19 +00:00
committed by Gitee
parent 871ae0aa3c 39a0ad7981
commit e643cb64cb
2 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/launcher/src/main/cpp/time_weather_view.cpp
+6 -18
View File
@@ -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<UILabel*>(viewTime_->GetChildById("labletime"));
if (label) {
label->SetText(hour_min);
}
if (label) { label->SetText(hour_min); }
label = static_cast<UILabel*>(viewTime_->GetChildById("labledate"));
if (label) {
label->SetText(date);
}
if (label) { label->SetText(date); }
viewTime_->Invalidate();
}
}
setting/setting/src/main/cpp/wpa_work.c
+4 -4
View File
@@ -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, strlen(argstr1) + 1, argstr1);
strcat_s(argstr, strlen(argstr2) + 1, argstr2);
arg[i] = (char *)"wpa_supplicant";
arg[++i] = (char *)"-i";
arg[++i] = (char *)"wlan0";