Merge branch 'sdk650' of https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230...

diff --cc code/sdk/application/audio/sample_audio_api.h
index afdd3d9,8d8b6be..afdd3d9
mode 100755,100644..100644
--- 1/code/sdk/application/audio/sample_audio_api.h
--- 2/code/sdk/application/audio/sample_audio_api.h
+++ b/code/sdk/application/audio/sample_audio_api.h

diff --cc code/sdk/build/config/target_config/brandy/config.py
index 8c4257f,0b51bc1..8c4257f
mode 100755,100644..100644
--- 1/code/sdk/build/config/target_config/brandy/config.py
--- 2/code/sdk/build/config/target_config/brandy/config.py
+++ b/code/sdk/build/config/target_config/brandy/config.py

diff --cc code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h
index 59dd614,df78e90..59dd614
mode 100755,100644..100644
--- 1/code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h
--- 2/code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h
+++ b/code/sdk/drivers/drivers/driver/audio/source/core/common/include/audio_debug.h

diff --cc code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h
index 2f3fc7d,5c13a49..2f3fc7d
mode 100755,100644..100644
--- 1/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h
--- 2/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h
+++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/common.h

diff --cc code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h
index 266871d,2952919..266871d
mode 100755,100644..100644
--- 1/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h
--- 2/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h
+++ b/code/sdk/middleware/chips/brandy/nv/nv_config/include/key_id.h

diff --cc code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h
index a06afbf,c7a30fc..a06afbf
mode 100755,100644..100644
--- 1/code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h
--- 2/code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h
+++ b/code/sdk/open_source/7-zip-lzma-sdk/lzma_21.07/C/7zFile.h

diff --cc code/sdk/zhihui/config/include/ConfigModel.h
index 87d229f,602d6ea..87d229f
mode 100755,100644..100644
--- 1/code/sdk/zhihui/config/include/ConfigModel.h
--- 2/code/sdk/zhihui/config/include/ConfigModel.h
+++ b/code/sdk/zhihui/config/include/ConfigModel.h

diff --cc code/sdk/zhihui/config/src/ConfigModel.cpp
index 6708317,5754999..6708317
mode 100755,100644..100644
--- 1/code/sdk/zhihui/config/src/ConfigModel.cpp
--- 2/code/sdk/zhihui/config/src/ConfigModel.cpp
+++ b/code/sdk/zhihui/config/src/ConfigModel.cpp

diff --cc code/sdk/zhihui/utils/custom_cmd_service.c
index 921e1fa,9ccffd3..921e1fa
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_cmd_service.c
--- 2/code/sdk/zhihui/utils/custom_cmd_service.c
+++ b/code/sdk/zhihui/utils/custom_cmd_service.c

diff --cc code/sdk/zhihui/utils/custom_fileoperate_service.c
index 16f8142,47e98d6..16f8142
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_fileoperate_service.c
--- 2/code/sdk/zhihui/utils/custom_fileoperate_service.c
+++ b/code/sdk/zhihui/utils/custom_fileoperate_service.c

diff --cc code/sdk/zhihui/utils/custom_runtime.c
index 90d316f,04e1656..90d316f
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_runtime.c
--- 2/code/sdk/zhihui/utils/custom_runtime.c
+++ b/code/sdk/zhihui/utils/custom_runtime.c

diff --cc code/sdk/zhihui/utils/custom_save_runtime.c
index ce43b9b,603373e..ce43b9b
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_save_runtime.c
--- 2/code/sdk/zhihui/utils/custom_save_runtime.c
+++ b/code/sdk/zhihui/utils/custom_save_runtime.c

diff --cc code/sdk/zhihui/utils/custom_utils.c
index 1dbfc54,984e50a..1dbfc54
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_utils.c
--- 2/code/sdk/zhihui/utils/custom_utils.c
+++ b/code/sdk/zhihui/utils/custom_utils.c

diff --cc code/sdk/zhihui/utils/custom_utils.h
index 1e67776,ed203be..1e67776
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_utils.h
--- 2/code/sdk/zhihui/utils/custom_utils.h
+++ b/code/sdk/zhihui/utils/custom_utils.h

diff --cc code/sdk/zhihui/utils/custom_utils_at_cmd.c
index f1ec472,a2fb652..f1ec472
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utils/custom_utils_at_cmd.c
--- 2/code/sdk/zhihui/utils/custom_utils_at_cmd.c
+++ b/code/sdk/zhihui/utils/custom_utils_at_cmd.c

diff --cc code/sdk/zhihui/utilscpp/7zFile.cpp
index d3eb17d,e486901..d3eb17d
mode 100755,100644..100644
--- 1/code/sdk/zhihui/utilscpp/7zFile.cpp
--- 2/code/sdk/zhihui/utilscpp/7zFile.cpp
+++ b/code/sdk/zhihui/utilscpp/7zFile.cpp