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

# Conflicts:
#	skin/mogo-skin-light/build.gradle

.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>

foudations/mogo-commons/src/main/java/com/mogo/commons/AbsMogoApplication.java

@@ -4,6 +4,8 @@ import android.app.Application;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -17,6 +19,7 @@ import com.mogo.commons.network.ParamsUtil;
 import com.mogo.commons.network.X509TrustManagerImpl;
 import com.mogo.commons.storage.SpStorage;
 import com.mogo.utils.ThreadPoolService;
+import com.mogo.utils.TipDrawable;
 import com.mogo.utils.TipToast;
 import com.mogo.utils.network.NetConfig;
 
@@ -65,13 +68,26 @@ public class AbsMogoApplication extends Application {
             ARouter.openLog();
         }
         ARouter.init( sApp );
-        TipToast.init( this, ( ( context, message ) -> {
+        TipToast.init( this, ( ( context, message, tipDrawable ) -> {
             if ( TextUtils.isEmpty( message ) ) {
                 return null;
             }
-            View contentView = LayoutInflater.from( context ).inflate( R.layout.module_commons_layout_toast, null );
-            TextView txt = contentView.findViewById( R.id.module_commons_toast_msg );
-            txt.setText( message );
+            View contentView;
+            if(tipDrawable==null) {
+                contentView = LayoutInflater.from(context).inflate(R.layout.module_commons_layout_toast, null);
+                TextView txt = contentView.findViewById(R.id.module_commons_toast_msg);
+                txt.setText(message);
+            }else{
+                // 有图片，使用带图片的布局，当前只实现了左侧图片
+                contentView = LayoutInflater.from(context).inflate(R.layout.module_commons_layout_toast_with_left_drawable, null);
+                TextView txt = contentView.findViewById(R.id.module_commons_toast_msg);
+                ImageView img = contentView.findViewById(R.id.module_commons_toast_left_drawable);
+                img.setImageDrawable(tipDrawable.getDrawable());
+                ViewGroup.LayoutParams params = img.getLayoutParams();
+                params.width = tipDrawable.getWidth();
+                params.height = tipDrawable.getHeight();
+                txt.setText(message);
+            }
             return contentView;
         } ) );
     }

foudations/mogo-commons/src/main/res/drawable/module_commons_toast_bkg.xml

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:radius="90dp" />
     <gradient
-        android:angle="270"
-        android:endColor="#F2161616"
-        android:startColor="#F2161616" />
+        android:angle="180"
+        android:endColor="#FF3F4057"
+        android:startColor="#FF5E6079" />
 </shape>

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

@@ -1,27 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@drawable/module_commons_toast_bkg"
-    android:orientation="vertical">
+    android:paddingTop="@dimen/module_commons_toast_marginTop"
+    android:paddingBottom="@dimen/module_commons_toast_marginBottom"
+    android:paddingLeft="@dimen/module_commons_toast_marginLeft"
+    android:paddingRight="@dimen/module_commons_toast_marginRight">
 
     <TextView
         android:id="@+id/module_commons_toast_msg"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginLeft="@dimen/module_commons_toast_marginLeft"
-        android:layout_marginTop="@dimen/module_commons_toast_marginTop"
-        android:layout_marginRight="@dimen/module_commons_toast_marginRight"
-        android:layout_marginBottom="@dimen/module_commons_toast_marginBottom"
         android:ellipsize="end"
         android:gravity="center"
+        android:drawablePadding="@dimen/module_commons_toast_space_between_icon_and_msg"
         android:maxWidth="@dimen/module_commons_toast_maxWidth"
         android:maxLength="20"
         android:maxLines="1"
-        android:minWidth="@dimen/module_commons_toast_minWidth"
         android:textColor="#FFFF"
         android:textSize="@dimen/module_commons_toast_textSize"
-        tools:text="测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试测试" />
-</LinearLayout>
+        tools:text="测试测试测试" />
+
+<!--    android:minWidth="@dimen/module_commons_toast_minWidth"-->
+</FrameLayout>

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

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:background="@drawable/module_commons_toast_bkg"
+    android:orientation="horizontal"
+    android:paddingLeft="@dimen/module_commons_toast_with_left_drawable_marginLeft"
+    android:paddingTop="@dimen/module_commons_toast_with_left_drawable_marginTop"
+    android:paddingRight="@dimen/module_commons_toast_marginRight"
+    android:paddingBottom="@dimen/module_commons_toast_with_left_drawable_marginBottom">
+
+    <ImageView
+        android:id="@+id/module_commons_toast_left_drawable"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center" />
+
+    <Space
+        android:layout_width="@dimen/module_commons_toast_space_between_icon_and_msg"
+        android:layout_height="wrap_content" />
+
+    <TextView
+        android:id="@+id/module_commons_toast_msg"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:drawablePadding="@dimen/module_commons_toast_space_between_icon_and_msg"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxWidth="@dimen/module_commons_toast_maxWidth"
+        android:maxLength="20"
+        android:maxLines="1"
+        android:textColor="#FFFF"
+        android:textSize="@dimen/module_commons_toast_textSize"
+        tools:text="测试测试测试" />
+
+    <!--    android:minWidth="@dimen/module_commons_toast_minWidth"-->
+</LinearLayout>

foudations/mogo-commons/src/main/res/values-xhdpi/dimens.xml

@@ -1,13 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_commons_toast_marginLeft">50px</dimen>
-    <dimen name="module_commons_toast_marginRight">50px</dimen>
+    <dimen name="module_commons_toast_marginLeft">63px</dimen>
+    <dimen name="module_commons_toast_with_left_drawable_marginLeft">30px</dimen>
+    <dimen name="module_commons_toast_marginRight">63px</dimen>
     <dimen name="module_commons_toast_marginTop">32px</dimen>
     <dimen name="module_commons_toast_marginBottom">32px</dimen>
+    <dimen name="module_commons_toast_with_left_drawable_marginTop">19px</dimen>
+    <dimen name="module_commons_toast_with_left_drawable_marginBottom">19px</dimen>
     <dimen name="module_commons_toast_textSize">40px</dimen>
     <dimen name="module_commons_toast_minWidth">698px</dimen>
     <dimen name="module_commons_toast_maxWidth">900px</dimen>
     <dimen name="module_commons_toast_y_offset">130px</dimen>
+    <dimen name="module_commons_toast_icon_width">94px</dimen>
+    <dimen name="module_commons_toast_space_between_icon_and_msg">21px</dimen>
 </resources>
 
 

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

@@ -1,11 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="module_commons_toast_marginLeft">30px</dimen>
-    <dimen name="module_commons_toast_marginRight">30px</dimen>
+    <dimen name="module_commons_toast_marginLeft">33px</dimen>
+    <dimen name="module_commons_toast_with_left_drawable_marginLeft">17px</dimen>
+    <dimen name="module_commons_toast_marginRight">33px</dimen>
     <dimen name="module_commons_toast_marginTop">16px</dimen>
     <dimen name="module_commons_toast_marginBottom">16px</dimen>
+    <dimen name="module_commons_toast_with_left_drawable_marginTop">10px</dimen>
+    <dimen name="module_commons_toast_with_left_drawable_marginBottom">10px</dimen>
     <dimen name="module_commons_toast_textSize">22px</dimen>
     <dimen name="module_commons_toast_minWidth">371px</dimen>
     <dimen name="module_commons_toast_maxWidth">500px</dimen>
     <dimen name="module_commons_toast_y_offset">72px</dimen>
+    <dimen name="module_commons_toast_icon_width">50px</dimen>
+    <dimen name="module_commons_toast_space_between_icon_and_msg">10px</dimen>
 </resources>

foudations/mogo-utils/src/main/java/com/mogo/utils/TipDrawable.java

@@ -0,0 +1,77 @@
+package com.mogo.utils;
+
+import android.graphics.drawable.Drawable;
+
+/**
+ * TipToast弹出框的图片资源封装类
+ * 当前只支持添加一张图片，可添加到文字的 左{@link #TIP_DRAWABLE_GRAVITY_LEFT}, 上{@link #TIP_DRAWABLE_GRAVITY_TOP}, 右{@link #TIP_DRAWABLE_GRAVITY_RIGHT}, 下{@link #TIP_DRAWABLE_GRAVITY_BOTTOM}
+ *
+ * 当前仅支持添加左侧图片，所以{@link #gravity} 这个参数形同虚设
+ *
+ * @author tongchenfei
+ */
+public class TipDrawable {
+    public static final int TIP_DRAWABLE_GRAVITY_LEFT = 1;
+    public static final int TIP_DRAWABLE_GRAVITY_TOP = 2;
+    public static final int TIP_DRAWABLE_GRAVITY_RIGHT = 3;
+    public static final int TIP_DRAWABLE_GRAVITY_BOTTOM = 4;
+    private Drawable drawable;
+    private int gravity;
+    private int width;
+    private int height;
+
+    /**
+     * 默认图片居左，宽高使用{@link Drawable#getIntrinsicWidth()}和{@link Drawable#getIntrinsicHeight()}
+     * @param drawable 要展示的图片
+     */
+    public TipDrawable(Drawable drawable) {
+        this(drawable, TIP_DRAWABLE_GRAVITY_LEFT,drawable.getIntrinsicWidth(),drawable.getIntrinsicHeight());
+    }
+
+    /**
+     * 默认图片居左
+     * @param drawable 要展示的图片
+     * @param width 要展示的图片宽度
+     * @param height 要展示的图片高度
+     */
+    public TipDrawable(Drawable drawable, int width, int height) {
+        this(drawable, TIP_DRAWABLE_GRAVITY_LEFT,width,height);
+    }
+
+    /**
+     * 默认宽高使用{@link Drawable#getIntrinsicWidth()}和{@link Drawable#getIntrinsicHeight()}
+     * @param drawable 要展示的图片
+     * @param gravity 左{@link #TIP_DRAWABLE_GRAVITY_LEFT}, 上{@link #TIP_DRAWABLE_GRAVITY_TOP}, 右{@link #TIP_DRAWABLE_GRAVITY_RIGHT}, 下{@link #TIP_DRAWABLE_GRAVITY_BOTTOM}
+     */
+    public TipDrawable(Drawable drawable, int gravity) {
+        this(drawable, gravity,drawable.getIntrinsicWidth(),drawable.getIntrinsicHeight());
+    }
+
+    /**
+     * 可自定义展示位置
+     * @param drawable 要展示的图片
+     * @param gravity 左{@link #TIP_DRAWABLE_GRAVITY_LEFT}, 上{@link #TIP_DRAWABLE_GRAVITY_TOP}, 右{@link #TIP_DRAWABLE_GRAVITY_RIGHT}, 下{@link #TIP_DRAWABLE_GRAVITY_BOTTOM}
+     */
+    public TipDrawable(Drawable drawable, int gravity, int width, int height) {
+        this.drawable = drawable;
+        this.gravity = gravity;
+        this.width = width;
+        this.height = height;
+    }
+
+    public Drawable getDrawable() {
+        return drawable;
+    }
+
+    public int getGravity() {
+        return gravity;
+    }
+
+    public int getWidth() {
+        return width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+}

foudations/mogo-utils/src/main/java/com/mogo/utils/TipToast.java

@@ -4,6 +4,10 @@ package com.mogo.utils;
  * 2016/1/1 by congtaowang
  *
  * @Version 1.0
+ *
+ * 增加了图片支持
+ *
+ * @Version 1.1
  */
 
 import android.content.Context;
@@ -45,17 +49,17 @@ public final class TipToast {
         sGenerator = null;
     }
 
-    private static void tip( final String message, int duration ) {
+    private static void tip( final String message, int duration ,TipDrawable tipDrawable) {
         if ( !checkParams() ) {
             return;
         }
         if ( TextUtils.isEmpty( message ) ) {
             return;
         }
-        new ToastThread( new StringToastRunnable( sContext, message, duration ) ).start();
+        new ToastThread(new StringToastRunnable(sContext, message, duration, tipDrawable)).start();
     }
 
-    private static void tip( final int msgId, int duration ) {
+    private static void tip( final int msgId, int duration,TipDrawable tipDrawable ) {
         if ( !checkParams() ) {
             return;
         }
@@ -66,7 +70,7 @@ public final class TipToast {
         } catch ( Exception e ) {
             return;
         }
-        tip( ResourcesHelper.getString( sContext, msgId ), duration );
+        tip( ResourcesHelper.getString( sContext, msgId ), duration ,tipDrawable);
     }
 
     private static boolean checkParams() {
@@ -82,27 +86,53 @@ public final class TipToast {
     }
 
     public static void tip( final String message ) {
-        tip( message, Toast.LENGTH_SHORT );
+        tip( message, Toast.LENGTH_SHORT,null );
     }
 
     public static void tip( final int msgId ) {
-        tip( msgId, Toast.LENGTH_SHORT );
+        tip( msgId, Toast.LENGTH_SHORT ,null);
     }
 
     public static void longTip( String message ) {
-        tip( message, Toast.LENGTH_LONG );
+        tip( message, Toast.LENGTH_LONG ,null);
     }
 
     public static void longTip( int msgId ) {
-        tip( msgId, Toast.LENGTH_LONG );
+        tip( msgId, Toast.LENGTH_LONG ,null);
     }
 
     public static void shortTip( String message ) {
-        tip( message, Toast.LENGTH_SHORT );
+        tip( message, Toast.LENGTH_SHORT ,null);
     }
 
     public static void shortTip( int msgId ) {
-        tip( msgId, Toast.LENGTH_SHORT );
+        tip( msgId, Toast.LENGTH_SHORT ,null);
+    }
+
+    // -===带图片的方法===-
+
+    public static void tip( final String message,TipDrawable tipDrawable ) {
+        tip( message, Toast.LENGTH_SHORT,tipDrawable );
+    }
+
+    public static void tip( final int msgId,TipDrawable tipDrawable ) {
+        tip( msgId, Toast.LENGTH_SHORT ,tipDrawable);
+    }
+
+    public static void longTip( String message,TipDrawable tipDrawable ) {
+        tip( message, Toast.LENGTH_LONG ,tipDrawable);
+    }
+
+    public static void longTip( int msgId ,TipDrawable tipDrawable) {
+        tip( msgId, Toast.LENGTH_LONG ,tipDrawable);
+    }
+
+    public static void shortTip( String message,TipDrawable tipDrawable ) {
+        tip( message, Toast.LENGTH_SHORT ,tipDrawable);
+    }
+
+    public static void shortTip( int msgId,TipDrawable tipDrawable ) {
+        tip( msgId, Toast.LENGTH_SHORT ,tipDrawable);
     }
 
     static class ToastThread extends Thread {
@@ -117,11 +147,13 @@ public final class TipToast {
         Context context;
         String msg;
         int duration;
+        TipDrawable tipDrawable;
 
-        public StringToastRunnable( Context context, String msg, int duration ) {
+        public StringToastRunnable( Context context, String msg, int duration,TipDrawable tipDrawable ) {
             this.context = context;
             this.msg = msg;
             this.duration = duration;
+            this.tipDrawable = tipDrawable;
         }
 
         @Override
@@ -131,44 +163,40 @@ public final class TipToast {
                 return;
             }
 
-            sHandler.post( new Runnable() {
+            sHandler.post(() -> {
+                synchronized ( sSyncObject ) {
 
-                @Override
-                public void run() {
-                    synchronized ( sSyncObject ) {
+                    if ( context == null ) {
+                        return;
+                    }
 
-                        if ( context == null ) {
-                            return;
-                        }
+                    if ( sToast != null ) {
+                        sToast.cancel();
+                    }
 
-                        if ( sToast != null ) {
-                            sToast.cancel();
-                        }
-
-                        if ( sGenerator == null ) {
-                            sToast = Toast.makeText( context, msg, duration );
+                    if ( sGenerator == null ) {
+                        sToast = Toast.makeText( context, msg, duration );
+                    } else {
+                        sToast = new Toast( context );
+                        final View view = sGenerator.make( context, msg, tipDrawable );
+                        if ( view != null ) {
+                            sToast.setView( view );
+                            sToast.setGravity( sGenerator.gravity(), sGenerator.xOffset(), sGenerator.yOffset() );
+                            sToast.setDuration( duration );
                         } else {
-                            sToast = new Toast( context );
-                            final View view = sGenerator.make( context, msg );
-                            if ( view != null ) {
-                                sToast.setView( view );
-                                sToast.setGravity( sGenerator.gravity(), sGenerator.xOffset(), sGenerator.yOffset() );
-                                sToast.setDuration( duration );
-                            } else {
-                                sToast = Toast.makeText( context, msg, duration );
-                            }
-                        }
-                        if ( sToast != null ) {
-                            sToast.show();
+                            sToast = Toast.makeText( context, msg, duration );
                         }
                     }
+                    if ( sToast != null ) {
+                        sToast.show();
+                    }
                 }
-            } );
+            });
         }
     }
 
     public interface ToastViewGenerator {
-        View make( Context context, String message );
+        View make( Context context, String message,TipDrawable tipDrawable );
 
         default int gravity() {
             return Gravity.CENTER;
@@ -182,5 +210,4 @@ public final class TipToast {
             return 0;
         }
     }
-
 }

gradle.properties

@@ -65,7 +65,7 @@ MOGO_BASE_SERVICES_SDK_VERSION = 1.2.1.22
 # 探路
 MOGO_MODULE_TANLU_VERSION=1.3.1.24
 # 车聊聊
-CARCHATTING_VERSION=1.5.1
+CARCHATTING_VERSION=1.5.3
 # 车聊聊接口
 CARCHATTINGPROVIDER_VERSION=1.3.4
 # 视频引导

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":""}}]