netease
/
SmartAudio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifimanager: add wifi status report msg for Qt UI.

This commit is contained in:
lijie02 2019-01-30 19:21:20 +08:00
parent f5c57f6d1d
commit 6cb7b6aa46
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
package/allwinner/wifimanager/smartaudio/app_wifi_manager.cpp
View File

@ -512,7 +512,8 @@ int api_wifi_state_notify(int state,int rssi, std::string ssid, std::string mac)
if(NULL != pEvtJson) if(NULL != pEvtJson)
{ {
//status = api_wifi_module_cmd_send((1<<MODULE_CONTROLLER),CMD_WIFI_STATE_NTF, pStateJson); //status = api_wifi_module_cmd_send((1<<MODULE_CONTROLLER),CMD_WIFI_STATE_NTF, pStateJson);
status = api_wifi_module_cmd_send(0xffffffff,CMD_WIFI_STATE_NTF, pEvtJson); // TO BE FIXED. msg type & recver.
status = api_wifi_module_cmd_send((1<<MODULE_CLOCK_FRAME),CMD_WIFI_STATE_RESP, pEvtJson);
if(0 != status) if(0 != status)
{ {
LOG_EX(LOG_Debug, "Wifi module send wifi state notify msg to control er:%d\r\n",status); LOG_EX(LOG_Debug, "Wifi module send wifi state notify msg to control er:%d\r\n",status);
@ -1005,8 +1006,8 @@ PDBUS_MSG_PACK DBusOnMessage(uv_loop_t *pLoop, DBusConnection *pConn,
pResJson = (uint8_t *)api_wifi_res_json_get(rsp_code); pResJson = (uint8_t *)api_wifi_res_json_get(rsp_code);
if(NULL != pResJson) if(NULL != pResJson)
{ {
if(0 == rsp_code)mask = 1<<MODULE_CONTROLLER | (1<<MODULE_CLOCK_FRAME); if(0 == rsp_code)mask = 1<<MODULE_CONTROLLER;
else mask = (1<<MODULE_BT)|(1<<MODULE_CONTROLLER) | (1<<MODULE_CLOCK_FRAME); else mask = (1<<MODULE_BT)|(1<<MODULE_CONTROLLER)|(1<<MODULE_CLOCK_FRAME);
status = api_wifi_module_cmd_send(mask,CMD_WIFI_CONF_RESP, (const char *)pResJson); status = api_wifi_module_cmd_send(mask,CMD_WIFI_CONF_RESP, (const char *)pResJson);
if(0 != status) if(0 != status)

17
package/netease/clockFrame/src/main.cpp
View File

@ -4,16 +4,17 @@
static std::thread thdDbusLoop; static std::thread thdDbusLoop;
static const char* g_pDBusInterfaceName = NULL; static const char* g_pDBusInterfaceName = NULL;
PDBUS_MSG_PACK DBusOnMessage(uv_loop_t *pLoop, DBusConnection *pConn,PDBUS_MSG_PACK pMsg) { PDBUS_MSG_PACK DBusOnMessage(uv_loop_t *pLoop, DBusConnection *pConn,PDBUS_MSG_PACK pMsg)
{
if(pMsg->busCmd != 0xa0a)
LOG_EX(LOG_Debug, "Frame module get message cmd:0x%x\r\n",pMsg->busCmd);
if (!pMsg || !pLoop || !pConn) { if (!pMsg || !pLoop || !pConn) {
return NULL; return NULL;
} }
if(pMsg->busCmd != 0xa0a)
{
LOG_EX(LOG_Debug, "Frame module get message cmd:0x%x\r\n",pMsg->busCmd);
LOG_EX(LOG_Debug, "Frame module get message: %s\r\n",pMsg->pMsg); LOG_EX(LOG_Debug, "Frame module get message: %s\r\n",pMsg->pMsg);
}
switch (pMsg->busCmd) { switch (pMsg->busCmd) {
case CMD_WIFI_SCAN_RESP: case CMD_WIFI_SCAN_RESP:
mailbox->recvWifiScanResult(QByteArray(pMsg->pMsg)); mailbox->recvWifiScanResult(QByteArray(pMsg->pMsg));
@ -21,8 +22,8 @@ PDBUS_MSG_PACK DBusOnMessage(uv_loop_t *pLoop, DBusConnection *pConn,PDBUS_MSG_P
case CMD_WIFI_CONF_RESP: case CMD_WIFI_CONF_RESP:
mailbox->recvWifiConfResult(QByteArray(pMsg->pMsg)); mailbox->recvWifiConfResult(QByteArray(pMsg->pMsg));
break; break;
case CMD_WIFI_STATE_NTF: case CMD_WIFI_STATE_RESP:
mailbox->recvWifiConfResult(QByteArray(pMsg->pMsg)); mailbox->recvWifiStatusChange(QByteArray(pMsg->pMsg));
break; break;
case CMD_WIFI_DISCONNECT_RESP: case CMD_WIFI_DISCONNECT_RESP:
mailbox->recvWifiDisconnectResult(QByteArray(pMsg->pMsg)); mailbox->recvWifiDisconnectResult(QByteArray(pMsg->pMsg));