Merge branch 'wxr6' into MergeFL

wxr

2021-07-05 5f1fdf638033a87980b84689fb6f29f70cf68c6e

1
2
${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/cerficate_v2
${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/TuyaSmartUtil.bundle