Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wangcongtao
2020-08-18 10:09:28 +08:00
2 changed files with 26 additions and 1 deletions

View File

@@ -6,6 +6,21 @@ class MogoMonitorConst {
public static final int LOG_PUSH_TYPE = 500000;
/**
* 开始抓日志
*/
public static final int START_CATCH_LOG = 1;
/**
* 结束抓日志
*/
public static final int STOP_CATCH_LOG = 2;
/**
* 本应用设置,打开日志
*/
public static final int LOCAL_CONFIG_OPEN_LOG = 3;
/**
* 本应用设置,关闭日志
*/
public static final int LOCAL_CONFIG_CLOSE_LOG = 4;
}

View File

@@ -5,12 +5,14 @@ import android.util.ArrayMap;
import com.alibaba.android.arouter.facade.annotation.Route;
import com.alibaba.android.arouter.launcher.ARouter;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.MogoServicePaths;
import com.mogo.service.connection.IMogoOnMessageListener;
import com.mogo.service.monitor.IMogoMonitorProvider;
import com.mogo.utils.logger.LogLevel;
import com.mogo.utils.logger.Logger;
import com.mogo.utils.network.NetConfig;
import com.zhidao.loglib.ILogListener;
import com.zhidao.loglib.LogInfoManager;
import com.zhidao.loglib.bean.RemoteLogPushContent;
@@ -82,6 +84,12 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessage
}
closeLoggerLevel();
break;
case MogoMonitorConst.LOCAL_CONFIG_OPEN_LOG:
openLoggerLevel();
break;
case MogoMonitorConst.LOCAL_CONFIG_CLOSE_LOG:
closeLoggerLevel();
break;
default:
break;
}
@@ -107,6 +115,7 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessage
*/
private void openLoggerLevel(){
Logger.init(LogLevel.DEBUG);
NetConfig.instance().setLoggable( true );
}
/**
@@ -114,7 +123,8 @@ public class MogoMonitorProvider implements IMogoMonitorProvider, IMogoOnMessage
*/
private void closeLoggerLevel(){
if (!isInManualCatchLog && managerCache.size() == 0) {
Logger.init( BuildConfig.DEBUG ? LogLevel.DEBUG : LogLevel.OFF );
Logger.init( DebugConfig.isDebug() ? LogLevel.DEBUG : LogLevel.OFF );
NetConfig.instance().setLoggable( DebugConfig.isDebug() );
}
}