merge

.idea/gradle.xml

@@ -61,6 +61,11 @@
             <option value="$PROJECT_DIR$/skin/mogo-skin-support" />
             <option value="$PROJECT_DIR$/skin/mogo-skin-support-impl" />
             <option value="$PROJECT_DIR$/skin/mogo-skin-support-noop" />
+            <option value="$PROJECT_DIR$/skin/skin-support" />
+            <option value="$PROJECT_DIR$/skin/skin-support-appcompat" />
+            <option value="$PROJECT_DIR$/skin/skin-support-cardview" />
+            <option value="$PROJECT_DIR$/skin/skin-support-constraint-layout" />
+            <option value="$PROJECT_DIR$/skin/skin-support-design" />
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/src/em4/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:sharedUserId="android.uid.system"
     package="com.mogo.launcher">
+<!--    android:sharedUserId="android.uid.system"-->
 </manifest>

config.gradle

@@ -160,7 +160,7 @@ targetSdkVersion               : 22,
             gpssimulatornoop         : "com.mogo.module:module-gps-simulator-noop:${MOGO_MODULE_GPS_SIMULATOR_NOOP_VERSION}",
 
             adasapi                  : "com.zhidao.autopilot.support:adas:1.0.1",
-            adasconfigapi            : "com.zhidao.adasconfig:adasconfig:1.0.5",
+            adasconfigapi            : "com.zhidao.adasconfig:adasconfig:1.0.6",
 
             // 个人中心的SDK
             personalsdk              : "com.zhidaoauto.person.info:data:1.0.1",

foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast.xml

@@ -20,7 +20,7 @@
         android:maxWidth="@dimen/module_commons_toast_maxWidth"
         android:maxLength="20"
         android:maxLines="1"
-        android:textColor="#FFFF"
+        android:textColor="@color/modules_commons_toast_text_color"
         android:textSize="@dimen/module_commons_toast_textSize"
         tools:text="测试测试测试" />
 

foudations/mogo-commons/src/main/res/layout/module_commons_layout_toast_with_left_drawable.xml

@@ -31,7 +31,7 @@
         android:maxWidth="@dimen/module_commons_toast_maxWidth"
         android:maxLength="20"
         android:maxLines="1"
-        android:textColor="#FFFF"
+        android:textColor="@color/modules_commons_toast_text_color"
         android:textSize="@dimen/module_commons_toast_textSize"
         tools:text="测试测试测试" />
 

foudations/mogo-commons/src/main/res/values/colors.xml

@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
+<resources>
+    <color name="modules_commons_toast_text_color">#fff</color>
+</resources>

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt

@@ -121,7 +121,6 @@ class CosStatusController : CosStatusCallback {
             downloadUrl: String?,
             localPath: String?
     ) {
-        Log.d(TAG, "uploadFile mType= $mType")
         Log.d(TAG, "uploadCosCompleted localPath = $localPath")
         Log.d(TAG, "uploadCosCompleted downloadUrl = $downloadUrl")
         Log.d(TAG, "uploadCosCompleted cosPath = $cosPath")
@@ -150,17 +149,19 @@ class CosStatusController : CosStatusCallback {
                         sendGetInfoFailedReceiver("100")
                     }
                 } else {
+                    trackUploadCos(4)
                     //分享成功，并打点，如果是上报拥堵，需要takeVideo
                     LatLngStickyEventBus.getInstance()
                             .postSticky(GetImageSuccessEvent(downloadUrl, mType))
                     //上传录像以及缩略图成功
                     sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
                 }
+            } else {
+                trackUploadCos(5)
             }
         } else {
             //上传图片成功, 如果是上报路况，直接上传，TODO
-            Log.d(TAG, "uploadCosCompleted 分享成功 ----mType = $mType")
-//            if (mType.equals("1") || mType.equals("-1")) {
+            Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType")
             sendInformationDirectly(
                     INFO_TYPE_IMG,
                     mutableMapOf("pic" to downloadUrl as String),
@@ -170,7 +171,6 @@ class CosStatusController : CosStatusCallback {
                     mLongitude,
                     mLatitude
             )
-//            }
         }
         Log.d(TAG, "delete file: ${localPath!!}")
         CosCallbackMapController.unregisterCallback(localPath)
@@ -200,7 +200,6 @@ class CosStatusController : CosStatusCallback {
             longitude: Double,
             latitude: Double
     ) {
-        Log.d(TAG, "sendInformationDirectly  isCustomSend = ${entity?.isCustom}")
         Log.d(TAG, "sendInformationDirectly  poiType= $poiType ---- mainInfoId= $mainInfoId")
         //开始上传
         entity?.isCustom?.let {

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt

@@ -28,7 +28,7 @@ const val CarNet_Get_Strategy:String = "CarNet_Get_Strategy" //策略拉取成
 const val CarNet_Create_Task:String = "CarNet_Create_Task" //创建定时任务
 const val CarNet_Get_Picture:String = "CarNet_Get_Picture" //获取图片,type=1 调用, type=2 成功, type=3 失败
 const val CarNet_Get_Video:String = "CarNet_Get_Video" //获取视频,type=1 调用,type=2 成功,type=3 失败
-const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始
+const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始， type=4 成功返回视频和缩略图，type=5 成功没有返回全视频和缩略图
 const val CarNet_Servers_Upload:String = "CarNet_Servers_Upload" //上传服务端, type=1 成功,type=2 失败, type=3 开始
 const val CarNet_Voice_Search:String = "CarNet_Voice_Search" //语音搜索路况,type=1 成功,type=2 失败
 const val CarNet_USER_SHOW:String = "CarNet_user_show" //情报展示时长,showtime 加载列表时长

modules/mogo-module-apps/src/main/res/layout/module_apps_item_app.xml

@@ -20,6 +20,6 @@
         android:layout_marginTop="@dimen/module_apps_app_name_marginTop"
         android:gravity="center"
         android:maxLines="2"
-        android:textColor="#FFFFFF"
+        android:textColor="@color/module_apps_id_app_name_textColor"
         android:textSize="@dimen/module_apps_app_name_textSize" />
 </LinearLayout>

modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml

@@ -21,8 +21,8 @@
     <dimen name="module_apps_all_icon_width">94px</dimen>
     <dimen name="module_apps_all_icon_height">94px</dimen>
 
-    <dimen name="module_apps_navigator_icon_width">140px</dimen>
-    <dimen name="module_apps_navigator_icon_height">140px</dimen>
+    <dimen name="module_apps_navigator_icon_width">160px</dimen>
+    <dimen name="module_apps_navigator_icon_height">160px</dimen>
     <dimen name="module_apps_navigator_icon_divider">30px</dimen>
     <dimen name="module_apps_voice_icon_width">100px</dimen>
     <dimen name="module_apps_voice_icon_height">100px</dimen>

modules/mogo-module-apps/src/main/res/values/colors.xml

@@ -16,6 +16,7 @@
 
     <color name="bg_common">#080625</color>
     <color name="txt_blue">#3E7FFC</color>
-    <color name="module_app_page_bkg_color">#0C0C0C</color>
+    <color name="module_app_page_bkg_color">#E6000000</color>
+    <color name="module_apps_id_app_name_textColor">#FFFFFF</color>
 
 </resources>

modules/mogo-module-apps/src/main/res/values/dimens.xml

@@ -24,6 +24,6 @@
     <dimen name="module_apps_navigator_icon_width">78px</dimen>
     <dimen name="module_apps_navigator_icon_height">78px</dimen>
     <dimen name="module_apps_navigator_icon_divider">17px</dimen>
-    <dimen name="module_apps_voice_icon_width">60px</dimen>
-    <dimen name="module_apps_voice_icon_height">60px</dimen>
+    <dimen name="module_apps_voice_icon_width">55px</dimen>
+    <dimen name="module_apps_voice_icon_height">55px</dimen>
 </resources>

modules/mogo-module-common/src/main/java/com/mogo/module/common/glide/SkinAbleBitmapTarget.java

@@ -0,0 +1,84 @@
+package com.mogo.module.common.glide;
+
+import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
+import android.widget.ImageView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.load.Transformation;
+import com.bumptech.glide.load.engine.Resource;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPoolAdapter;
+import com.bumptech.glide.load.resource.bitmap.BitmapResource;
+import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.SimpleTarget;
+import com.bumptech.glide.request.transition.Transition;
+import com.mogo.commons.AbsMogoApplication;
+
+public
+/**
+ * @author congtaowang
+ * @since 2020/9/2
+ *
+ * 描述
+ */
+class SkinAbleBitmapTarget extends SimpleTarget< Bitmap > {
+
+    private ImageView mTarget;
+    private RequestOptions mOptions;
+
+    public SkinAbleBitmapTarget( ImageView mTarget, RequestOptions mOptions ) {
+        super();
+        this.mTarget = mTarget;
+        this.mOptions = mOptions;
+    }
+
+    @Override
+    public void onResourceReady( @NonNull Bitmap resource, @Nullable Transition< ? super Bitmap > transition ) {
+        try {
+            mTarget.setImageResource( 0 );
+            if(mOptions.getTransformations().containsKey(Bitmap.class)) {
+                Transformation<Bitmap> t = (Transformation<Bitmap>) mOptions.getTransformations().get(Bitmap.class);
+                BitmapResource r = BitmapResource.obtain(resource, new BitmapPoolAdapter());
+                Resource<Bitmap> r2 = t.transform(AbsMogoApplication.getApp(), r, resource.getWidth(),
+                        resource.getHeight());
+                mTarget.setImageBitmap(r2.get());
+            }else {
+                mTarget.setImageBitmap(resource);
+            }
+        } catch( Exception e ){
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onLoadCleared( @Nullable Drawable placeholder ) {
+        super.onLoadCleared( placeholder );
+        try {
+            mTarget.setImageResource( mOptions.getPlaceholderId() );
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onLoadStarted( @Nullable Drawable placeholder ) {
+        super.onLoadStarted( placeholder );
+        try {
+            mTarget.setImageResource( mOptions.getPlaceholderId() );
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
+    @Override
+    public void onLoadFailed( @Nullable Drawable errorDrawable ) {
+        super.onLoadFailed( errorDrawable );
+        try {
+            mTarget.setImageResource( mOptions.getErrorId() );
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+}

modules/mogo-module-event-panel-noop/build/generated/source/buildConfig/release/com/zhidao/mogo/module/event/panel/BuildConfig.java

@@ -1,18 +0,0 @@
-/**
- * Automatically generated file. DO NOT MODIFY
- */
-package com.zhidao.mogo.module.event.panel;
-
-public final class BuildConfig {
-  public static final boolean DEBUG = false;
-  public static final String LIBRARY_PACKAGE_NAME = "com.zhidao.mogo.module.event.panel";
-  /**
-   * @deprecated APPLICATION_ID is misleading in libraries. For the library package name use LIBRARY_PACKAGE_NAME
-   */
-  @Deprecated
-  public static final String APPLICATION_ID = "com.zhidao.mogo.module.event.panel";
-  public static final String BUILD_TYPE = "release";
-  public static final String FLAVOR = "";
-  public static final int VERSION_CODE = 1;
-  public static final String VERSION_NAME = "1.0.0-SNAPSHOT";
-}

modules/mogo-module-event-panel-noop/build/generated/source/kapt/release/com/alibaba/android/arouter/routes/ARouter$$Group$$event.java

@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.zhidao.mogo.module.event.panel.EventPanelModuleProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Group$$event implements IRouteGroup {
-  @Override
-  public void loadInto(Map<String, RouteMeta> atlas) {
-    atlas.put("/event/panel", RouteMeta.build(RouteType.PROVIDER, EventPanelModuleProvider.class, "/event/panel", "event", null, -1, -2147483648));
-  }
-}

modules/mogo-module-event-panel-noop/build/generated/source/kapt/release/com/alibaba/android/arouter/routes/ARouter$$Providers$$mogomoduleeventpanelnoop.java

@@ -1,18 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.enums.RouteType;
-import com.alibaba.android.arouter.facade.model.RouteMeta;
-import com.alibaba.android.arouter.facade.template.IProviderGroup;
-import com.zhidao.mogo.module.event.panel.EventPanelModuleProvider;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Providers$$mogomoduleeventpanelnoop implements IProviderGroup {
-  @Override
-  public void loadInto(Map<String, RouteMeta> providers) {
-    providers.put("com.mogo.service.eventpanel.IEventPanelProvider", RouteMeta.build(RouteType.PROVIDER, EventPanelModuleProvider.class, "/event/panel", "event", null, -1, -2147483648));
-  }
-}

modules/mogo-module-event-panel-noop/build/generated/source/kapt/release/com/alibaba/android/arouter/routes/ARouter$$Root$$mogomoduleeventpanelnoop.java

@@ -1,17 +0,0 @@
-package com.alibaba.android.arouter.routes;
-
-import com.alibaba.android.arouter.facade.template.IRouteGroup;
-import com.alibaba.android.arouter.facade.template.IRouteRoot;
-import java.lang.Class;
-import java.lang.Override;
-import java.lang.String;
-import java.util.Map;
-
-/**
- * DO NOT EDIT THIS FILE!!! IT WAS GENERATED BY AROUTER. */
-public class ARouter$$Root$$mogomoduleeventpanelnoop implements IRouteRoot {
-  @Override
-  public void loadInto(Map<String, Class<? extends IRouteGroup>> routes) {
-    routes.put("event", ARouter$$Group$$event.class);
-  }
-}

modules/mogo-module-event-panel-noop/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhidao.mogo.module.event.panel"
-    android:versionCode="1"
-    android:versionName="1.0.0-SNAPSHOT" >
-
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="22" />
-    /
-
-</manifest>

modules/mogo-module-event-panel-noop/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"AAPT_FRIENDLY_MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0-SNAPSHOT","enabled":true,"outputFile":"mogo-module-event-panel-noop-release.aar","fullName":"release","baseName":"release"},"path":"AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.module.event.panel","split":""}}]

modules/mogo-module-event-panel-noop/build/intermediates/annotation_processor_list/release/annotationProcessors.json

@@ -1 +0,0 @@
-{}

modules/mogo-module-event-panel-noop/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/release/jniLibs"/></dataSet></merger>

modules/mogo-module-event-panel-noop/build/intermediates/incremental/mergeReleaseShaders/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/release/shaders"/></dataSet></merger>

modules/mogo-module-event-panel-noop/build/intermediates/incremental/packageReleaseAssets/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/assets"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/build/intermediates/shader_assets/release/compileReleaseShaders/out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/release/assets"/></dataSet></merger>

modules/mogo-module-event-panel-noop/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties

@@ -1 +0,0 @@
-#Tue Aug 25 16:46:31 CST 2020

modules/mogo-module-event-panel-noop/build/intermediates/incremental/packageReleaseResources/merger.xml

@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/build/generated/res/rs/release"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/res"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/build/generated/res/rs/release"/><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/build/generated/res/resValues/release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/release/res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/release/res"/></dataSet><mergedItems/></merger>

modules/mogo-module-event-panel-noop/build/intermediates/library_manifest/release/AndroidManifest.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.zhidao.mogo.module.event.panel"
-    android:versionCode="1"
-    android:versionName="1.0.0-SNAPSHOT" >
-
-    <uses-sdk
-        android:minSdkVersion="19"
-        android:targetSdkVersion="22" />
-    /
-
-</manifest>

modules/mogo-module-event-panel-noop/build/intermediates/local_only_symbol_list/release/parseReleaseLibraryResources/R-def.txt

@@ -1,2 +0,0 @@
-R_DEF: Internal format may change without notice
-local

modules/mogo-module-event-panel-noop/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt

@@ -1,14 +0,0 @@
-1<?xml version="1.0" encoding="utf-8"?>
-2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-3    package="com.zhidao.mogo.module.event.panel"
-4    android:versionCode="1"
-5    android:versionName="1.0.0-SNAPSHOT" >
-6
-7    <uses-sdk
-8        android:minSdkVersion="19"
-8-->/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/AndroidManifest.xml
-9        android:targetSdkVersion="22" />
-9-->/Users/congtaowang/Public/AndroidStudioProjects/zhidao/yycp/MogoLauncher/modules/mogo-module-event-panel-noop/src/main/AndroidManifest.xml
-10    /
-11
-12</manifest>

modules/mogo-module-event-panel-noop/build/intermediates/merged_manifests/release/output.json

@@ -1 +0,0 @@
-[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0.0-SNAPSHOT","enabled":true,"outputFile":"mogo-module-event-panel-noop-release.aar","fullName":"release","baseName":"release"},"path":"../../library_manifest/release/AndroidManifest.xml","properties":{"packageId":"com.zhidao.mogo.module.event.panel","split":""}}]