Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into developer

WeiChat/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'com.getkeepsafe.dexcount'
 android {
     signingConfigs {
         config {
-            storeFile file('D:/config/applicationsignname[20150409]')
+            storeFile file('C:/Users/Arison/Desktop/applicationsignname[20150409]')
             storePassword '13237658359'
             keyAlias 'jie-20150409'
             keyPassword '13237658359'
@@ -94,5 +94,4 @@ dependencies {
     compile 'me.gujun.android.taggroup:library:1.4@aar'
     compile 'com.umeng.analytics:analytics:latest.integration'
     compile 'com.android.support:multidex:1.0.1'
-  
 }

WeiChat/src/main/java/com/xzjmyk/pm/activity/view/crouton/Crouton.java

@@ -211,6 +211,25 @@ public final class Crouton {
         return new Crouton(activity, text, style, viewGroup);
     }
 
+
+    /**
+     * 自定义设置背景色，延时时间
+     * @param activity
+     * @param text
+     * @param color
+     * @param time
+     * @return
+     */
+    public static Crouton makeText(Activity activity,int height, CharSequence text, int color, int time){
+        Style customColor = new Style.Builder().setBackgroundColorValue(color)
+                .setHeight(
+                        (int)TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                                height,
+                                activity.getResources().getDisplayMetrics())
+                ).build();
+        Configuration customConfiguration = new Configuration.Builder().setDuration(time).build();
+        return new Crouton(activity, text, customColor).setConfiguration(customConfiguration);
+    }
     /**
      * 自定义设置背景色，延时时间
      *