Merge pull request cocos2d#14702 from pandamicro/v3.10

Fix Downloader callback bug on iOS9

Author: pandamicro

cocos/2d/CCFontFNT.cpp

@@ -821,7 +821,7 @@ void FontFNT::reloadBMFontResource(const std::string& fntFilePath)
     if (ret)
     {
         s_configurations->insert(fntFilePath, ret);
-        TextureCache::getInstance()->reloadTexture(ret->getAtlasName());
+        Director::getInstance()->getTextureCache()->reloadTexture(ret->getAtlasName());
 
     }
 }

cocos/3d/CCSprite3D.cpp

@@ -364,6 +364,13 @@ Sprite3D* Sprite3D::createSprite3DNode(NodeData* nodedata,ModelData* modeldata,c
     {
         sprite->setName(nodedata->id);
         auto mesh = Mesh::create(nodedata->id, getMeshIndexData(modeldata->subMeshId));
+        
+        if (_skeleton && modeldata->bones.size())
+        {
+            auto skin = MeshSkin::create(_skeleton, modeldata->bones, modeldata->invBindPose);
+            mesh->setSkin(skin);
+        }
+        
         if (modeldata->matrialId == "" && materialdatas.materials.size())
         {
             const NTextureData* textureData = materialdatas.materials[0].getTextureData(NTextureData::Usage::Diffuse);
@@ -748,7 +755,7 @@ void Sprite3D::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
 {
 #if CC_USE_CULLING
     // camera clipping
-    if(Camera::getVisitingCamera() && !Camera::getVisitingCamera()->isVisibleInFrustum(&this->getAABB()))
+    if(_children.size() == 0 && Camera::getVisitingCamera() && !Camera::getVisitingCamera()->isVisibleInFrustum(&getAABB()))
         return;
 #endif
 

cocos/network/CCDownloader-apple.mm

@@ -25,6 +25,7 @@ of this software and associated documentation files (the "Software"), to deal
 #include "network/CCDownloader-apple.h"
 
 #include "network/CCDownloader.h"
+#include "CCString.h"
 #include <queue>
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -388,32 +389,50 @@ - (void)URLSession:(NSURLSession *)session task :(NSURLSessionTask *)task
 
     if(_outer)
     {
-        if(error) {
+        if(error)
+        {
             std::vector<unsigned char> buf; // just a placeholder
             _outer->onTaskFinish(*[wrapper get],
                              cocos2d::network::DownloadTask::ERROR_IMPL_INTERNAL,
                              (int)error.code,
                              [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding],
                              buf);
         }
-        else if(![wrapper get]->storagePath.length()) {
+        else if (![wrapper get]->storagePath.length())
+        {
             // call onTaskFinish for a data task
             // (for a file download task, callback is called in didFinishDownloadingToURL)
             std::string errorString;
-            
+
             const int64_t buflen = [wrapper totalBytesReceived];
             char buf[buflen];
-            
             [wrapper transferDataToBuffer:buf lengthOfBuffer:buflen];
-            
             std::vector<unsigned char> data(buf, buf + buflen);
 
             _outer->onTaskFinish(*[wrapper get],
                                  cocos2d::network::DownloadTask::ERROR_NO_ERROR,
-                                  0,
+                                 0,
                                  errorString,
                                  data);
         }
+        else
+        {
+            NSInteger statusCode = ((NSHTTPURLResponse*)task.response).statusCode;
+            
+            // Check for error status code
+            if (statusCode >= 400)
+            {
+                std::vector<unsigned char> buf; // just a placeholder
+                const char *orignalURL = [task.originalRequest.URL.absoluteString cStringUsingEncoding:NSUTF8StringEncoding];
+                std::string errorMessage = cocos2d::StringUtils::format("Downloader: Failed to download %s with status code (%d)", orignalURL, (int)statusCode);
+                
+                _outer->onTaskFinish(*[wrapper get],
+                                     cocos2d::network::DownloadTask::ERROR_IMPL_INTERNAL,
+                                     0,
+                                     errorMessage,
+                                     buf);
+            }
+        }
     }
     [self.taskDict removeObjectForKey:task];
     [wrapper release];
@@ -510,12 +529,21 @@ - (void)URLSession:(NSURLSession *)session downloadTask :(NSURLSessionDownloadTa
         return;
     }
 
+    // On iOS 9 a response with status code 4xx(Client Error) or 5xx(Server Error)
+    // might end up calling this delegate method, saving the error message to the storage path
+    // and treating this download task as a successful one, so we need to check the status code here
+    NSInteger statusCode = ((NSHTTPURLResponse*)downloadTask.response).statusCode;
+    if (statusCode >= 400)
+    {
+        return;
+    }
+    
     DownloadTaskWrapper *wrapper = [self.taskDict objectForKey:downloadTask];
     const char * storagePath = [wrapper get]->storagePath.c_str();
     NSString *destPath = [NSString stringWithUTF8String:storagePath];
     NSFileManager *fileManager = [NSFileManager defaultManager];
     NSURL *destURL = nil;
-    
+
     do
     {
         if ([destPath hasPrefix:@"file://"])

tests/cpp-tests/Classes/DownloaderTest/DownloaderTest.cpp

@@ -36,15 +36,15 @@ static const char* sURLList[] =
 {
     "http://www.cocos2d-x.org/attachments/802/cocos2dx_landscape.png",
     "http://www.cocos2d-x.org/docs/manual/framework/native/wiki/logo-resources-of-cocos2d-x/res/2dx_icon_512_rounded.png",
-    "http://www.cocos2d-x.org/attachments/1503/Cocos2CoordinateRelease.png",
+    "http://www.cocos2d-x.org/attachments/1503/inexist.png",
     "http://download.sdkbox.com/installer/v1/sdkbox-iap_v1.2.3.3.tar.gz",
 };
 const static int sListSize = (sizeof(sURLList)/sizeof(sURLList[0]));
 static const char* sNameList[sListSize] =
 {
     "cocos2dx_landscape.png",
     "2dx_icon_512_rounded.png",
-    "Cocos2CoordinateRelease.png",
+    "inexist file",
     "big file",
 };
 
@@ -112,6 +112,7 @@ struct DownloaderTest : public TestCase
         label->setPosition(Vec2(viewSize.width / 2, viewSize.height / 2));
         label->setContentSize(Size(viewSize.width, 0));
         label->setAlignment(TextHAlignment::CENTER, TextVAlignment::CENTER);
+        label->setDimensions(viewSize.width, viewSize.height);
         bg->addChild(label, 20);
 
         return bg;

tests/cpp-tests/proj.ios/Info.plist

@@ -8,6 +8,15 @@
 		<false/>
 		<key>NSExceptionDomains</key>
 		<dict>
+			<key>sdkbox.com</key>
+			<dict>
+				<key>NSIncludesSubdomains</key>
+				<true/>
+				<key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+				<true/>
+				<key>NSTemporaryExceptionMinimumTLSVersion</key>
+				<string>TLSv1.1</string>
+			</dict>
 			<key>cocos2d-x.org</key>
 			<dict>
 				<key>NSIncludesSubdomains</key>

tests/js-tests/src/TextureCacheTest/TextureCacheTest.js

@@ -282,6 +282,8 @@ var RemoteTextureTest = TextureCacheTestBase.extend({
         for (var i = 0; i < imageUrlArray.length; i++) {
             cc.textureCache.addImageAsync(imageUrlArray[i], this.texLoaded, this);
         }
+
+        cc.loader.loadImg("http://www.cocos2d-x.org/no_such_file.jpg", this.failLoaded.bind(this));
     },
 
     texLoaded: function(texture) {
@@ -296,6 +298,21 @@ var RemoteTextureTest = TextureCacheTestBase.extend({
         else {
             cc.log("Fail to load remote texture");
         }
+    },
+
+    failLoaded: function (err, img) {
+        var str = "";
+        if (err) {
+            str = "Correct behavior: failed to download from wrong url";
+        }
+        else {
+            str = "!!! Wrong behavior: succeed to download from wrong url";
+        }
+
+        var label = new cc.LabelTTF(str, "Times New Roman", 28);
+        label.x = winSize.width / 2;
+        label.y = winSize.height / 2;
+        this.addChild(label, 100);
     }
 });