Merge branch 'dev_1.1.2' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher into dev_1.1.2

# Conflicts:
#	app/build.gradle
#	services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java
#	services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java
#	services/mogo-service/src/main/java/com/mogo/service/impl/MogoServiceApis.java
#	settings.gradle

services/mogo-service-api/src/main/java/com/mogo/service/IMogoServiceApis.java

@@ -23,6 +23,7 @@ import com.mogo.service.module.IMogoMarkerService;
 import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.module.IMogoSearchManager;
 import com.mogo.service.module.IMogoSettingManager;
+import com.mogo.service.monitor.IMogoMonitorProvider;
 import com.mogo.service.network.IMogoNetwork;
 import com.mogo.service.obu.IMogoObuManager;
 import com.mogo.service.passport.IMogoPassportManager;
@@ -250,4 +251,10 @@ public interface IMogoServiceApis extends IProvider {
      * @return
      */
     IMogoTanluProvider getTanluApi();
+
+    /**
+     * 获取Monitor相关api
+     * @return
+     */
+    IMogoMonitorProvider getMogoMonitorApi();
 }

services/mogo-service-api/src/main/java/com/mogo/service/MogoServicePaths.java

@@ -231,7 +231,7 @@ public class MogoServicePaths {
      * 日志上传
      */
     @Deprecated
-    public static final String PATH_LOG_LIB = "/loglib/api";
+    public static final String PATH_MOGO_MONITOR = "/monitor/api";
 
     /**
      * 探路api

services/mogo-service-api/src/main/java/com/mogo/service/monitor/IMogoMonitorProvider.java

@@ -0,0 +1,22 @@
+package com.mogo.service.monitor;
+
+import android.content.Context;
+
+import com.alibaba.android.arouter.facade.template.IProvider;
+
+/**
+ * monitor接口
+ * @author tongchenfei
+ */
+public interface IMogoMonitorProvider extends IProvider {
+    /**
+     * 显示日志抓取窗口
+     */
+    void showLogDebugDialog();
+
+    /**
+     * 重置context，设置成activity的context
+     * @param context activity的context
+     */
+    void resetActivityContext(Context context);
+}