Merge 3.17.2 (#19755)

* modify engine version (#19677)

* protect empty string (#19680)

* fix twice copy lua scripts error (#19687) (#19691)

* rename Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.* to Cocos2dxLuaJavaBridge.* (#19694)

* fix get environment (#19690)

* update release note and change log (#19711)

* [js-tests/cpp-tests] iOS: add fonts to Info.plist (#19708)

* add fonts to Info.plist

* use tabs instead of spaces

* fix lua-tests

* Update CHANGELOG

* setPercent after initialization (#19718)

Author: minggo

.gitignore

@@ -182,3 +182,4 @@ temp/
 
 # external libs zip
 *.zip
+**/simulator/

CHANGELOG

@@ -1,3 +1,27 @@
+cocos2d-x-3.17.2 May.21 2019
+
+[NEW]           Network: added clear requests and responses method to httpclient
+[NEW]           UI: VideoPlayer added ability to enable/disable looping, resonding user input
+[NEW]           UI: VideoPlayer added function to set style
+[NEW]           IMEDispacher: added a function to check if any IME dispatcher is active
+[NEW]           Renderer: add a function to get current clearing color
+[NEW]           Lua: added binding codes for `EventDispathcer::addCustomEventListener()`
+
+[REFINE]        Android: added optimization codes for OPPO devcies
+[REFINE]        Network: improved websocket traces
+[REFINE]        Android: supported Android P cutout area
+[REFINE]        FontAtlas: font atlas texture initialization delayed
+[REFINE]        LOG: CCLOG may block thread on windows
+
+[FIX]           FileUtils:fixed a bug that `listFiles()` can not work correctly if the file path starts with `assets/` on Android
+[FIX]           AssetsManager: fixed a bug that `_percent` is always be 0 during the update process
+[FIX]           Texture2D: fixed memory leak if `Texture2D::setAlphaTexture()` is invoked many times
+[FIX]           FontAtlasCache: avoided crash if a file path is too long
+[FIX]           Audio: fixed crash on iOS
+[FIX]           UI: VideoPlayer could not play video in obb file on Android
+[FIX]           SpriteFrame: fixed performance issue in parsing plist files
+[FIX]           3rd: unzip failed to uncompress files
+
 cocos2d-x-3.17.1 Nov.19 2018
 
 [REFINE]        Renderer: properly reduce clear buffer times to save energy

cocos/cocos2d.cpp

@@ -32,7 +32,7 @@ NS_CC_BEGIN
 
 CC_DLL const char* cocos2dVersion()
 {
-    return "cocos2d-x-3.17.1";
+    return "cocos2d-x-3.17.2";
 }
 
 NS_CC_END

cocos/cocos2d.h

@@ -31,7 +31,7 @@ THE SOFTWARE.
 
 // 0x00 HI ME LO
 // 00   03 08 00
-#define COCOS2D_VERSION 0x00031701
+#define COCOS2D_VERSION 0x00031702
 
 //
 // all cocos2d include files

cocos/platform/CCFileUtils.cpp

@@ -1517,7 +1517,7 @@ std::vector<std::string> FileUtils::listFiles(const std::string& dirPath) const
 {
     std::vector<std::string> files;
     std::string fullpath = fullPathForDirectory(dirPath);
-    if (isDirectoryExist(fullpath))
+    if (!fullpath.empty() && isDirectoryExist(fullpath))
     {
         tinydir_dir dir;
         std::string fullpathstr = fullpath;

cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp renamed to cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp

@@ -23,7 +23,7 @@
  ****************************************************************************/
 
 
-#include "scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h"
+#include "scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h"
 
 #include <android/log.h>
 

cocos/scripting/lua-bindings/manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.h renamed to cocos/scripting/lua-bindings/manual/platform/android/jni/Cocos2dxLuaJavaBridge.h

@@ -9,7 +9,7 @@ LOCAL_MODULE_FILENAME := libluaccandroid
 LOCAL_ARM_MODE := arm
 
 LOCAL_SRC_FILES := ../manual/platform/android/CCLuaJavaBridge.cpp \
-                   ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp
+                   ../manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../.. \
                     $(LOCAL_PATH)/../manual \

cocos/scripting/lua-bindings/proj.android/Android.mk

@@ -7,7 +7,7 @@ project(${target_name})
 
 set(${target_name}_src
   ../manual/platform/android/CCLuaJavaBridge.cpp
-  ../manual/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxLuaJavaBridge.cpp
+  ../manual/platform/android/jni/Cocos2dxLuaJavaBridge.cpp
 )
 
 add_library(${target_name} STATIC

cocos/scripting/lua-bindings/proj.android/CMakeLists.txt

@@ -2,26 +2,20 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**  *generated with [DocToc](https://github.com/thlorenz/doctoc)*
 
-- [Cocos2d-x 3.17.1 Release Notes](#cocos2d-x-3171-release-notes)
+- [Cocos2d-x 3.17.2 Release Notes](#cocos2d-x-3172-release-notes)
   - [Highlights](#highlights)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-# Cocos2d-x 3.17.1 Release Notes #
+# Cocos2d-x 3.17.2 Release Notes #
 
-The 3.17.1 release focuses on bug fixing.   
+Version 3.17.2 focuses on bugs fixing and performance opimization on OPPO devices.   
 
 ## Highlights
 
-- Fix Lua loading performance drop bug introduced in 3.17
-- Renderer limit glClear invoke times, reduce power consuming
-- optimize CMake script，fix some linking issues
-- Android use CMake as default PROP_BUILD_TYPE value
-- Android upgrade Gradle to 4.6, SDK 28, android gradle plugin 3.1.0 
-- upgrade LuaJIT to 2.1.0-beta3, fix random crash in 3.17 Lua release mode
-- upgrade libwebsockets to 2.4.2
-- FileUtils provide thread-safe implementation and add missing cross-platform interfaces
-- limit Labels text length to fix render error
-- add Downloader binding to Lua
+- Performance optimization on OPPO devices
+- Fixed bug that`FileUtils::listFiles()` can not work correctly if the file path starts with `assets/` on Android
+- Fixed crash caused by Audio on iOS
+- Fixed bug that `VideoPlayer` can not play video in obb file on Android
 
-This release contains more than 45 bugs fixed and 34 misc improvements, please refer to [ChangeLog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG)
+More detail change log please refer to [ChangeLog](https://github.com/cocos2d/cocos2d-x/blob/v3/CHANGELOG).