From 4581d7a82ab089e6e5a6dd617466f45fb1e280ad Mon Sep 17 00:00:00 2001 From: HuangXin Date: Fri, 7 Sep 2018 14:43:40 +0800 Subject: [PATCH] Backup codes --- Example/main.c | 20 +++++++++++++++----- Framework/Timer/timer.c | 4 ---- Modules/Alarm/assistant.c | 4 ---- include/skins_res.h | 33 ++++++++++++++++++++++++++++----- include/smart_sound.h | 18 ++++++++++++++++++ 5 files changed, 61 insertions(+), 18 deletions(-) diff --git a/Example/main.c b/Example/main.c index 2c16c8c..5a378ab 100644 --- a/Example/main.c +++ b/Example/main.c @@ -2198,7 +2198,7 @@ int main(int argc, char **argv) #if 1 #endif -#if 0 +#if 1 if(modIdx == 18) { SkinInit(); @@ -2238,11 +2238,21 @@ int main(int argc, char **argv) #else //const char* GetSkinsResource(const char [in] *pKeyName, int [out] *pResType, int [out] *pVersion, const char [out] **pComeFrom) - //fprintf(stdout, "[v001] = {%s}\n", GetSkinsResource("v001", NULL, NULL, NULL)); - //fprintf(stdout, "[v109] = {%s}\n", GetSkinsResource("v109", NULL, NULL, NULL)); - //fprintf(stdout, "[v311] = {%s}\n", GetSkinsResource("v311", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v109] = {%s}\n", GetSkinsResource("v109", NULL, NULL, NULL)); + fprintf(stdout, "[v311] = {%s}\n", GetSkinsResource("v311", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); + fprintf(stdout, "[v401] = {%s}\n", GetSkinsResource("v401", NULL, NULL, NULL)); - //test_task_new(__uvTestSkin, NULL); + test_task_new(__uvTestSkin, NULL); #endif } #endif diff --git a/Framework/Timer/timer.c b/Framework/Timer/timer.c index c8950e5..3f91d7c 100644 --- a/Framework/Timer/timer.c +++ b/Framework/Timer/timer.c @@ -350,20 +350,16 @@ static int __getOnTimestamp(PALARM_ITEM_DATA pInfo) { if(pInfo->repeatMode == REPEAT_MODE_EVERY_MONTH_DAY) { - DEBUG_CODE_LINE(); if(pInfo->onDateTime.tm_mon < 11) { - DEBUG_CODE_LINE(); pInfo->onDateTime.tm_mon++; } else { - DEBUG_CODE_LINE(); pInfo->onDateTime.tm_mon = 0; pInfo->onDateTime.tm_year++; } - DEBUG_CODE_LINE(); pInfo->onTimestamp = mktime(&pInfo->onDateTime); return (0); } diff --git a/Modules/Alarm/assistant.c b/Modules/Alarm/assistant.c index 3695fe1..ae471b9 100644 --- a/Modules/Alarm/assistant.c +++ b/Modules/Alarm/assistant.c @@ -827,9 +827,6 @@ static void __assistantSyncThread(void *pParam) LOG_EX(LOG_Debug, "Send CMD_REMAIND_SYNC_REQ Command: %d\n", ret); #endif - while(TRUE) - { - } pthread_detach(pthread_self()); } @@ -856,7 +853,6 @@ int main(int argc, char **argv) AlarmTimerInit(pLoop); uv_thread_create(&uvSyncThread, __assistantSyncThread, NULL); - RunUVLoop(pLoop); while(TRUE) diff --git a/include/skins_res.h b/include/skins_res.h index 58b0838..742ccda 100644 --- a/include/skins_res.h +++ b/include/skins_res.h @@ -50,7 +50,7 @@ const SKIN_RES_INFO g_SkinDefaultResTable[] = { /// voice resources /////////////////////////////////////////////////////////////////////////////////////////////////////////////// #ifndef RES_FACTORY_MODE - {VOICE_RES, "0", "v102", DEF_SKINS_ROOT_PATH"voice/Alianwang002.mp3", "2ecc61d16a3ee0f02c4e580f00396d1f"}, + {VOICE_RES, "0", "v102", DEF_SKINS_ROOT_PATH"voice/Alianwang002.mp3", "c84ee8c2dade8b5d39e36d10ee8e3807"}, #endif {VOICE_RES, "0", "v103", DEF_SKINS_ROOT_PATH"voice/Alianwang003.mp3", "33c00781480680a9ea5ef6be1f7ac258"}, {VOICE_RES, "0", "v104", DEF_SKINS_ROOT_PATH"voice/Alianwang004.mp3", "d8ee9527dd6635f7251b455fcf177723"}, @@ -83,9 +83,20 @@ const SKIN_RES_INFO g_SkinDefaultResTable[] = { {VOICE_RES, "0", "v308", DEF_SKINS_ROOT_PATH"voice/S008.mp3", "5918f635de28b45f2d32e3eb4b05b9ad"}, {VOICE_RES, "0", "v309", DEF_SKINS_ROOT_PATH"voice/S009.mp3", "f9039012752b3ed2a00f173aa305acf1"}, {VOICE_RES, "0", "v310", DEF_SKINS_ROOT_PATH"voice/S010.mp3", "446ec757495bdf7aee31a41a9efe8bab"}, - {VOICE_RES, "0", "v311", DEF_SKINS_ROOT_PATH"voice/S011.mp3", "e9fa92d8929dcb2e134f42c1cedf4827"}, - {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/b-h-01.mp3", "68ecfbab58563071b6663a348a39a51b"}, - {VOICE_RES, "0", "v402", DEF_SKINS_ROOT_PATH"voice/b-h-50.mp3", "017b53f7610f6dd99e21b546e6b35605"}, + {VOICE_RES, "0", "v311", DEF_SKINS_ROOT_PATH"voice/S011.mp3", "e9fa92d8929dcb2e134f42c1cedf4827"}, + {VOICE_RES, "0", "v400", DEF_SKINS_ROOT_PATH"voice/B-h-60.mp3", "61b24ec25307072464866da912d38287"}, + {VOICE_RES, "0", "v400", DEF_SKINS_ROOT_PATH"voice/B-h-61.mp3", "a231dc24277e25e6d762269efa9a1e07"}, + {VOICE_RES, "0", "v400", DEF_SKINS_ROOT_PATH"voice/B-h-62.mp3", "27402531c6aff9a9cfb5e418267fb41e"}, + {VOICE_RES, "0", "v400", DEF_SKINS_ROOT_PATH"voice/B-h-63.mp3", "f9487a6bf86f82961011920509ae0704"}, + {VOICE_RES, "0", "v400", DEF_SKINS_ROOT_PATH"voice/B-h-64.mp3", "1e67f62e7d8f38dbd8535355cb50fd81"}, + {VOICE_RES, "0", "v400", DEF_SKINS_ROOT_PATH"voice/B-h-65.mp3", "d2e6c99c68e981e6126306cfe8a8058e"}, + {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/B-h-66.mp3", "cb64153aef2ea8d5d9baeb0fc683fd54"}, + {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/B-h-67.mp3", "6661a903cd05fdab1ecd5193fb789e51"}, + {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/B-h-68.mp3", "db32f17dc439c25255d934bbeaec6275"}, + {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/B-h-69.mp3", "a93fea8d57e37a519f3ee0388cbd6e9a"}, + {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/B-h-70.mp3", "f91f277864c927fedfee53fb1e9d964a"}, + {VOICE_RES, "0", "v401", DEF_SKINS_ROOT_PATH"voice/B-h-71.mp3", "a4a4ff36d63fa47072c9eb181712e5cb"}, + {VOICE_RES, "0", "v402", DEF_SKINS_ROOT_PATH"voice/b-h-50.mp3", "017b53f7610f6dd99e21b546e6b35605"}, {VOICE_RES, "0", "v403", DEF_SKINS_ROOT_PATH"voice/b-h-51.mp3", "422b4550253780343b7a9805ca7b629a"}, {VOICE_RES, "0", "v5011", DEF_SKINS_ROOT_PATH"voice/a-a-01.mp3", "5d9d186ef50b603ab84a9abbfd348630"}, {VOICE_RES, "0", "v5012", DEF_SKINS_ROOT_PATH"voice/a-a-02.mp3", "837a2222c961824e98c0d3751a234ae6"}, @@ -93,7 +104,19 @@ const SKIN_RES_INFO g_SkinDefaultResTable[] = { {VOICE_RES, "0", "v502", DEF_SKINS_ROOT_PATH"voice/a-n-01.mp3", "b1eb13ed8c9afaa2989763c3d379b39a"}, {VOICE_RES, "0", "v601", DEF_SKINS_ROOT_PATH"voice/b-m-1.mp3", "820cf2c01e03726b95bc4346a2ce8f8b"}, {VOICE_RES, "0", "v602", DEF_SKINS_ROOT_PATH"voice/b-m-2.mp3", "35a48b8ec586acfb99a612b4fc1ba57a"}, - + {VOICE_RES, "0", "v701", DEF_SKINS_ROOT_PATH"voice/B-b-1.mp3", "993810d9cdcdc7ea02c5a069c9a66623"}, + {VOICE_RES, "0", "v702", DEF_SKINS_ROOT_PATH"voice/B-b-2.mp3", "2748a62323e3e004cdc54da7f50b2315"}, + {VOICE_RES, "0", "v703", DEF_SKINS_ROOT_PATH"voice/B-b-3.mp3", "5be4e22fb53180719b5385863a50a7ae"}, + {VOICE_RES, "0", "v801", DEF_SKINS_ROOT_PATH"voice/C-yc-1.mp3", "ea4268b86e2527f79a0f239944645cc9"}, + {VOICE_RES, "0", "v901", DEF_SKINS_ROOT_PATH"voice/IoT-01.mp3", "22a19c8fc7b0a07701d256dde5eb510d"}, + {VOICE_RES, "0", "v902", DEF_SKINS_ROOT_PATH"voice/IoT-02.mp3", "d1187715117c33ffd48788e53cefc5bf"}, + {VOICE_RES, "0", "v903", DEF_SKINS_ROOT_PATH"voice/IoT-03.mp3", "39d829772814e1bd36b3d68863dbb651"}, + {VOICE_RES, "0", "v904", DEF_SKINS_ROOT_PATH"voice/IoT-04.mp3", "3315787b7c9ce5ea3e9e77a4b27f7358"}, + {VOICE_RES, "0", "v905", DEF_SKINS_ROOT_PATH"voice/IoT-05.mp3", "f4e8806c84c532bad54a25a81f983887"}, + {VOICE_RES, "0", "v906", DEF_SKINS_ROOT_PATH"voice/IoT-06.mp3", "a214a9af112c9581353ebfa171f4132e"}, + {VOICE_RES, "0", "v907", DEF_SKINS_ROOT_PATH"voice/IoT-07.mp3", "50b80fb9b4fc1afd96c0118382a25282"}, + {VOICE_RES, "0", "v908", DEF_SKINS_ROOT_PATH"voice/IoT-08.mp3", "ea911086bfe0603256ef4b7b6ab731e2"}, + {VOICE_RES, "0", "v909", DEF_SKINS_ROOT_PATH"voice/IoT-09.mp3", "32461a940f695d80623a05c871a0dcda"}, /////////////////////////////////////////////////////////////////////////////////////////////////////////// /// picture resources /////////////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/include/smart_sound.h b/include/smart_sound.h index 20d01f0..8a17142 100644 --- a/include/smart_sound.h +++ b/include/smart_sound.h @@ -125,6 +125,7 @@ typedef enum { CMD_MSC_REQMSG_MIC_CONTROL, CMD_MSC_RSPMSG_MIC_CONTROL, CMD_NDUILITE_FESPA_SET_ARG, + CMD_NDUILITE_SDK_REINIT, CMD_YUNXIN_RECVMSG, CMD_YUNXIN_SENDMSG, CMD_YUNXIN_SENDMSG_BYPASS, @@ -145,6 +146,18 @@ typedef enum { CMD_WIFI_CHANGE_VALID_AP_OUT, CMD_WIFI_CHANGE_VALID_AP_RESP, + CMD_WIFI_BL_CMD_START, + CMD_WIFI_BL_CONF, + CMD_WIFI_BL_CONF_ABORT, + CMD_WIFI_BL_DEV_INFO_NTF, + CMD_WIFI_BL_CLOUD_CHALLENGE_SIGNATURE, + CMD_WIFI_BL_DEV_SIGNATURE, + CMD_WIFI_BL_CLOUD_SHAREDKEY, + CMD_WIFI_BL_DEV_TOKEN, + CMD_WIFI_BL_DEV_TOKEN_BOUND, + CMD_WIFI_BL_CONF_FAILED, + CMD_WIFI_BL_CMD_END, + CMD_BT_NAME_GET_REQ, CMD_BT_NAME_GET_RESP, CMD_BT_EVT_NTF, @@ -187,6 +200,11 @@ typedef enum { CMD_BT_VOL_CHANGE, CMD_BT_BREDR_REBOOT_CLOSE, + CMD_BT_AVK_DEV_CON_CONFLICT, + CMD_WIFI_ON, + CMD_WIFI_OFF, + CMD_WIFI_ON_RESP, + CMD_WIFI_OFF_RESP, CMD_KPLAYER_START = 0x1b00, CMD_KPLAYER_STOP,