finish issue: #85

This commit is contained in:
halx99 2020-05-06 15:42:25 +08:00
parent 5b30bf9114
commit 40cb068201
12 changed files with 20 additions and 17 deletions

View File

@ -29,7 +29,7 @@
#include "base/CCData.h"
#include "3d/CCBundle3DData.h"
#include "3d/CCBundleReader.h"
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
NS_CC_BEGIN

View File

@ -34,7 +34,7 @@ THE SOFTWARE.
#include "pugixml/pugixml_imp.hpp"
#include "pugixml/pugiext.hpp"
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
#include <string>
#include <queue>

View File

@ -26,7 +26,7 @@
#define _COCOLOADER_H
#include <stdint.h>
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
#include "editor-support/cocostudio/CocosStudioExport.h"
#pragma pack (4)

View File

@ -25,7 +25,7 @@ THE SOFTWARE.
#ifndef __DICTIONARYHELPER_H__
#define __DICTIONARYHELPER_H__
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
#include "editor-support/cocostudio/CocosStudioExport.h"
#define DICTOOL DictionaryHelper::getInstance()

View File

@ -3,7 +3,7 @@
#include <string>
#include <unordered_map>
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
#include "editor-support/cocostudio/CocosStudioExport.h"
namespace cocostudio {

View File

@ -24,8 +24,8 @@ THE SOFTWARE.
****************************************************************************/
#include "editor-support/cocostudio/TriggerMng.h"
#include "json/prettywriter.h"
#include "json/stringbuffer.h"
#include "rapidjson/prettywriter.h"
#include "rapidjson/stringbuffer.h"
#include "base/CCDirector.h"
#include "base/CCEventDispatcher.h"
#include "base/ccUtils.h"

View File

@ -24,8 +24,8 @@
#include "scripting/lua-bindings/manual/cocostudio/CustomGUIReader.h"
#include "scripting/lua-bindings/manual/CCLuaEngine.h"
#include "json/writer.h"
#include "json/stringbuffer.h"
#include "rapidjson/writer.h"
#include "rapidjson/stringbuffer.h"
USING_NS_CC;

View File

@ -39,7 +39,7 @@
#include "Manifest.h"
#include "extensions/ExtensionMacros.h"
#include "extensions/ExtensionExport.h"
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
NS_CC_EXT_BEGIN

View File

@ -24,8 +24,8 @@
****************************************************************************/
#include "Manifest.h"
#include "json/prettywriter.h"
#include "json/stringbuffer.h"
#include "rapidjson/prettywriter.h"
#include "rapidjson/stringbuffer.h"
#include <fstream>
#include <stdio.h>

View File

@ -35,7 +35,7 @@
#include "network/CCDownloader.h"
#include "platform/CCFileUtils.h"
#include "json/document-wrapper.h"
#include "rapidjson/document-wrapper.h"
NS_CC_EXT_BEGIN

View File

@ -1,5 +1,5 @@
{
"version": "v33",
"version": "v36",
"zip_file_size": "107642814",
"repo_name": "engine-x-3rd",
"repo_parent": "https://github.com/c4games/",

View File

@ -28,7 +28,9 @@
#include "stdio.h"
#include "stdlib.h"
#include "yasio/ibstream.hpp"
#include "yasio/obstream.hpp"
#include "yasio/yasio.hpp"
#include "yasio/bindings/yasio_jni.cpp"
USING_NS_CC;
@ -37,13 +39,13 @@ using namespace yasio::inet;
void yasioTest()
{
yasio::inet::io_hostent endpoints[] = { {"www.baidu.com", 443} };
yasio::inet::io_hostent endpoints[] = { {"github.com", 443} };
io_service service(endpoints, 1);
resolv_fn_t resolv = [&](std::vector<ip::endpoint>& endpoints, const char* hostname,
unsigned short port) {
return service.__builtin_resolv(endpoints, hostname, port);
return service.builtin_resolv(endpoints, hostname, port);
};
service.set_option(YOPT_S_RESOLV_FN, &resolv);
@ -56,6 +58,7 @@ void yasioTest()
int max_request_count = 3;
std::string respRawData;
std::string finalMessage;
service.start_service([&](event_ptr&& event) {
switch (event->kind())
{
@ -74,7 +77,7 @@ void yasioTest()
obstream obs;
obs.write_bytes("GET / HTTP/1.1\r\n");
obs.write_bytes("Host: www.baidu.com\r\n");
obs.write_bytes("Host: github.com\r\n");
obs.write_bytes("User-Agent: Mozilla/5.0 (Windows NT 10.0; "
"WOW64) AppleWebKit/537.36 (KHTML, like Gecko) "