diff --git a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp index 22e3351ccf6a0c5f74cf8b20de1f7b990ec9b458..144ca0eb8ca209796691d512a025b69e2f9de66a 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp +++ b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.cpp @@ -149,7 +149,7 @@ public: tmLabel = nullptr; bttnIdx_ = 0; } - virtual ~CameraImageButtonOnClickListener(){} + virtual ~CameraImageButtonOnClickListener() {} bool OnClick(UIView &view, const ClickEvent &event) override { diff --git a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.h b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.h index 2c30c02c675e7f044fcb234b3c6e2f9ef78272a7..8da040cad678a20a3923c2b8c11bedf39437ee3d 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.h +++ b/cameraApp/cameraApp/src/main/cpp/camera_ability_slice.h @@ -45,7 +45,7 @@ public: Task::Init(); } - virtual ~TaskView(){} + virtual ~TaskView() {} void TaskStart(void) { Task::SetPeriod(1000); /* 1000=1s */ @@ -90,8 +90,11 @@ private: char buff[20] = { 0 }; if (timeLabel_ == nullptr) return; - - sprintf_s(buff, sizeof(buff), "%02d : %02d", ss / 60, ss % 60); /* 60=1s */ + int temp = 0; + temp = sprintf_s(buff, sizeof(buff), "%02d : %02d", ss / 60, ss % 60); /* 60=1s */ + if (temp != 0) { + printf("result is %d\n", temp); + }; timeLabel_->SetText(buff); } }; diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp index 974350a3a1fab1b2f959e07db068cea101ea7083..57f307b26cd796dbb330cfa1027860e00492ddf2 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp +++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.cpp @@ -614,8 +614,8 @@ int SampleCameraManager::SampleCameraCreate() cout << "SampleCameraCreate camList.size() = 0" << endl; return -1; } - camId = camList.front(); + camId = camList.front(); if (camId.empty()) { cout << "No available camera.(1080p wanted)" << endl; printf("No available camera.(1080p wanted)####################### \n"); diff --git a/cameraApp/cameraApp/src/main/cpp/camera_manager.h b/cameraApp/cameraApp/src/main/cpp/camera_manager.h index 7c1f81f558818c2d7ed64e7595eb7a5d20f89163..22cc64e798be3924fb96a3be865c3b22c9fec248 100755 --- a/cameraApp/cameraApp/src/main/cpp/camera_manager.h +++ b/cameraApp/cameraApp/src/main/cpp/camera_manager.h @@ -49,7 +49,7 @@ typedef enum { class TestFrameStateCallback : public FrameStateCallback { public: TestFrameStateCallback() : gPhotoType_(0), gIsFinished_(false) {} - ~TestFrameStateCallback(){} + ~TestFrameStateCallback() {} void OnFrameFinished(Camera &camera, FrameConfig &fc, FrameResult &result) override; void SetPhotoType(int type); diff --git a/launcher/launcher/src/main/cpp/time_weather_view.cpp b/launcher/launcher/src/main/cpp/time_weather_view.cpp index b63619a4564a3287d15f4fb3be4cbb6a9b3a6a24..2d6699e56d8c615cc6b7cef402a9e774b9da5b9d 100755 --- a/launcher/launcher/src/main/cpp/time_weather_view.cpp +++ b/launcher/launcher/src/main/cpp/time_weather_view.cpp @@ -138,7 +138,7 @@ void TimeWeatherView::GetWeekdayByYearday(int iY, int iM, int iD, char* date, in iY--; } // 1 : MONDAY_LAUNCHER, 2 : TUESDAY_LAUNCHER, 3 : WEDNESDAY_LAUNCHER, 4 : , 5 : ect - iWeekDay = (iD + 1 + 2 * iM + 3 * (iM + 1) / 5 + iY + iY / 4 - iY / oneHundred + iY / fourHundred) % WEEKEND_LAUNCHER; + iWeekDay = (iD + 1 + 2*iM + 3*(iM + 1)/5 + iY + iY/4 - iY/oneHundred + iY/fourHundred) % WEEKEND_LAUNCHER; for (int i = 0; i < WEEK_DAY_MAX; i++) { if (iWeekDay == i) { if (memcpy_s(date, size, g_weekDate[i], strlen(g_weekDate[i])) == LAUNCHER_SUCCESS) { diff --git a/setting/setting/src/main/cpp/app_info_ability_slice.h b/setting/setting/src/main/cpp/app_info_ability_slice.h index 4520ad6dae118e93a8db8707ac32400f42d4c1b3..d8611c651f37eccf0a412bc1dd4c596b9f3712c7 100755 --- a/setting/setting/src/main/cpp/app_info_ability_slice.h +++ b/setting/setting/src/main/cpp/app_info_ability_slice.h @@ -49,11 +49,11 @@ public: togglebutton_ = togglebutton; } - virtual ~ToggBtnOnListener(){} + virtual ~ToggBtnOnListener() {} void SetPermissionName(const char* permissionsName, int nameLenght) { - int ret; + int ret = 0; ret = memcpy_s(name_, sizeof(name_), permissionsName, nameLenght); if (ret != EOK) { printf("[ERR] memcpy_s func[SetToggleButton]\n"); @@ -64,7 +64,7 @@ public: void SetBundleName(const char* bundleName, int nameLength) { - int ret; + int ret = 0; ret = memcpy_s(bundleName_, sizeof(bundleName_), bundleName, nameLength); if (ret != EOK) { printf("[ERR] memcpy_s func[SetBundleName]\n"); @@ -124,7 +124,6 @@ private: void PermissionInfoList(); void SetAppPermissionInfo(int index, PermissionSaved& permissions); char bundleName_[128] = {0}; - }; } // namespace OHOS #endif diff --git a/setting/setting/src/main/cpp/setting_main_ability.cpp b/setting/setting/src/main/cpp/setting_main_ability.cpp index 080a87fc62de72c40bef750807b7a25ef68002d9..a90914b78c90897c00d1a435f29931595bcc9106 100755 --- a/setting/setting/src/main/cpp/setting_main_ability.cpp +++ b/setting/setting/src/main/cpp/setting_main_ability.cpp @@ -41,7 +41,6 @@ void SettingMainAbility::OnBackground() void SettingMainAbility::OnStop() { - Ability::OnStop(); } } // namespace OHOS \ No newline at end of file diff --git a/setting/setting/src/main/cpp/wpa_work.c b/setting/setting/src/main/cpp/wpa_work.c index 656da76566e5fc4bcf544e953660e0a1aeccdfef..140c15ff8cdc7069bff77794944f6ce531267f28 100755 --- a/setting/setting/src/main/cpp/wpa_work.c +++ b/setting/setting/src/main/cpp/wpa_work.c @@ -15,6 +15,7 @@ #include "wpa_work.h" #include +#include #define WPA_IFACE_NAME "wlan0" #define WIFI_AUTH_FAILED_REASON_STR "WRONG_KEY" @@ -485,11 +486,16 @@ static void *ThreadMain() int i = 0; int myfor = 5; char *arg[20] = {0}; + 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); arg[i] = (char *)"wpa_supplicant"; arg[++i] = (char *)"-i"; arg[++i] = (char *)"wlan0"; arg[++i] = (char *)"-c"; - arg[++i] = (char *)"/storage/app/run/com.huawei.setting/setting/assets/setting/resources/base/element/wpa_supplicant.conf"; + arg[++i] = (char *)argstr; for (i = 0; i < myfor; i++) { printf("[LOG]arg[%d]->%s \n", i, arg[i]);