提交 5acdb79a 编写于 作者: J jackjintai

modify:

1、bug fix
上级 17458740
......@@ -4,9 +4,9 @@ ext {
// 线上包不会接入DoraemonKit,测试包会自动接入
applyPlugin : true,
//上传到远程仓库时需要打开
uploadArchives : true,
uploadArchives : false,
//是否发布插件到远程仓库
publishPluginToRemote: true
publishPluginToRemote: false
]
android = [compileSdkVersion : 28,
suppotrSdkVersion : "27.1.1",
......@@ -20,7 +20,7 @@ ext {
//jcenter dokit版本号
jcenterArchivesVersionName: "2.2.4",
//didi内部仓库版本号
didiArchivesVersionName : "1000.0.17",
didiArchivesVersionName : "1000.0.20",
//打包上传时 dokit的版本名字
versionName : "2.2.4",
glide : "4.8.0",
......
......@@ -6,9 +6,12 @@ import com.blankj.utilcode.util.GsonUtils;
import com.blankj.utilcode.util.TimeUtils;
import com.blankj.utilcode.util.ToastUtils;
import com.didichuxing.doraemonkit.BuildConfig;
import com.didichuxing.doraemonkit.DoraemonKit;
import com.didichuxing.doraemonkit.config.CrashCaptureConfig;
import com.didichuxing.doraemonkit.constant.DokitConstant;
import com.didichuxing.doraemonkit.kit.blockmonitor.core.BlockMonitorManager;
import com.didichuxing.doraemonkit.kit.common.PerformanceDataManager;
import com.didichuxing.doraemonkit.kit.crash.CrashCaptureManager;
import com.didichuxing.doraemonkit.kit.health.model.AppHealthInfo;
import com.didichuxing.doraemonkit.okgo.OkGo;
import com.didichuxing.doraemonkit.okgo.callback.StringCallback;
......@@ -317,6 +320,9 @@ public class AppHealthInfoUtil {
PerformanceDataManager.getInstance().startMonitorNetFlowInfo();
//卡顿
BlockMonitorManager.getInstance().start();
//crash 开关
CrashCaptureConfig.setCrashCaptureOpen(DoraemonKit.APPLICATION, true);
CrashCaptureManager.getInstance().start();
}
/**
......@@ -333,6 +339,9 @@ public class AppHealthInfoUtil {
PerformanceDataManager.getInstance().stopMonitorNetFlowInfo();
//卡顿
BlockMonitorManager.getInstance().stop();
//crash 开关
CrashCaptureConfig.setCrashCaptureOpen(DoraemonKit.APPLICATION, false);
CrashCaptureManager.getInstance().stop();
}
......
......@@ -10,7 +10,6 @@ import com.didichuxing.doraemonkit.config.PerformanceMemoryInfoConfig;
import com.didichuxing.doraemonkit.constant.BundleKey;
import com.didichuxing.doraemonkit.kit.common.PerformanceDataManager;
import com.didichuxing.doraemonkit.kit.common.PerformanceFragment;
import com.didichuxing.doraemonkit.kit.health.AppHealthInfoUtil;
import com.didichuxing.doraemonkit.kit.parameter.AbsParameterFragment;
import com.didichuxing.doraemonkit.ui.realtime.datasource.DataSourceFactory;
import com.didichuxing.doraemonkit.ui.setting.SettingItem;
......
......@@ -21,8 +21,10 @@ import com.didichuxing.doraemonkit.ui.realtime.PerformanceDokitView;
import com.didichuxing.doraemonkit.util.LogHelper;
import com.didichuxing.doraemonkit.util.SystemUtil;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
......@@ -185,11 +187,23 @@ class NormalDokitViewManager implements DokitViewManagerInterface {
Map<String, AbsDokitView> existDokitViews = mActivityDokitViews.get(activity);
//先清除页面上启动模式为DokitIntent.MODE_ONCE 的dokitView
if (existDokitViews != null) {
//千万注意不要使用for循环去移除对象 下面注释的这段代码存在bug
// for (AbsDokitView existDokitView : existDokitViews.values()) {
// if (existDokitView.getMode() == DokitIntent.MODE_ONCE) {
// detach(existDokitView.getClass());
// }
// }
List<String> modeOnceDokitViews = new ArrayList<>();
for (AbsDokitView existDokitView : existDokitViews.values()) {
if (existDokitView.getMode() == DokitIntent.MODE_ONCE) {
detach(existDokitView.getClass());
modeOnceDokitViews.add(existDokitView.getClass().getSimpleName());
}
}
for (String tag : modeOnceDokitViews) {
detach(tag);
}
}
......
package com.didichuxing.doraemonkit.ui.setting;
import android.content.Context;
import android.support.annotation.StringRes;
import android.text.TextUtils;
import android.view.LayoutInflater;
import android.view.View;
......@@ -64,11 +65,14 @@ public class SettingItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<Setting
mMenuSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
if (AppHealthInfoUtil.getInstance().isAppHealthRunning()) {
mMenuSwitch.setChecked(true);
return;
if (isMatched(settingItem.desc)) {
if (AppHealthInfoUtil.getInstance().isAppHealthRunning()) {
mMenuSwitch.setChecked(true);
return;
}
}
settingItem.isChecked = isChecked;
mOnSettingItemSwitchListener.onSettingItemSwitch(mMenuSwitch, settingItem, isChecked);
}
......@@ -93,6 +97,31 @@ public class SettingItemAdapter extends AbsRecyclerAdapter<AbsViewBinder<Setting
}
}
/**
* 是否命中
*
* @return
*/
private boolean isMatched(@StringRes int desc) {
int[] resources = new int[]{
R.string.dk_weak_network_switch,
R.string.dk_item_block_switch,
R.string.dk_crash_capture_switch,
R.string.dk_cpu_detection_switch,
R.string.dk_frameinfo_detection_switch,
R.string.dk_ram_detection_switch,
};
boolean isMatches = false;
for (int res : resources) {
if (res == desc) {
isMatches = true;
break;
}
}
return isMatches;
}
public void setOnSettingItemClickListener(OnSettingItemClickListener onSettingItemClickListener) {
mOnSettingItemClickListener = onSettingItemClickListener;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册