From a20ed62c086f3ec8535313b5aea63178a0cc5982 Mon Sep 17 00:00:00 2001 From: Fancy code <258828110.@qq.com> Date: Fri, 14 Jun 2024 13:42:16 +0800 Subject: [PATCH] Improve:wifi hal. --- hal/src/CameraHal.cpp | 14 ++++++++++++++ hal/src/WifiHal.cpp | 12 +++++++++++- .../src/Protocol/SixFrame/SixFrameHandle.cpp | 2 +- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/hal/src/CameraHal.cpp b/hal/src/CameraHal.cpp index 7f4fefdc..5237355a 100644 --- a/hal/src/CameraHal.cpp +++ b/hal/src/CameraHal.cpp @@ -59,6 +59,20 @@ void CameraHal::GetAudioStream(const void *stream, const unsigned int &length) if (mTaskRuning && nullptr != mAudioStreamCallback) { mAudioStreamCallback(stream, length); } + // if (mTaskRuning) { + // LogInfo("GetAudioStream length33:%d\n", length); + // FILE *file = nullptr; + // file = fopen("/tmp/audio.bin", "a+"); + + // if (file) { + // fwrite(stream, 1, length, file); + // fflush(file); + // } + + // if (file) { + // fclose(file); + // } + // } } void CameraHal::GetVideoStream(const void *stream, const unsigned int &length) { diff --git a/hal/src/WifiHal.cpp b/hal/src/WifiHal.cpp index 8e684354..9035dda7 100644 --- a/hal/src/WifiHal.cpp +++ b/hal/src/WifiHal.cpp @@ -29,12 +29,22 @@ StatusCode WifiHal::OpenApMode(void) constexpr int SLEEP_TIME_MS = 5; constexpr int WAITING_TIME_MS = 1000 * 10; unsigned int sleepingTime_ms = 0; + unsigned int resetWifiPowerCount = 0; mInitRunning = true; while (CheckWlan0IfExist() == false) { std::this_thread::sleep_for(std::chrono::milliseconds(SLEEP_TIME_MS)); sleepingTime_ms += SLEEP_TIME_MS; if (sleepingTime_ms > WAITING_TIME_MS) { - LogError("wlan0 not found. \n"); + if (0 == resetWifiPowerCount) { + LogWarning("wlan0 not found, try to reset. \n"); + PowerOff(); + std::this_thread::sleep_for(std::chrono::milliseconds(1000)); + PowerOn(); + sleepingTime_ms = 0; + resetWifiPowerCount++; + continue; + } + LogError("wlan0 not found, reset wifi power count: %d. \n", resetWifiPowerCount); return CreateStatusCode(STATUS_CODE_NOT_OK); } if (false == mInitRunning) { diff --git a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp index a3db775b..704e4078 100644 --- a/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp +++ b/middleware/AppManager/src/Protocol/SixFrame/SixFrameHandle.cpp @@ -423,8 +423,8 @@ void SixFrameHandle::ResponseGetParamItems(cJSON *result, const AppGetCapability cJSON_AddItemToObject(mic, CJSON_INDEX_STRING, index); cJSON_AddItemToArray(items, cJSON_CreateString("on")); cJSON_AddItemToArray(items, cJSON_CreateString("off")); - cJSON_AddItemToArray(index, cJSON_CreateNumber(0)); cJSON_AddItemToArray(index, cJSON_CreateNumber(1)); + cJSON_AddItemToArray(index, cJSON_CreateNumber(0)); } } // {