提交 847713b9 编写于 作者: J jackjintai

modify:

1、去掉root库
上级 a8e60963
......@@ -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 {
......
......@@ -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) {
......
......@@ -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);
......
......@@ -149,6 +149,10 @@ public class UniversalActivity extends BaseActivity {
@Override
protected void onDestroy() {
super.onDestroy();
try {
super.onDestroy();
} catch (Exception e) {
e.printStackTrace();
}
}
}
......@@ -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) {
......
......@@ -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);
}
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册