Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
DoraemonKit
提交
56e8a985
D
DoraemonKit
项目概览
DiDi
/
DoraemonKit
10 个月 前同步成功
通知
166
Star
19623
Fork
3062
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
DoraemonKit
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
56e8a985
编写于
5月 29, 2020
作者:
J
jackjintai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
android: fixed network error
上级
3667496f
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
21 addition
and
4 deletion
+21
-4
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDokitViewManager.java
...ichuxing/doraemonkit/kit/core/NormalDokitViewManager.java
+4
-2
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/okhttp/interceptor/DoraemonInterceptor.java
...t/kit/network/okhttp/interceptor/DoraemonInterceptor.java
+17
-2
未找到文件。
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/core/NormalDokitViewManager.java
浏览文件 @
56e8a985
...
...
@@ -155,8 +155,9 @@ class NormalDokitViewManager implements DokitViewManagerInterface {
//将所有的dokitView添加到新建的Activity中去
for
(
GlobalSingleDokitViewInfo
dokitViewInfo
:
mGlobalSingleDokitViews
.
values
())
{
//如果不是性能kitView 则不显示
if
(
activity
instanceof
UniversalActivity
&&
dokitViewInfo
.
getAbsDokitViewClass
()
!=
PerformanceDokitView
.
class
)
{
return
;
continue
;
}
//是否过滤掉 入口icon
if
(!
DokitConstant
.
AWAYS_SHOW_MAIN_ICON
&&
dokitViewInfo
.
getAbsDokitViewClass
()
==
MainIconDokitView
.
class
)
{
...
...
@@ -217,8 +218,9 @@ class NormalDokitViewManager implements DokitViewManagerInterface {
//更新所有全局DokitView的位置
if
(
mGlobalSingleDokitViews
!=
null
&&
mGlobalSingleDokitViews
.
size
()
>
0
)
{
for
(
GlobalSingleDokitViewInfo
globalSingleDokitViewInfo
:
mGlobalSingleDokitViews
.
values
())
{
//如果不是性能kitView 则需要重新更新位置
if
(
activity
instanceof
UniversalActivity
&&
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
!=
PerformanceDokitView
.
class
)
{
return
;
continue
;
}
//是否过滤掉 入口icon
if
(!
DokitConstant
.
AWAYS_SHOW_MAIN_ICON
&&
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
==
MainIconDokitView
.
class
)
{
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/okhttp/interceptor/DoraemonInterceptor.java
浏览文件 @
56e8a985
...
...
@@ -26,6 +26,7 @@ import java.util.List;
import
okhttp3.Interceptor
;
import
okhttp3.MediaType
;
import
okhttp3.Protocol
;
import
okhttp3.Request
;
import
okhttp3.Response
;
import
okhttp3.ResponseBody
;
...
...
@@ -43,7 +44,18 @@ public class DoraemonInterceptor implements Interceptor {
public
Response
intercept
(
Chain
chain
)
throws
IOException
{
if
(!
NetworkManager
.
isActive
())
{
Request
request
=
chain
.
request
();
return
chain
.
proceed
(
request
);
try
{
return
chain
.
proceed
(
request
);
}
catch
(
Exception
e
)
{
ResponseBody
responseBody
=
ResponseBody
.
create
(
MediaType
.
parse
(
"application/json;charset=utf-8"
),
""
+
e
.
getMessage
());
return
new
Response
.
Builder
()
.
code
(
400
)
.
message
(
String
.
format
(
"%s==>Exception:%s"
,
chain
.
request
().
url
().
host
(),
e
.
getMessage
()))
.
request
(
request
)
.
body
(
responseBody
)
.
protocol
(
Protocol
.
HTTP_1_1
)
.
build
();
}
}
Request
request
=
chain
.
request
();
...
...
@@ -52,12 +64,15 @@ public class DoraemonInterceptor implements Interceptor {
try
{
response
=
chain
.
proceed
(
request
);
}
catch
(
Exception
e
)
{
LogHelper
.
e
(
TAG
,
"e===>"
+
e
.
getMessage
());
mNetworkInterpreter
.
httpExchangeFailed
(
requestId
,
e
.
toString
());
ResponseBody
responseBody
=
ResponseBody
.
create
(
MediaType
.
parse
(
"application/json;charset=utf-8"
),
""
);
ResponseBody
responseBody
=
ResponseBody
.
create
(
MediaType
.
parse
(
"application/json;charset=utf-8"
),
""
+
e
.
getMessage
()
);
return
new
Response
.
Builder
()
.
code
(
400
)
.
message
(
String
.
format
(
"%s==>Exception:%s"
,
chain
.
request
().
url
().
host
(),
e
.
getMessage
()))
.
request
(
request
)
.
body
(
responseBody
)
.
protocol
(
Protocol
.
HTTP_1_1
)
.
build
();
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录