Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
东方怂天
Quick-Cocos2dx-Community
提交
5f5c928f
Q
Quick-Cocos2dx-Community
项目概览
东方怂天
/
Quick-Cocos2dx-Community
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
Q
Quick-Cocos2dx-Community
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
5f5c928f
编写于
6月 25, 2019
作者:
cocos2d-lua.org
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
去 _WINDOWS_ 宏,去pthread。
上级
87558bb7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
20 deletion
+2
-20
quick/lib/quick-src/extra/network/CCHTTPRequest.cpp
quick/lib/quick-src/extra/network/CCHTTPRequest.cpp
+0
-9
quick/lib/quick-src/extra/network/CCHTTPRequest.h
quick/lib/quick-src/extra/network/CCHTTPRequest.h
+0
-8
quick/lib/quick-src/extra/platform/android/CCHTTPRequestAndroid.cpp
...quick-src/extra/platform/android/CCHTTPRequestAndroid.cpp
+2
-3
未找到文件。
quick/lib/quick-src/extra/network/CCHTTPRequest.cpp
浏览文件 @
5f5c928f
...
@@ -566,20 +566,11 @@ void HTTPRequest::cleanup(void)
...
@@ -566,20 +566,11 @@ void HTTPRequest::cleanup(void)
}
}
// curl callback
// curl callback
#ifdef _WINDOWS_
DWORD
WINAPI
HTTPRequest
::
requestCURL
(
LPVOID
userdata
)
{
static_cast
<
HTTPRequest
*>
(
userdata
)
->
onRequest
();
return
0
;
}
#else // _WINDOWS_
void
*
HTTPRequest
::
requestCURL
(
void
*
userdata
)
void
*
HTTPRequest
::
requestCURL
(
void
*
userdata
)
{
{
static_cast
<
HTTPRequest
*>
(
userdata
)
->
onRequest
();
static_cast
<
HTTPRequest
*>
(
userdata
)
->
onRequest
();
return
NULL
;
return
NULL
;
}
}
#endif // _WINDOWS_
size_t
HTTPRequest
::
writeDataCURL
(
void
*
buffer
,
size_t
size
,
size_t
nmemb
,
void
*
userdata
)
size_t
HTTPRequest
::
writeDataCURL
(
void
*
buffer
,
size_t
size
,
size_t
nmemb
,
void
*
userdata
)
{
{
...
...
quick/lib/quick-src/extra/network/CCHTTPRequest.h
浏览文件 @
5f5c928f
...
@@ -234,19 +234,12 @@ private:
...
@@ -234,19 +234,12 @@ private:
int
onProgress
(
double
dltotal
,
double
dlnow
,
double
ultotal
,
double
ulnow
);
int
onProgress
(
double
dltotal
,
double
dlnow
,
double
ultotal
,
double
ulnow
);
// curl callback
// curl callback
#ifdef _WINDOWS_
static
DWORD
WINAPI
requestCURL
(
LPVOID
userdata
);
#else
pthread_t
m_thread
;
static
void
*
requestCURL
(
void
*
userdata
);
static
void
*
requestCURL
(
void
*
userdata
);
#endif
static
size_t
writeDataCURL
(
void
*
buffer
,
size_t
size
,
size_t
nmemb
,
void
*
userdata
);
static
size_t
writeDataCURL
(
void
*
buffer
,
size_t
size
,
size_t
nmemb
,
void
*
userdata
);
static
size_t
writeHeaderCURL
(
void
*
buffer
,
size_t
size
,
size_t
nmemb
,
void
*
userdata
);
static
size_t
writeHeaderCURL
(
void
*
buffer
,
size_t
size
,
size_t
nmemb
,
void
*
userdata
);
static
int
progressCURL
(
void
*
userdata
,
double
dltotal
,
double
dlnow
,
double
ultotal
,
double
ulnow
);
static
int
progressCURL
(
void
*
userdata
,
double
dltotal
,
double
dlnow
,
double
ultotal
,
double
ulnow
);
#if (!CC_USE_CURL)
#if (!CC_USE_CURL)
pthread_attr_t
m_threadAttr
;
bool
isNeedBoundary
();
bool
isNeedBoundary
();
void
createURLConnectJava
();
void
createURLConnectJava
();
...
@@ -271,7 +264,6 @@ private:
...
@@ -271,7 +264,6 @@ private:
int
getCStrFromJByteArray
(
jbyteArray
jba
,
JNIEnv
*
env
,
char
**
ppData
);
int
getCStrFromJByteArray
(
jbyteArray
jba
,
JNIEnv
*
env
,
char
**
ppData
);
char
*
getCStrFromJString
(
jstring
jstr
,
JNIEnv
*
env
);
char
*
getCStrFromJString
(
jstring
jstr
,
JNIEnv
*
env
);
#endif
#endif
};
};
NS_CC_EXTRA_END
NS_CC_EXTRA_END
...
...
quick/lib/quick-src/extra/platform/android/CCHTTPRequestAndroid.cpp
浏览文件 @
5f5c928f
...
@@ -218,8 +218,8 @@ bool HTTPRequest::start(void)
...
@@ -218,8 +218,8 @@ bool HTTPRequest::start(void)
addRequestHeaderJava
(
"Cookie"
,
m_cookies
,
bBoundary
);
addRequestHeaderJava
(
"Cookie"
,
m_cookies
,
bBoundary
);
}
}
pthread_create
(
&
m_thread
,
NULL
,
requestCURL
,
this
);
std
::
thread
th
(
requestCURL
,
this
);
pthread_detach
(
m_thread
);
// unjoinable
th
.
detach
();
//exit from main thread, auto exit
Director
::
getInstance
()
->
getScheduler
()
->
scheduleUpdate
(
this
,
0
,
false
);
Director
::
getInstance
()
->
getScheduler
()
->
scheduleUpdate
(
this
,
0
,
false
);
// CCLOG("HTTPRequest[0x%04x] - request start", s_id);
// CCLOG("HTTPRequest[0x%04x] - request start", s_id);
...
@@ -579,7 +579,6 @@ void *HTTPRequest::requestCURL(void *userdata)
...
@@ -579,7 +579,6 @@ void *HTTPRequest::requestCURL(void *userdata)
if
(
jvm
->
DetachCurrentThread
()
!=
JNI_OK
)
{
if
(
jvm
->
DetachCurrentThread
()
!=
JNI_OK
)
{
CCLOG
(
"HTTPRequest - requestCURL DetachCurrentThread fail"
);
CCLOG
(
"HTTPRequest - requestCURL DetachCurrentThread fail"
);
}
}
pthread_exit
((
void
*
)
0
);
return
NULL
;
return
NULL
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录