Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
DoraemonKit
提交
847713b9
D
DoraemonKit
项目概览
DiDi
/
DoraemonKit
11 个月 前同步成功
通知
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,发现更多精彩内容 >>
提交
847713b9
编写于
4月 02, 2020
作者:
J
jackjintai
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
modify:
1、去掉root库
上级
a8e60963
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
58 addition
and
35 deletion
+58
-35
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/methodtrace/MethodCost.java
...m/didichuxing/doraemonkit/kit/methodtrace/MethodCost.java
+2
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/weaknetwork/NetWokDokitView.java
...ichuxing/doraemonkit/kit/weaknetwork/NetWokDokitView.java
+3
-0
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/okgo/interceptor/HttpLoggingInterceptor.java
.../doraemonkit/okgo/interceptor/HttpLoggingInterceptor.java
+8
-0
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/UniversalActivity.java
...ava/com/didichuxing/doraemonkit/ui/UniversalActivity.java
+5
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/BaseFragment.java
...ava/com/didichuxing/doraemonkit/ui/base/BaseFragment.java
+1
-3
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/NormalDokitViewManager.java
...dichuxing/doraemonkit/ui/base/NormalDokitViewManager.java
+39
-29
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DeviceUtils.java
...in/java/com/didichuxing/doraemonkit/util/DeviceUtils.java
+0
-1
未找到文件。
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/methodtrace/MethodCost.java
浏览文件 @
847713b9
...
...
@@ -25,8 +25,9 @@ import java.util.concurrent.TimeUnit;
* startMethodTracingSampling采用的采样的模式 可以再整个activity的生命周期中使用
* <p>
* 生成的trace文件位于getExternalFilesDir() 下 **.trace
* 修订历史:
* 修订历史:
该功能已经废弃 请使用插件的函数耗时统计 使用手册:http://xingyun.xiaojukeji.com/docs/dokit/#/TimeProfiler
* ================================================
*
*/
@Deprecated
public
class
MethodCost
{
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/weaknetwork/NetWokDokitView.java
浏览文件 @
847713b9
...
...
@@ -110,6 +110,9 @@ public class NetWokDokitView extends AbsDokitView {
@Override
public
void
invalidate
()
{
if
(
getRootView
()
==
null
)
{
return
;
}
if
(
isNormalMode
())
{
FrameLayout
.
LayoutParams
layoutParams
=
getNormalLayoutParams
();
if
(
layoutParams
==
null
)
{
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/okgo/interceptor/HttpLoggingInterceptor.java
浏览文件 @
847713b9
...
...
@@ -93,6 +93,14 @@ public class HttpLoggingInterceptor implements Interceptor {
response
=
chain
.
proceed
(
request
);
}
catch
(
Exception
e
)
{
log
(
"<-- HTTP FAILED: "
+
e
);
ResponseBody
responseBody
=
ResponseBody
.
create
(
MediaType
.
parse
(
"text/plain;charset=utf-8"
),
""
+
e
.
getMessage
());
response
=
new
Response
.
Builder
()
.
code
(
404
)
.
message
(
""
+
e
.
getMessage
())
.
request
(
request
)
.
body
(
responseBody
)
.
protocol
(
Protocol
.
HTTP_1_1
)
.
build
();
//throw e;
}
long
tookMs
=
TimeUnit
.
NANOSECONDS
.
toMillis
(
System
.
nanoTime
()
-
startNs
);
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/UniversalActivity.java
浏览文件 @
847713b9
...
...
@@ -149,6 +149,10 @@ public class UniversalActivity extends BaseActivity {
@Override
protected
void
onDestroy
()
{
super
.
onDestroy
();
try
{
super
.
onDestroy
();
}
catch
(
Exception
e
)
{
e
.
printStackTrace
();
}
}
}
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/BaseFragment.java
浏览文件 @
847713b9
...
...
@@ -136,9 +136,7 @@ public class BaseFragment extends Fragment {
@Override
public
void
onDestroyView
()
{
super
.
onDestroyView
();
DokitIntent
intent
=
new
DokitIntent
(
MainIconDokitView
.
class
);
intent
.
mode
=
DokitIntent
.
MODE_SINGLE_INSTANCE
;
DokitViewManager
.
getInstance
().
attach
(
intent
);
}
public
DialogProvider
showDialog
(
DialogInfo
dialogInfo
)
{
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/NormalDokitViewManager.java
浏览文件 @
847713b9
...
...
@@ -210,41 +210,51 @@ class NormalDokitViewManager implements DokitViewManagerInterface {
//更新所有全局DokitView的位置
for
(
GlobalSingleDokitViewInfo
globalSingleDokitViewInfo
:
mGlobalSingleDokitViews
.
values
())
{
if
(
activity
instanceof
UniversalActivity
&&
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
!=
PerformanceDokitView
.
class
)
{
return
;
}
//是否过滤掉 入口icon
if
(!
DokitConstant
.
AWAYS_SHOW_MAIN_ICON
&&
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
==
MainIconDokitView
.
class
)
{
DokitConstant
.
MAIN_ICON_HAS_SHOW
=
false
;
continue
;
}
if
(
mGlobalSingleDokitViews
!=
null
&&
mGlobalSingleDokitViews
.
size
()
>
0
)
{
for
(
GlobalSingleDokitViewInfo
globalSingleDokitViewInfo
:
mGlobalSingleDokitViews
.
values
())
{
if
(
activity
instanceof
UniversalActivity
&&
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
!=
PerformanceDokitView
.
class
)
{
return
;
}
//是否过滤掉 入口icon
if
(!
DokitConstant
.
AWAYS_SHOW_MAIN_ICON
&&
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
==
MainIconDokitView
.
class
)
{
DokitConstant
.
MAIN_ICON_HAS_SHOW
=
false
;
continue
;
}
if
(
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
==
MainIconDokitView
.
class
)
{
DokitConstant
.
MAIN_ICON_HAS_SHOW
=
true
;
}
if
(
globalSingleDokitViewInfo
.
getAbsDokitViewClass
()
==
MainIconDokitView
.
class
)
{
DokitConstant
.
MAIN_ICON_HAS_SHOW
=
true
;
}
//LogHelper.i(TAG, " activity resume==>" + activity.getClass().getSimpleName() + " dokitView==>" + globalSingleDokitViewInfo.getTag());
//判断resume Activity 中时候存在指定的dokitview
AbsDokitView
existDokitView
=
null
;
if
(
existDokitViews
!=
null
&&
!
existDokitViews
.
isEmpty
())
{
existDokitView
=
existDokitViews
.
get
(
globalSingleDokitViewInfo
.
getTag
());
}
//LogHelper.i(TAG, " activity resume==>" + activity.getClass().getSimpleName() + " dokitView==>" + globalSingleDokitViewInfo.getTag());
//判断resume Activity 中时候存在指定的dokitview
AbsDokitView
existDokitView
=
null
;
if
(
existDokitViews
!=
null
&&
!
existDokitViews
.
isEmpty
())
{
existDokitView
=
existDokitViews
.
get
(
globalSingleDokitViewInfo
.
getTag
());
}
//当前页面已存在dokitview
if
(
existDokitView
!=
null
&&
existDokitView
.
getRootView
()
!=
null
)
{
existDokitView
.
getRootView
().
setVisibility
(
View
.
VISIBLE
);
//更新位置
existDokitView
.
updateViewLayout
(
existDokitView
.
getTag
(),
true
);
existDokitView
.
onResume
();
}
else
{
//添加相应的
DokitIntent
dokitIntent
=
new
DokitIntent
(
globalSingleDokitViewInfo
.
getAbsDokitViewClass
());
dokitIntent
.
mode
=
globalSingleDokitViewInfo
.
getMode
();
dokitIntent
.
bundle
=
globalSingleDokitViewInfo
.
getBundle
();
//当前页面已存在dokitview
if
(
existDokitView
!=
null
&&
existDokitView
.
getRootView
()
!=
null
)
{
existDokitView
.
getRootView
().
setVisibility
(
View
.
VISIBLE
);
//更新位置
existDokitView
.
updateViewLayout
(
existDokitView
.
getTag
(),
true
);
existDokitView
.
onResume
();
}
else
{
//添加相应的
DokitIntent
dokitIntent
=
new
DokitIntent
(
globalSingleDokitViewInfo
.
getAbsDokitViewClass
());
dokitIntent
.
mode
=
globalSingleDokitViewInfo
.
getMode
();
dokitIntent
.
bundle
=
globalSingleDokitViewInfo
.
getBundle
();
attach
(
dokitIntent
);
}
}
}
else
{
//假如不存在全局的icon这需要全局显示主icon
if
(
DokitConstant
.
AWAYS_SHOW_MAIN_ICON
&&
!(
activity
instanceof
UniversalActivity
))
{
DokitIntent
dokitIntent
=
new
DokitIntent
(
MainIconDokitView
.
class
);
dokitIntent
.
mode
=
DokitIntent
.
MODE_SINGLE_INSTANCE
;
attach
(
dokitIntent
);
}
}
attachCountDownDokitView
(
activity
);
}
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DeviceUtils.java
浏览文件 @
847713b9
...
...
@@ -305,7 +305,6 @@ public class DeviceUtils {
return
ROOTED
;
}
try
{
ROOTED
=
com
.
blankj
.
utilcode
.
util
.
DeviceUtils
.
isDeviceRooted
();
if
(
ROOTED
)
{
Log
.
w
(
TAG
,
"Device rooted."
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录