友盟包冲突

app/build.gradle

@@ -64,38 +64,41 @@ android {
         }
 
         aoppo {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30070"]
-            buildConfigField 'String', 'CHANNLE', '"30070"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30074"]
+            buildConfigField 'String', 'CHANNLE', '"30074"'
         }
 
         a360 {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30050"]
-            buildConfigField 'String', 'CHANNLE', '"30050"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30071"]
+            buildConfigField 'String', 'CHANNLE', '"30071"'
         }
 
         ayingyongbao {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30016"]
-            buildConfigField 'String', 'CHANNLE', '"30016"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30070"]
+            buildConfigField 'String', 'CHANNLE', '"30070"'
         }
 
         axiaomi {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30067"]
-            buildConfigField 'String', 'CHANNLE', '"30067"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30075"]
+            buildConfigField 'String', 'CHANNLE', '"30075"'
         }
 
         ahuawei {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30066"]
-            buildConfigField 'String', 'CHANNLE', '"30066"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30076"]
+            buildConfigField 'String', 'CHANNLE', '"30076"'
         }
 
         abaidu {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30056"]
-            buildConfigField 'String', 'CHANNLE', '"30056"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30072"]
+            buildConfigField 'String', 'CHANNLE', '"30072"'
+        }
+        ameizu {
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30077"]
+            buildConfigField 'String', 'CHANNLE', '"30077"'
         }
-
         avivo {
-            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30065"]
-            buildConfigField 'String', 'CHANNLE', '"30065"'
+            manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30073"]
+            buildConfigField 'String', 'CHANNLE', '"30073"'
         }
         aqqlibray {
             manifestPlaceholders = [UMENG_CHANNEL_VALUE: "30063"]
@@ -191,7 +194,9 @@ dependencies {
     compile 'com.tbruyelle.rxpermissions2:rxpermissions:0.9.4@aar'
     compile 'com.amap.api:location:latest.integration'
     compile 'me.yokeyword:indexablerecyclerview:1.3.0'
-    compile files('libs/umeng-analytics-7.5.3.jar')
+    compile 'com.umeng.umsdk:analytics:latest.integration'
+    compile 'com.umeng.umsdk:common:latest.integration'
+    compile files('libs/umeng-share-wechat-simplify-6.9.3.jar')
 }
 def product_name = "bangnidai_v" + android.defaultConfig.versionName
 def time = "1367"

app/proguard-rules.pro

@@ -107,6 +107,19 @@
 -dontwarn org.apache.thrift.**
 
 
+复制代码到剪切板
+-dontshrink
+-dontoptimize
+-dontwarn com.google.android.maps.**
+-dontwarn android.webkit.WebView
+-dontwarn com.umeng.**
+-dontwarn com.tencent.weibo.sdk.**
+-dontwarn com.facebook.**
+-keep public class javax.**
+-keep public class android.webkit.**
+-dontwarn android.support.v4.**
+
+
 # This is a configuration file for ProGuard.
 # http://proguard.sourceforge.net/index.html#manual/usage.html
 
@@ -369,3 +382,9 @@
  -keep class org.apache.commons.**{*;}
  -keep class org.apache.http.**{*;}
 
+
+
+#友盟统计
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}

app/src/main/java/com/smileflowpig/money/moneyplatfrom/activities/CaseurlActivity.java

@@ -23,6 +23,7 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import com.google.gson.JsonObject;
+import com.smileflowpig.money.common.utils.DisplayUtil;
 import com.smileflowpig.money.moneyplatfrom.util.ToastUtil;
 import com.umeng.socialize.ShareAction;
 import com.umeng.socialize.UMShareAPI;

app/src/main/java/com/smileflowpig/money/wxapi/WXEntryActivity.java

@@ -2,7 +2,6 @@ package com.smileflowpig.money.wxapi;
 
 import android.util.Log;
 
-import com.tencent.mm.opensdk.modelbase.BaseResp;
 import com.umeng.socialize.weixin.view.WXCallbackActivity;
 
 /**
@@ -12,9 +11,4 @@ import com.umeng.socialize.weixin.view.WXCallbackActivity;
 public class WXEntryActivity extends WXCallbackActivity {
 
 
-    @Override
-    public void onResp(BaseResp resp) {
-        super.onResp(resp);
-        Log.e("resp",resp.toString());
-    }
 }

app/src/main/res/layout/activity_record.xml

@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:layout_gravity="center"
-            android:text="我的足迹"
+            android:text="浏览记录"
             android:textColor="#ffffff"
             android:textSize="@dimen/font_16"
             />

app/src/main/res/values/colors.xml

@@ -4,7 +4,7 @@
     <color name="colorPrimaryDark">#ffffff</color>
     <color name="colorAccent">#FF4081</color>
     <color name="transparent">#00ffffff</color>
-    <color name="login_yellow_color">#FFAA48</color>
+    <color name="login_yellow_color">#FFCE25</color>
 
 
 </resources>

build.gradle

@@ -4,6 +4,7 @@ buildscript {
     repositories {
         jcenter()
         maven { url 'https://maven.fabric.io/public' }
+        maven { url 'https://dl.bintray.com/umsdk/release' }
         google()
     }
     dependencies {

common/build.gradle

@@ -45,6 +45,6 @@ dependencies {
     compile project(':lang')
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
-    compile 'com.umeng.analytics:analytics:latest.integration'
+//    compile 'com.umeng.analytics:analytics:latest.integration'
     compile 'com.zhy:autolayout:1.4.5'
 }

common/src/main/java/com/smileflowpig/money/common/app/Activity.java

@@ -15,7 +15,6 @@ import android.view.WindowManager;
 import com.smileflowpig.money.common.utils.NotchUtil;
 import com.smileflowpig.money.common.widget.StatusBarUtil;
 import com.smileflowpig.money.common.widget.convention.PlaceHolderView;
-import com.umeng.analytics.MobclickAgent;
 import com.zhy.autolayout.AutoLayoutActivity;
 
 import java.util.List;
@@ -156,12 +155,10 @@ public abstract class Activity extends AutoLayoutActivity {
     @Override
     protected void onResume() {
         super.onResume();
-        MobclickAgent.onResume(this);
     }
 
     @Override
     protected void onPause() {
         super.onPause();
-        MobclickAgent.onPause(this);
     }
 }