Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
DiDi
DoraemonKit
提交
6fa9ddd2
D
DoraemonKit
项目概览
DiDi
/
DoraemonKit
大约 1 年 前同步成功
通知
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,发现更多精彩内容 >>
提交
6fa9ddd2
编写于
5月 13, 2019
作者:
糕冷羊
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
change[]: android发布1.1.7版本
上级
0fdd1c29
变更
25
隐藏空白更改
内联
并排
Showing
25 changed file
with
118 addition
and
88 deletion
+118
-88
Android/doraemonkit-no-op/upload.gradle
Android/doraemonkit-no-op/upload.gradle
+1
-1
Android/doraemonkit/build.gradle
Android/doraemonkit/build.gradle
+0
-3
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
...uxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
+1
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java
...huxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java
+1
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceDataManager.java
...huxing/doraemonkit/kit/common/PerformanceDataManager.java
+32
-25
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java
...dichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java
+14
-3
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java
...idichuxing/doraemonkit/kit/crash/CrashDetailFragment.java
+1
-0
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashHandlerManager.java
...idichuxing/doraemonkit/kit/crash/CrashHandlerManager.java
+1
-1
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/custom/MonitorDataUploadFragment.java
...ing/doraemonkit/kit/custom/MonitorDataUploadFragment.java
+0
-3
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/AopUtils.java
.../didichuxing/doraemonkit/kit/network/aspect/AopUtils.java
+7
-0
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java
...ichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java
+1
-3
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java
...didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java
+6
-5
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java
.../didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java
+1
-1
Android/doraemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png
...aemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png
+0
-0
Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
...oraemonkit/src/main/res/layout/dk_fragment_block_list.xml
+1
-0
Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml
...emonkit/src/main/res/layout/dk_fragment_crash_capture.xml
+10
-6
Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml
...it/src/main/res/layout/dk_fragment_crash_capture_main.xml
+7
-6
Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml
...kit/src/main/res/layout/dk_fragment_crash_detail_info.xml
+3
-2
Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml
.../doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml
+2
-1
Android/doraemonkit/src/main/res/layout/dk_fragment_monitor_data_upload_page.xml
.../main/res/layout/dk_fragment_monitor_data_upload_page.xml
+13
-12
Android/doraemonkit/src/main/res/layout/dk_fragment_parameter.xml
...doraemonkit/src/main/res/layout/dk_fragment_parameter.xml
+7
-6
Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml
.../doraemonkit/src/main/res/layout/dk_fragment_web_door.xml
+0
-1
Android/doraemonkit/src/main/res/layout/dk_item_crash_capture.xml
...doraemonkit/src/main/res/layout/dk_item_crash_capture.xml
+7
-5
Android/doraemonkit/src/main/res/values/strings.xml
Android/doraemonkit/src/main/res/values/strings.xml
+1
-1
Android/doraemonkit/upload.gradle
Android/doraemonkit/upload.gradle
+1
-1
未找到文件。
Android/doraemonkit-no-op/upload.gradle
浏览文件 @
6fa9ddd2
...
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
...
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
publish
{
publish
{
def
groupProjectID
=
'com.didichuxing.doraemonkit'
def
groupProjectID
=
'com.didichuxing.doraemonkit'
def
artifactProjectID
=
'doraemonkit-no-op'
def
artifactProjectID
=
'doraemonkit-no-op'
def
publishVersionID
=
'1.1.
6
'
def
publishVersionID
=
'1.1.
7
'
userOrg
=
'doraemonkit'
userOrg
=
'doraemonkit'
repoName
=
'DoraemonKit'
repoName
=
'DoraemonKit'
...
...
Android/doraemonkit/build.gradle
浏览文件 @
6fa9ddd2
...
@@ -12,7 +12,6 @@ android {
...
@@ -12,7 +12,6 @@ android {
lintOptions
{
lintOptions
{
abortOnError
false
abortOnError
false
}
}
testInstrumentationRunner
"android.support.test.runner.AndroidJUnitRunner"
javaCompileOptions
{
annotationProcessorOptions
{
includeCompileClasspath
=
true
}
}
javaCompileOptions
{
annotationProcessorOptions
{
includeCompileClasspath
=
true
}
}
}
}
...
@@ -42,8 +41,6 @@ dependencies {
...
@@ -42,8 +41,6 @@ dependencies {
testImplementation
'junit:junit:4.12'
testImplementation
'junit:junit:4.12'
implementation
'com.google.code.gson:gson:2.8.2'
implementation
'com.google.code.gson:gson:2.8.2'
implementation
'com.google.zxing:core:3.3.0'
implementation
'com.google.zxing:core:3.3.0'
androidTestImplementation
'com.android.support.test:runner:1.0.2'
androidTestImplementation
'com.android.support.test.espresso:espresso-core:3.0.2'
}
}
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/BlockListFragment.java
浏览文件 @
6fa9ddd2
...
@@ -63,7 +63,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
...
@@ -63,7 +63,7 @@ public class BlockListFragment extends BaseFragment implements OnBlockInfoUpdate
mBlockListAdapter
.
setOnItemClickListener
(
new
BlockListAdapter
.
OnItemClickListener
()
{
mBlockListAdapter
.
setOnItemClickListener
(
new
BlockListAdapter
.
OnItemClickListener
()
{
@Override
@Override
public
void
onClick
(
BlockInfo
info
)
{
public
void
onClick
(
BlockInfo
info
)
{
mLogDetail
.
setText
(
info
.
toString
()
+
info
.
toString
()
+
info
.
toString
()
);
mLogDetail
.
setText
(
info
.
toString
());
mLogDetail
.
setVisibility
(
View
.
VISIBLE
);
mLogDetail
.
setVisibility
(
View
.
VISIBLE
);
mBlockList
.
setVisibility
(
View
.
GONE
);
mBlockList
.
setVisibility
(
View
.
GONE
);
mTitleBar
.
setTitle
(
getResources
().
getString
(
R
.
string
.
dk_kit_block_monitor_detail
),
false
);
mTitleBar
.
setTitle
(
getResources
().
getString
(
R
.
string
.
dk_kit_block_monitor_detail
),
false
);
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/blockmonitor/core/MonitorCore.java
浏览文件 @
6fa9ddd2
...
@@ -12,7 +12,7 @@ import java.util.ArrayList;
...
@@ -12,7 +12,7 @@ import java.util.ArrayList;
*/
*/
class
MonitorCore
implements
Printer
{
class
MonitorCore
implements
Printer
{
private
static
final
String
TAG
=
"MonitorCore"
;
private
static
final
String
TAG
=
"MonitorCore"
;
private
static
final
int
BLOCK_THRESHOLD_MILLIS
=
5
00
;
private
static
final
int
BLOCK_THRESHOLD_MILLIS
=
2
00
;
private
long
mStartTime
=
0
;
private
long
mStartTime
=
0
;
private
long
mStartThreadTime
=
0
;
private
long
mStartThreadTime
=
0
;
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/common/PerformanceDataManager.java
浏览文件 @
6fa9ddd2
...
@@ -7,12 +7,13 @@ import android.os.Debug;
...
@@ -7,12 +7,13 @@ import android.os.Debug;
import
android.os.Environment
;
import
android.os.Environment
;
import
android.os.Handler
;
import
android.os.Handler
;
import
android.os.HandlerThread
;
import
android.os.HandlerThread
;
import
android.os.Looper
;
import
android.os.Message
;
import
android.os.Message
;
import
android.os.Process
;
import
android.os.Process
;
import
android.support.annotation.RequiresApi
;
import
android.support.annotation.RequiresApi
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.text.format.DateUtils
;
import
android.view.Choreographer
;
import
android.view.Choreographer
;
import
android.widget.Toast
;
import
com.didichuxing.doraemonkit.R
;
import
com.didichuxing.doraemonkit.R
;
import
com.didichuxing.doraemonkit.config.PerformanceInfoConfig
;
import
com.didichuxing.doraemonkit.config.PerformanceInfoConfig
;
...
@@ -22,7 +23,6 @@ import com.didichuxing.doraemonkit.util.FileManager;
...
@@ -22,7 +23,6 @@ import com.didichuxing.doraemonkit.util.FileManager;
import
com.didichuxing.doraemonkit.util.JsonUtil
;
import
com.didichuxing.doraemonkit.util.JsonUtil
;
import
com.didichuxing.doraemonkit.util.LogHelper
;
import
com.didichuxing.doraemonkit.util.LogHelper
;
import
com.didichuxing.doraemonkit.util.threadpool.ThreadPoolProxyFactory
;
import
com.didichuxing.doraemonkit.util.threadpool.ThreadPoolProxyFactory
;
import
com.google.gson.JsonObject
;
import
java.io.BufferedReader
;
import
java.io.BufferedReader
;
import
java.io.ByteArrayInputStream
;
import
java.io.ByteArrayInputStream
;
...
@@ -40,6 +40,7 @@ import java.util.Date;
...
@@ -40,6 +40,7 @@ import java.util.Date;
public
class
PerformanceDataManager
{
public
class
PerformanceDataManager
{
private
static
final
String
TAG
=
"PerformanceDataManager"
;
private
static
final
String
TAG
=
"PerformanceDataManager"
;
private
static
final
float
SECOND_IN_NANOS
=
1000000000
f
;
private
static
final
float
SECOND_IN_NANOS
=
1000000000
f
;
private
static
final
int
MAX_FRAME_RATE
=
60
;
private
static
final
int
NORMAL_FRAME_RATE
=
1
;
private
static
final
int
NORMAL_FRAME_RATE
=
1
;
private
String
filePath
;
private
String
filePath
;
private
String
memoryFileName
=
"memory.txt"
;
private
String
memoryFileName
=
"memory.txt"
;
...
@@ -48,12 +49,10 @@ public class PerformanceDataManager {
...
@@ -48,12 +49,10 @@ public class PerformanceDataManager {
private
String
customFileName
=
"custom.txt"
;
//自定义测试页面保存的文件名称
private
String
customFileName
=
"custom.txt"
;
//自定义测试页面保存的文件名称
private
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
private
SimpleDateFormat
simpleDateFormat
=
new
SimpleDateFormat
(
"yyyy-MM-dd HH:mm:ss"
);
private
long
mLastFrameTimeNanos
;
private
int
mLastFrameRate
=
MAX_FRAME_RATE
;
private
int
mLastFrameRate
;
private
int
mLastSkippedFrames
;
private
int
mLastSkippedFrames
;
private
float
mLastCpuRate
;
private
float
mLastCpuRate
;
private
float
mLastMemoryInfo
;
private
float
mLastMemoryInfo
;
private
String
mPackageName
;
private
Handler
mHandler
;
private
Handler
mHandler
;
private
HandlerThread
mHandlerThread
;
private
HandlerThread
mHandlerThread
;
private
float
mMaxMemory
;
private
float
mMaxMemory
;
...
@@ -69,23 +68,8 @@ public class PerformanceDataManager {
...
@@ -69,23 +68,8 @@ public class PerformanceDataManager {
private
static
final
int
MSG_SAVE_LOCAL
=
3
;
private
static
final
int
MSG_SAVE_LOCAL
=
3
;
private
UploadMonitorInfoBean
mUploadMonitorBean
;
private
UploadMonitorInfoBean
mUploadMonitorBean
;
private
boolean
mUploading
;
private
boolean
mUploading
;
private
Handler
mMainHandler
=
new
Handler
(
Looper
.
getMainLooper
());
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
private
FrameRateRunnable
mRateRunnable
=
new
FrameRateRunnable
();
private
Choreographer
.
FrameCallback
mFrameCallback
=
new
Choreographer
.
FrameCallback
()
{
@Override
public
void
doFrame
(
long
frameTimeNanos
)
{
if
(
mLastFrameTimeNanos
!=
0L
)
{
long
temp
=
frameTimeNanos
-
mLastFrameTimeNanos
;
if
(
temp
!=
0
)
{
mLastFrameRate
=
Math
.
round
(
SECOND_IN_NANOS
/
(
frameTimeNanos
-
mLastFrameTimeNanos
));
mLastSkippedFrames
=
60
-
mLastFrameRate
;
}
}
mLastFrameTimeNanos
=
frameTimeNanos
;
Choreographer
.
getInstance
().
postFrameCallback
(
this
);
writeFpsDataIntoFile
();
}
};
private
void
executeCpuData
()
{
private
void
executeCpuData
()
{
LogHelper
.
d
(
TAG
,
"current thread name is =="
+
Thread
.
currentThread
().
getName
());
LogHelper
.
d
(
TAG
,
"current thread name is =="
+
Thread
.
currentThread
().
getName
());
...
@@ -178,7 +162,6 @@ public class PerformanceDataManager {
...
@@ -178,7 +162,6 @@ public class PerformanceDataManager {
mActivityManager
=
(
ActivityManager
)
context
.
getSystemService
(
Context
.
ACTIVITY_SERVICE
);
mActivityManager
=
(
ActivityManager
)
context
.
getSystemService
(
Context
.
ACTIVITY_SERVICE
);
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
O
)
{
mAboveAndroidO
=
true
;
mAboveAndroidO
=
true
;
mPackageName
=
context
.
getPackageName
();
}
}
if
(
mHandlerThread
==
null
)
{
if
(
mHandlerThread
==
null
)
{
mHandlerThread
=
new
HandlerThread
(
"handler-thread"
);
mHandlerThread
=
new
HandlerThread
(
"handler-thread"
);
...
@@ -215,12 +198,14 @@ public class PerformanceDataManager {
...
@@ -215,12 +198,14 @@ public class PerformanceDataManager {
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
public
void
startMonitorFrameInfo
()
{
public
void
startMonitorFrameInfo
()
{
Choreographer
.
getInstance
().
postFrameCallback
(
mFrameCallback
);
mMainHandler
.
postDelayed
(
mRateRunnable
,
DateUtils
.
SECOND_IN_MILLIS
);
Choreographer
.
getInstance
().
postFrameCallback
(
mRateRunnable
);
}
}
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
@RequiresApi
(
api
=
Build
.
VERSION_CODES
.
JELLY_BEAN
)
public
void
stopMonitorFrameInfo
()
{
public
void
stopMonitorFrameInfo
()
{
Choreographer
.
getInstance
().
removeFrameCallback
(
mFrameCallback
);
Choreographer
.
getInstance
().
removeFrameCallback
(
mRateRunnable
);
mMainHandler
.
removeCallbacks
(
mRateRunnable
);
}
}
public
void
startMonitorCPUInfo
()
{
public
void
startMonitorCPUInfo
()
{
...
@@ -467,4 +452,26 @@ public class PerformanceDataManager {
...
@@ -467,4 +452,26 @@ public class PerformanceDataManager {
public
float
getMaxMemory
()
{
public
float
getMaxMemory
()
{
return
mMaxMemory
;
return
mMaxMemory
;
}
}
private
class
FrameRateRunnable
implements
Runnable
,
Choreographer
.
FrameCallback
{
private
int
totalFramesPerSecond
;
@Override
public
void
run
()
{
mLastFrameRate
=
totalFramesPerSecond
;
if
(
mLastFrameRate
>
MAX_FRAME_RATE
)
{
mLastFrameRate
=
MAX_FRAME_RATE
;
}
mLastSkippedFrames
=
MAX_FRAME_RATE
-
mLastFrameRate
;
totalFramesPerSecond
=
0
;
mMainHandler
.
postDelayed
(
this
,
DateUtils
.
SECOND_IN_MILLIS
);
}
@Override
public
void
doFrame
(
long
frameTimeNanos
)
{
totalFramesPerSecond
++;
Choreographer
.
getInstance
().
postFrameCallback
(
this
);
writeFpsDataIntoFile
();
}
}
}
}
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashCaptureFragment.java
浏览文件 @
6fa9ddd2
...
@@ -15,6 +15,10 @@ import com.didichuxing.doraemonkit.ui.crash.CrashCaptureAdapter;
...
@@ -15,6 +15,10 @@ import com.didichuxing.doraemonkit.ui.crash.CrashCaptureAdapter;
import
com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar
;
import
com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar
;
import
java.io.File
;
import
java.io.File
;
import
java.util.Arrays
;
import
java.util.Collections
;
import
java.util.Comparator
;
import
java.util.List
;
public
class
CrashCaptureFragment
extends
BaseFragment
{
public
class
CrashCaptureFragment
extends
BaseFragment
{
...
@@ -46,8 +50,15 @@ public class CrashCaptureFragment extends BaseFragment {
...
@@ -46,8 +50,15 @@ public class CrashCaptureFragment extends BaseFragment {
File
file
=
new
File
(
CrashHandlerManager
.
getInstance
().
getFilePath
());
File
file
=
new
File
(
CrashHandlerManager
.
getInstance
().
getFilePath
());
if
(
file
.
exists
())
{
if
(
file
.
exists
())
{
ListView
crash
=
findViewById
(
R
.
id
.
lv_crash
);
ListView
crash
=
findViewById
(
R
.
id
.
lv_crash
);
final
File
[]
listFiles
=
file
.
listFiles
();
final
List
<
File
>
listFiles
=
Arrays
.
asList
(
file
.
listFiles
());
if
(
listFiles
!=
null
&&
listFiles
.
length
!=
0
)
{
if
(
listFiles
!=
null
&&
listFiles
.
size
()
!=
0
)
{
Collections
.
sort
(
listFiles
,
new
Comparator
<
File
>()
{
@Override
public
int
compare
(
File
lhs
,
File
rhs
)
{
return
Long
.
valueOf
(
rhs
.
lastModified
())
.
compareTo
(
lhs
.
lastModified
());
}
});
crash
.
setAdapter
(
new
CrashCaptureAdapter
(
listFiles
));
crash
.
setAdapter
(
new
CrashCaptureAdapter
(
listFiles
));
}
else
{
}
else
{
Toast
.
makeText
(
getContext
(),
R
.
string
.
dk_crash_capture_no_record
,
Toast
.
LENGTH_SHORT
).
show
();
Toast
.
makeText
(
getContext
(),
R
.
string
.
dk_crash_capture_no_record
,
Toast
.
LENGTH_SHORT
).
show
();
...
@@ -56,7 +67,7 @@ public class CrashCaptureFragment extends BaseFragment {
...
@@ -56,7 +67,7 @@ public class CrashCaptureFragment extends BaseFragment {
@Override
@Override
public
void
onItemClick
(
AdapterView
<?>
parent
,
View
view
,
int
position
,
long
id
)
{
public
void
onItemClick
(
AdapterView
<?>
parent
,
View
view
,
int
position
,
long
id
)
{
Bundle
bundle
=
new
Bundle
();
Bundle
bundle
=
new
Bundle
();
File
listFile
=
listFiles
[
position
]
;
File
listFile
=
listFiles
.
get
(
position
)
;
bundle
.
putSerializable
(
BundleKey
.
FILE_KEY
,
listFile
);
bundle
.
putSerializable
(
BundleKey
.
FILE_KEY
,
listFile
);
showContent
(
CrashDetailFragment
.
class
,
bundle
);
showContent
(
CrashDetailFragment
.
class
,
bundle
);
}
}
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashDetailFragment.java
浏览文件 @
6fa9ddd2
...
@@ -59,6 +59,7 @@ public class CrashDetailFragment extends BaseFragment {
...
@@ -59,6 +59,7 @@ public class CrashDetailFragment extends BaseFragment {
String
line
;
String
line
;
while
((
line
=
bufferedReader
.
readLine
())
!=
null
)
{
while
((
line
=
bufferedReader
.
readLine
())
!=
null
)
{
stringBuilder
.
append
(
line
);
stringBuilder
.
append
(
line
);
stringBuilder
.
append
(
"\n"
);
}
}
inputStreamReader
.
close
();
inputStreamReader
.
close
();
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/crash/CrashHandlerManager.java
浏览文件 @
6fa9ddd2
...
@@ -155,7 +155,7 @@ public class CrashHandlerManager implements Thread.UncaughtExceptionHandler {
...
@@ -155,7 +155,7 @@ public class CrashHandlerManager implements Thread.UncaughtExceptionHandler {
String
value
=
entry
.
getValue
();
String
value
=
entry
.
getValue
();
sb
.
append
(
key
+
"="
+
value
+
"\n"
);
sb
.
append
(
key
+
"="
+
value
+
"\n"
);
}
}
sb
.
append
(
"\n"
);
Writer
writer
=
new
StringWriter
();
Writer
writer
=
new
StringWriter
();
PrintWriter
printWriter
=
new
PrintWriter
(
writer
);
PrintWriter
printWriter
=
new
PrintWriter
(
writer
);
ex
.
printStackTrace
(
printWriter
);
ex
.
printStackTrace
(
printWriter
);
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/custom/MonitorDataUploadFragment.java
浏览文件 @
6fa9ddd2
...
@@ -5,11 +5,8 @@ import android.support.annotation.NonNull;
...
@@ -5,11 +5,8 @@ import android.support.annotation.NonNull;
import
android.support.annotation.Nullable
;
import
android.support.annotation.Nullable
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.LinearLayoutManager
;
import
android.support.v7.widget.RecyclerView
;
import
android.support.v7.widget.RecyclerView
;
import
android.text.Editable
;
import
android.text.TextUtils
;
import
android.text.TextUtils
;
import
android.text.TextWatcher
;
import
android.view.View
;
import
android.view.View
;
import
android.widget.EditText
;
import
android.widget.TextView
;
import
android.widget.TextView
;
import
com.didichuxing.doraemonkit.R
;
import
com.didichuxing.doraemonkit.R
;
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/AopUtils.java
浏览文件 @
6fa9ddd2
...
@@ -11,6 +11,7 @@ import java.net.URLConnection;
...
@@ -11,6 +11,7 @@ import java.net.URLConnection;
import
javax.net.ssl.HttpsURLConnection
;
import
javax.net.ssl.HttpsURLConnection
;
import
okhttp3.Interceptor
;
import
okhttp3.OkHttpClient
;
import
okhttp3.OkHttpClient
;
/**
/**
...
@@ -31,6 +32,12 @@ public class AopUtils {
...
@@ -31,6 +32,12 @@ public class AopUtils {
}
}
public
static
void
addInterceptor
(
OkHttpClient
.
Builder
builder
)
{
public
static
void
addInterceptor
(
OkHttpClient
.
Builder
builder
)
{
// 判断当前是否已经添加了拦截器,如果已添加则返回
for
(
Interceptor
interceptor
:
builder
.
interceptors
())
{
if
(
interceptor
instanceof
DoraemonInterceptor
)
{
return
;
}
}
builder
.
addNetworkInterceptor
(
new
DoraemonWeakNetworkInterceptor
())
builder
.
addNetworkInterceptor
(
new
DoraemonWeakNetworkInterceptor
())
.
addInterceptor
(
new
DoraemonInterceptor
());
.
addInterceptor
(
new
DoraemonInterceptor
());
}
}
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/kit/network/aspect/OkHttpAspect.java
浏览文件 @
6fa9ddd2
...
@@ -12,8 +12,6 @@ public class OkHttpAspect {
...
@@ -12,8 +12,6 @@ public class OkHttpAspect {
@After
(
"execution(okhttp3.OkHttpClient.Builder.new(..))"
)
@After
(
"execution(okhttp3.OkHttpClient.Builder.new(..))"
)
public
void
addInterceptor
(
JoinPoint
joinPoint
)
{
public
void
addInterceptor
(
JoinPoint
joinPoint
)
{
if
(
joinPoint
.
getArgs
()
!=
null
&&
joinPoint
.
getArgs
().
length
>
0
&&
joinPoint
.
getArgs
()[
0
]
instanceof
OkHttpClient
)
{
AopUtils
.
addInterceptor
((
OkHttpClient
.
Builder
)
joinPoint
.
getTarget
());
AopUtils
.
addInterceptor
((
OkHttpClient
.
Builder
)
joinPoint
.
getTarget
());
}
}
}
}
}
\ No newline at end of file
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/ui/crash/CrashCaptureAdapter.java
浏览文件 @
6fa9ddd2
...
@@ -9,22 +9,23 @@ import android.widget.TextView;
...
@@ -9,22 +9,23 @@ import android.widget.TextView;
import
com.didichuxing.doraemonkit.R
;
import
com.didichuxing.doraemonkit.R
;
import
java.io.File
;
import
java.io.File
;
import
java.util.List
;
public
class
CrashCaptureAdapter
extends
BaseAdapter
{
public
class
CrashCaptureAdapter
extends
BaseAdapter
{
private
File
[]
files
;
private
List
<
File
>
files
;
public
CrashCaptureAdapter
(
File
[]
files
)
{
public
CrashCaptureAdapter
(
List
<
File
>
files
)
{
this
.
files
=
files
;
this
.
files
=
files
;
}
}
@Override
@Override
public
int
getCount
()
{
public
int
getCount
()
{
return
files
.
length
;
return
files
.
size
()
;
}
}
@Override
@Override
public
Object
getItem
(
int
position
)
{
public
Object
getItem
(
int
position
)
{
return
files
[
position
]
;
return
files
.
get
(
position
)
;
}
}
@Override
@Override
...
@@ -42,7 +43,7 @@ public class CrashCaptureAdapter extends BaseAdapter {
...
@@ -42,7 +43,7 @@ public class CrashCaptureAdapter extends BaseAdapter {
}
else
{
}
else
{
viewHolder
=
(
ViewHolder
)
convertView
.
getTag
();
viewHolder
=
(
ViewHolder
)
convertView
.
getTag
();
}
}
viewHolder
.
setData
(
files
[
position
]
.
getName
());
viewHolder
.
setData
(
files
.
get
(
position
)
.
getName
());
return
convertView
;
return
convertView
;
}
}
...
...
Android/doraemonkit/src/main/java/com/didichuxing/doraemonkit/util/DoraemonStatisticsUtil.java
浏览文件 @
6fa9ddd2
...
@@ -38,7 +38,7 @@ public class DoraemonStatisticsUtil {
...
@@ -38,7 +38,7 @@ public class DoraemonStatisticsUtil {
try
{
try
{
jsonObject
.
put
(
"appId"
,
appId
);
jsonObject
.
put
(
"appId"
,
appId
);
jsonObject
.
put
(
"appName"
,
appName
);
jsonObject
.
put
(
"appName"
,
appName
);
jsonObject
.
put
(
"version"
,
"1.1.
6
"
);
jsonObject
.
put
(
"version"
,
"1.1.
7
"
);
jsonObject
.
put
(
"type"
,
type
);
jsonObject
.
put
(
"type"
,
type
);
jsonObject
.
put
(
"from"
,
from
);
jsonObject
.
put
(
"from"
,
from
);
}
catch
(
JSONException
e
)
{
}
catch
(
JSONException
e
)
{
...
...
Android/doraemonkit/src/main/res/drawable-xxhdpi/dk_weak_network.png
查看替换文件 @
0fdd1c29
浏览文件 @
6fa9ddd2
2.4 KB
|
W:
|
H:
7.3 KB
|
W:
|
H:
2-up
Swipe
Onion skin
Android/doraemonkit/src/main/res/layout/dk_fragment_block_list.xml
浏览文件 @
6fa9ddd2
...
@@ -36,6 +36,7 @@
...
@@ -36,6 +36,7 @@
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:layout_gravity=
"top|left"
android:layout_gravity=
"top|left"
android:clickable=
"true"
android:clickable=
"true"
android:textSize=
"@dimen/dk_font_size_14"
android:gravity=
"left"
android:gravity=
"left"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</FrameLayout>
</FrameLayout>
...
...
Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture.xml
浏览文件 @
6fa9ddd2
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@color/dk_color_FFFFFF"
android:orientation=
"vertical"
>
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
<com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar
<com.didichuxing.doraemonkit.ui.widget.titlebar.TitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
...
@@ -11,13 +12,16 @@
...
@@ -11,13 +12,16 @@
android:layout_height=
"44dp"
android:layout_height=
"44dp"
app:dkLeftIcon=
"@drawable/dk_title_back"
app:dkLeftIcon=
"@drawable/dk_title_back"
app:dkLeftText=
"@string/dk_back"
app:dkLeftText=
"@string/dk_back"
app:dkTitle=
"@string/dk_crash_capture_summary_title"
/>
app:dkTitle=
"@string/dk_crash_capture_summary_title"
/>
<View
style=
"@style/DK.Shadow.Bottom"
/>
<ListView
<ListView
android:id=
"@+id/lv_crash"
android:id=
"@+id/lv_crash"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:background=
"@android:color/white"
/>
android:background=
"@android:color/white"
/>
</LinearLayout>
</LinearLayout>
Android/doraemonkit/src/main/res/layout/dk_fragment_crash_capture_main.xml
浏览文件 @
6fa9ddd2
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:background=
"@color/dk_color_FFFFFF"
android:orientation=
"vertical"
>
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"89dp"
android:layout_height=
"89dp"
app:dkIcon=
"@drawable/dk_close_icon_big"
app:dkIcon=
"@drawable/dk_close_icon_big"
app:dkTitle=
"@string/dk_kit_crash"
/>
app:dkTitle=
"@string/dk_kit_crash"
/>
<android.support.v7.widget.RecyclerView
<android.support.v7.widget.RecyclerView
android:id=
"@+id/setting_list"
android:id=
"@+id/setting_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android:layout_height=
"match_parent"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Android/doraemonkit/src/main/res/layout/dk_fragment_crash_detail_info.xml
浏览文件 @
6fa9ddd2
...
@@ -17,14 +17,15 @@
...
@@ -17,14 +17,15 @@
app:dkLeftIcon=
"@drawable/dk_title_back"
app:dkLeftIcon=
"@drawable/dk_title_back"
app:dkLeftText=
"@string/dk_back"
app:dkLeftText=
"@string/dk_back"
app:dkTitle=
"@string/dk_crash_capture_summary_title"
/>
app:dkTitle=
"@string/dk_crash_capture_summary_title"
/>
<View
style=
"@style/DK.Shadow.Bottom"
/>
<TextView
<TextView
android:id=
"@+id/tv_crash_detail"
android:id=
"@+id/tv_crash_detail"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:textColor=
"@color/dk_color_000000"
android:textColor=
"@color/dk_color_000000"
android:textSize=
"
10sp
"
/>
android:textSize=
"
@dimen/dk_font_size_14
"
/>
</LinearLayout>
</LinearLayout>
...
...
Android/doraemonkit/src/main/res/layout/dk_fragment_gps_mock.xml
浏览文件 @
6fa9ddd2
...
@@ -2,7 +2,8 @@
...
@@ -2,7 +2,8 @@
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:background=
"@color/dk_color_FFFFFF"
android:layout_height=
"match_parent"
>
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
...
...
Android/doraemonkit/src/main/res/layout/dk_fragment_monitor_data_upload_page.xml
浏览文件 @
6fa9ddd2
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:background=
"@color/dk_color_FFFFFF"
android:orientation=
"vertical"
>
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"89dp"
android:layout_height=
"89dp"
app:dkIcon=
"@drawable/dk_close_icon_big"
/>
app:dkIcon=
"@drawable/dk_close_icon_big"
/>
<android.support.v7.widget.RecyclerView
<android.support.v7.widget.RecyclerView
android:id=
"@+id/setting_list"
android:id=
"@+id/setting_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
/>
android:layout_height=
"wrap_content"
/>
<View
<View
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:
background=
"@color/dk_color_F5F6F7
"
android:
layout_height=
"12dp
"
android:
layout_height=
"12dp
"
/>
android:
background=
"@color/dk_color_F5F6F7
"
/>
<LinearLayout
<LinearLayout
android:gravity=
"bottom|center_horizontal"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
android:gravity=
"bottom|center_horizontal"
android:orientation=
"vertical"
>
<TextView
<TextView
android:id=
"@+id/commit"
android:id=
"@+id/commit"
...
@@ -34,6 +35,6 @@
...
@@ -34,6 +35,6 @@
android:layout_marginRight=
"15dp"
android:layout_marginRight=
"15dp"
android:layout_marginBottom=
"15dp"
android:layout_marginBottom=
"15dp"
android:enabled=
"false"
android:enabled=
"false"
android:text=
"@string/dk_platform_monitor_data_button"
/>
android:text=
"@string/dk_platform_monitor_data_button"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
Android/doraemonkit/src/main/res/layout/dk_fragment_parameter.xml
浏览文件 @
6fa9ddd2
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:background=
"@color/dk_color_FFFFFF"
android:orientation=
"vertical"
>
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
<com.didichuxing.doraemonkit.ui.widget.titlebar.HomeTitleBar
android:id=
"@+id/title_bar"
android:id=
"@+id/title_bar"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"89dp"
android:layout_height=
"89dp"
app:dkIcon=
"@drawable/dk_close_icon_big"
/>
app:dkIcon=
"@drawable/dk_close_icon_big"
/>
<android.support.v7.widget.RecyclerView
<android.support.v7.widget.RecyclerView
android:id=
"@+id/setting_list"
android:id=
"@+id/setting_list"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
android:layout_height=
"match_parent"
/>
</LinearLayout>
</LinearLayout>
\ No newline at end of file
Android/doraemonkit/src/main/res/layout/dk_fragment_web_door.xml
浏览文件 @
6fa9ddd2
...
@@ -13,7 +13,6 @@
...
@@ -13,7 +13,6 @@
app:dkIcon=
"@drawable/dk_close_icon_big"
app:dkIcon=
"@drawable/dk_close_icon_big"
app:dkTitle=
"@string/dk_kit_web_door"
/>
app:dkTitle=
"@string/dk_kit_web_door"
/>
<View
style=
"@style/DK.Divider"
/>
<RelativeLayout
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
Android/doraemonkit/src/main/res/layout/dk_item_crash_capture.xml
浏览文件 @
6fa9ddd2
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
<TextView
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/tv_crash_item"
android:id=
"@+id/tv_crash_item"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:layout_height=
"match_parent"
android:drawableRight=
"@drawable/dk_more_icon"
android:drawableRight=
"@drawable/dk_more_icon"
android:textColor=
"@color/dk_color_333333"
/>
android:padding=
"@dimen/dk_dp_15"
android:textColor=
"@color/dk_color_333333"
android:textSize=
"@dimen/dk_font_size_14"
/>
Android/doraemonkit/src/main/res/values/strings.xml
浏览文件 @
6fa9ddd2
...
@@ -160,7 +160,7 @@
...
@@ -160,7 +160,7 @@
<string
name=
"dk_align_info_text"
>
位置:左%1$d 右%2$d 上%3$d 下%4$d
</string>
<string
name=
"dk_align_info_text"
>
位置:左%1$d 右%2$d 上%3$d 下%4$d
</string>
<string
name=
"dk_error_tips_permissions_less"
>
请进行授权才可以使用
改
功能
</string>
<string
name=
"dk_error_tips_permissions_less"
>
请进行授权才可以使用
该
功能
</string>
//启动、跳转耗时
//启动、跳转耗时
<string
name=
"dk_item_time_counter_switch"
>
Activity跳转耗时
</string>
<string
name=
"dk_item_time_counter_switch"
>
Activity跳转耗时
</string>
<string
name=
"dk_item_time_goto_list"
>
查看记录
</string>
<string
name=
"dk_item_time_goto_list"
>
查看记录
</string>
...
...
Android/doraemonkit/upload.gradle
浏览文件 @
6fa9ddd2
...
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
...
@@ -3,7 +3,7 @@ apply plugin: 'com.novoda.bintray-release'
publish
{
publish
{
def
groupProjectID
=
'com.didichuxing.doraemonkit'
def
groupProjectID
=
'com.didichuxing.doraemonkit'
def
artifactProjectID
=
'doraemonkit'
def
artifactProjectID
=
'doraemonkit'
def
publishVersionID
=
'1.1.
6
'
def
publishVersionID
=
'1.1.
7
'
userOrg
=
'doraemonkit'
userOrg
=
'doraemonkit'
repoName
=
'DoraemonKit'
repoName
=
'DoraemonKit'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录