Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
DoraemonKit
提交
c9e42711
D
DoraemonKit
项目概览
DiDi
/
DoraemonKit
8 个月 前同步成功
通知
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 搜索 >>
未验证
提交
c9e42711
编写于
2月 14, 2019
作者:
L
LinJZong
提交者:
GitHub
2月 14, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Revert "解决#52 #53的问题"
上级
a47f3313
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
24 addition
and
70 deletion
+24
-70
Android/app/src/main/java/com/didichuxing/doraemondemo/MainActivity.java
.../main/java/com/didichuxing/doraemondemo/MainActivity.java
+0
-11
Android/app/src/main/res/layout/activity_main.xml
Android/app/src/main/res/layout/activity_main.xml
+0
-6
Android/app/src/main/res/values/styles.xml
Android/app/src/main/res/values/styles.xml
+0
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonHooker.java
...main/java/com/didichuxing/doraemonkit/DoraemonHooker.java
+1
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.java
...rc/main/java/com/didichuxing/doraemonkit/DoraemonKit.java
+3
-25
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
...uxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
+1
-2
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/FloatPageManager.java
...com/didichuxing/doraemonkit/ui/base/FloatPageManager.java
+2
-2
Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
...oraemonkit/src/main/res/layout/dk_fragment_block_list.xml
+17
-22
未找到文件。
Android/app/src/main/java/com/didichuxing/doraemondemo/MainActivity.java
浏览文件 @
c9e42711
...
...
@@ -4,8 +4,6 @@ import android.os.Bundle;
import
android.support.v7.app.AppCompatActivity
;
import
android.view.View
;
import
com.didichuxing.doraemonkit.DoraemonKit
;
import
java.io.ByteArrayOutputStream
;
import
java.io.IOException
;
import
java.io.InputStream
;
...
...
@@ -28,7 +26,6 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
findViewById
(
R
.
id
.
btn_test_urlconnection
).
setOnClickListener
(
this
);
findViewById
(
R
.
id
.
btn_test_okhttp
).
setOnClickListener
(
this
);
findViewById
(
R
.
id
.
btn_test_crash
).
setOnClickListener
(
this
);
findViewById
(
R
.
id
.
btn_switch_floating_Window
).
setOnClickListener
(
this
);
}
@Override
...
...
@@ -43,19 +40,11 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
case
R
.
id
.
btn_test_crash
:
testCrash
().
length
();
break
;
case
R
.
id
.
btn_switch_floating_Window
:
switchFloatingWindow
();
break
;
default
:
break
;
}
}
public
void
switchFloatingWindow
()
{
DoraemonKit
.
setFloatingWindow
(!
DoraemonKit
.
isFloatingWindowShowing
());
}
public
String
testCrash
()
{
return
null
;
}
...
...
Android/app/src/main/res/layout/activity_main.xml
浏览文件 @
c9e42711
...
...
@@ -24,10 +24,4 @@
android:layout_height=
"50dp"
android:text=
"Crash Test"
/>
<Button
android:id=
"@+id/btn_switch_floating_Window"
android:layout_width=
"match_parent"
android:layout_height=
"50dp"
android:text=
"Switch Floating Window"
/>
</LinearLayout>
Android/app/src/main/res/values/styles.xml
浏览文件 @
c9e42711
...
...
@@ -6,7 +6,6 @@
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorAccent"
>
@color/colorAccent
</item>
<item
name=
"android:textAllCaps"
>
false
</item>
</style>
</resources>
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonHooker.java
浏览文件 @
c9e42711
...
...
@@ -42,7 +42,7 @@ public class DoraemonHooker {
LogHelper
.
d
(
TAG
,
"hook application.onCreate start"
);
proceedingJoinPoint
.
proceed
();
Application
app
=
(
Application
)
proceedingJoinPoint
.
getTarget
();
DoraemonKit
.
install
(
app
,
true
);
DoraemonKit
.
install
(
app
);
LogHelper
.
d
(
TAG
,
"hook application.onCreate end"
);
}
}
\ No newline at end of file
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/DoraemonKit.java
浏览文件 @
c9e42711
...
...
@@ -52,10 +52,8 @@ public class DoraemonKit {
private
static
boolean
sHasInit
=
false
;
private
static
boolean
sShowFloatingWindow
;
//显示悬浮窗
public
static
void
install
(
final
Application
app
,
boolean
showFloatingWindow
)
{
install
(
app
,
showFloatingWindow
,
null
);
public
static
void
install
(
final
Application
app
)
{
install
(
app
,
null
);
}
public
static
void
setWebDoorCallback
(
WebDoorManager
.
WebDoorCallback
callback
)
{
...
...
@@ -68,7 +66,7 @@ public class DoraemonKit {
}
}
public
static
void
install
(
final
Application
app
,
boolean
showFloatingWindow
,
List
<
IKit
>
selfKits
)
{
public
static
void
install
(
final
Application
app
,
List
<
IKit
>
selfKits
)
{
if
(
sHasInit
)
{
if
(
selfKits
!=
null
)
{
List
<
IKit
>
biz
=
sKitMap
.
get
(
Category
.
BIZ
);
...
...
@@ -83,7 +81,6 @@ public class DoraemonKit {
return
;
}
sHasInit
=
true
;
sShowFloatingWindow
=
showFloatingWindow
;
GpsHookManager
.
getInstance
().
init
();
app
.
registerActivityLifecycleCallbacks
(
new
Application
.
ActivityLifecycleCallbacks
()
{
int
startedActivityCounts
;
...
...
@@ -103,10 +100,6 @@ public class DoraemonKit {
@Override
public
void
onActivityResumed
(
Activity
activity
)
{
if
(!
sShowFloatingWindow
)
{
return
;
}
FloatPageManager
.
getInstance
().
onActivityResumed
(
activity
);
if
(
PermissionUtil
.
canDrawOverlays
(
activity
))
{
showFloatIcon
(
activity
);
...
...
@@ -237,19 +230,4 @@ public class DoraemonKit {
}
}
public
static
void
setFloatingWindow
(
boolean
showFloatingWindow
)
{
if
(
sShowFloatingWindow
==
showFloatingWindow
)
{
return
;
}
sShowFloatingWindow
=
showFloatingWindow
;
if
(
sShowFloatingWindow
)
{
FloatPageManager
.
getInstance
().
notifyForeground
();
}
else
{
FloatPageManager
.
getInstance
().
notifyBackground
();
}
}
public
static
boolean
isFloatingWindowShowing
()
{
return
sShowFloatingWindow
;
}
}
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
浏览文件 @
c9e42711
...
...
@@ -49,7 +49,6 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
private
void
initView
()
{
mBlockList
=
findViewById
(
R
.
id
.
block_list
);
final
View
scrollDetail
=
findViewById
(
R
.
id
.
sv_block_detail
);
mLogDetail
=
findViewById
(
R
.
id
.
tx_block_detail
);
LinearLayoutManager
layoutManager
=
new
LinearLayoutManager
(
getContext
());
mBlockList
.
setLayoutManager
(
layoutManager
);
...
...
@@ -62,7 +61,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
@Override
public
void
onClick
(
BlockInfo
info
)
{
mLogDetail
.
setText
(
info
.
toString
());
scroll
Detail
.
setVisibility
(
View
.
VISIBLE
);
mLog
Detail
.
setVisibility
(
View
.
VISIBLE
);
mBlockList
.
setVisibility
(
View
.
GONE
);
mTitleBar
.
setTitle
(
R
.
string
.
dk_kit_block_monitor_detail
);
}
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/base/FloatPageManager.java
浏览文件 @
c9e42711
...
...
@@ -24,7 +24,6 @@ public class FloatPageManager {
private
Activity
mResumedActivity
;
public
void
notifyBackground
()
{
for
(
BaseFloatPage
page
:
mPages
)
{
page
.
onEnterBackground
();
...
...
@@ -81,7 +80,8 @@ public class FloatPageManager {
page
.
setTag
(
pageIntent
.
tag
);
mPages
.
add
(
page
);
page
.
performCreate
(
mContext
);
mWindowManager
.
addView
(
page
.
getRootView
(),
page
.
getLayoutParams
());
mWindowManager
.
addView
(
page
.
getRootView
(),
page
.
getLayoutParams
());
}
catch
(
InstantiationException
e
)
{
LogHelper
.
e
(
TAG
,
e
.
toString
());
}
catch
(
IllegalAccessException
e
)
{
...
...
Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
浏览文件 @
c9e42711
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/dk_color_FFFFFF"
android:orientation=
"vertical"
>
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/dk_color_FFFFFF"
android:orientation=
"vertical"
>
<com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar
android:id=
"@+id/title_bar"
...
...
@@ -12,9 +12,10 @@
android:layout_height=
"@dimen/dk_title_height"
app:dkLeftIcon=
"@drawable/dk_title_back"
app:dkLeftText=
"@string/dk_back"
app:dkTitle=
"@string/dk_kit_block_monitor_list"
/>
app:dkTitle=
"@string/dk_kit_block_monitor_list"
/>
<View
style=
"@style/DK.Shadow.Bottom"
/>
<View
style=
"@style/DK.Shadow.Bottom"
/>
<FrameLayout
android:layout_width=
"match_parent"
...
...
@@ -26,22 +27,16 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:overScrollMode=
"never"
android:scrollbars=
"none"
/>
android:scrollbars=
"none"
/>
<
Scroll
View
android:id=
"@+id/
sv
_block_detail"
android:visibility=
"gone
"
<
Text
View
android:id=
"@+id/
tx
_block_detail"
style=
"@style/DK.TextSmall.Dark
"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<TextView
android:id=
"@+id/tx_block_detail"
style=
"@style/DK.TextSmall.Dark"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_gravity=
"top|left"
android:clickable=
"true"
android:gravity=
"left"
/>
</ScrollView>
android:layout_height=
"match_parent"
android:layout_gravity=
"top|left"
android:clickable=
"true"
android:gravity=
"left"
android:visibility=
"gone"
/>
</FrameLayout>
</LinearLayout>
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录