集成友盟统计

CommonLib/Common/src/main/java/com/yidian/common/AppConfig.kt

@@ -9,7 +9,7 @@ class AppConfig {
 
 
         const val appid = "merchant-b"
-        const val cv = BuildConfig.VERSION_NAME
+        const val cv = "1.0.0"
         const val version = "000100"
         const val distribution = "official"
         const val platform = "1"
@@ -23,15 +23,15 @@ class AppConfig {
         const val SinaAppKey = "4157874278"
         const val SinaAppSecret = "85c422bc0a1e0553e6a6a075701422a7"
         const val SinaCallBackUrl = "https://api.weibo.com/oauth2/default.html"
-        const val FileProvider = "com.yidian.subway.provider"
+        const val FileProvider = "com.shenghuoquan.business.provider"
 
         const val privacyPolicyStatement = "http://www.yidianzixun.com/landing_privacy?yidian_fs=2"
         const val userProtocol = "http://www.yidianzixun.com/landing_agreement?yidian_fs=2"
 
-        const val UMAppKey = "60acaec453b67264990ecdc2"//umeng统计key注释
+        const val UMAppKey = "60c8479fe044530ff0a49936"//umeng统计key注释
         const val UMChannel = "ANDROID_CHANNEL"
         const val UMType = "metro"
-        const val UMSecret = "8bb06c17a90d727c26bdd95b0e27a436"
+        const val UMSecret = "e78446e86d153e2891ae7523e1532f13"
         const val PUSH_XIAOMI_SUPPORT_MASK = 0x40000000
         const val PUSH_UMENG_SUPPORT_MASK = 0x20000000
         const val PUSH_GETUI_SUPPORT_MASK = 0x10000000

CommonLib/Common/src/main/java/com/yidian/common/utils/UMConfigUtils.kt

@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
 import com.orhanobut.hawk.Hawk
+import com.umeng.analytics.MobclickAgent
 import com.umeng.commonsdk.UMConfigure
 import com.umeng.message.IUmengRegisterCallback
 import com.umeng.message.PushAgent
@@ -24,69 +25,73 @@ import com.yidian.xpage.XPageManager
 class UMConfigUtils {
   companion object {
     fun init(context: Context) {
-//            when (BuildConfig.DEBUG) {
-//                false -> {
       //release环境上报错误信息，参数有：上下文、APPkey、渠道号、设备类型、推送密钥
       UMConfigure.init(context, AppConfig.UMAppKey, AppConfig.UMChannel, UMConfigure.DEVICE_TYPE_PHONE, AppConfig.UMSecret)
-            PlatformConfig.setWeixin(AppConfig.WeChatAppKey, AppConfig.WeChatAppSecret)
-            PlatformConfig.setWXFileProvider(AppConfig.FileProvider)
-            PlatformConfig.setQQZone(AppConfig.QQAppKey, AppConfig.QQAppSecret)
-            PlatformConfig.setQQFileProvider(AppConfig.FileProvider)
-            PlatformConfig.setSinaWeibo(AppConfig.SinaAppKey, AppConfig.SinaAppSecret, AppConfig.SinaCallBackUrl)
-            val mPushAgent = PushAgent.getInstance(context)
-            mPushAgent.register(object : IUmengRegisterCallback {
-                override fun onSuccess(deviceToken: String) {
-                    //注册成功会返回deviceToken deviceToken是推送消息的唯一标志
-                    Log.i("umpush", "注册成功：deviceToken：-------->  $deviceToken")
-                    Hawk.put(HawkConfig.UmToken, deviceToken)
-                    addAlias()
-                }
-
-                private fun addAlias() {
-                    val token = ToolsUtil.getYDEncryptionToken()
-                    mPushAgent.addAlias(token, AppConfig.UMType) { isSuccess, message ->
-                        Log.d("song_test", "addAlias 绑定成功与否 = $isSuccess  message = $message")
-                    }
-                }
-
-                override fun onFailure(s: String, s1: String) {
-                    Log.e("umpush", "注册失败：-------->  s:$s,s1:$s1")
-                }
-            })
-
-            val messageHandler = object : UmengMessageHandler() {
-                override fun dealWithCustomMessage(p0: Context?, p1: UMessage?) {
-                    super.dealWithCustomMessage(p0, p1)
-                    Log.e("umpush", "dealWithCustomMessage接收自定义消息：-------->  ${p1!!.custom}")
-                }
-            }
-
-            val notificationClickHandler: UmengNotificationClickHandler = object : UmengNotificationClickHandler() {
-                override fun dealWithCustomAction(context: Context, msg: UMessage) {
-                    super.dealWithCustomAction(context, msg)
-                    Toast.makeText(context, msg.custom, Toast.LENGTH_LONG).show()
-                    Log.e("umpush", "dealWithCustomAction接收消息：-------->  ${msg.custom}")
-                }
-
-                override fun launchApp(p0: Context?, p1: UMessage?) {
-                    super.launchApp(p0, p1)
-                    goToJump(p1)
-                }
-
-                override fun openUrl(p0: Context?, p1: UMessage?) {
-                    super.openUrl(p0, p1)
-                    Log.e("umpush", "openUrl接收自定义消息：-------->  ${p1!!.custom}")
-                }
-
-                override fun openActivity(p0: Context?, p1: UMessage?) {
-                    super.openActivity(p0, p1)
-                    Log.e("umpush", "openActivity接收自定义消息：-------->  ${p1!!.custom}")
-                }
-
+//
+//      // 推送设置
+//      PlatformConfig.setWeixin(AppConfig.WeChatAppKey, AppConfig.WeChatAppSecret)
+//      PlatformConfig.setWXFileProvider(AppConfig.FileProvider)
+//      PlatformConfig.setQQZone(AppConfig.QQAppKey, AppConfig.QQAppSecret)
+//      PlatformConfig.setQQFileProvider(AppConfig.FileProvider)
+//      PlatformConfig.setSinaWeibo(AppConfig.SinaAppKey, AppConfig.SinaAppSecret, AppConfig.SinaCallBackUrl)
+//      val mPushAgent = PushAgent.getInstance(context)
+//      mPushAgent.register(object : IUmengRegisterCallback {
+//        override fun onSuccess(deviceToken: String) {
+//          //注册成功会返回deviceToken deviceToken是推送消息的唯一标志
+//          Log.i("umpush", "注册成功：deviceToken：-------->  $deviceToken")
+//          Hawk.put(HawkConfig.UmToken, deviceToken)
+//          addAlias()
+//        }
+//
+//        private fun addAlias() {
+//          val token = ToolsUtil.getYDEncryptionToken()
+//          mPushAgent.addAlias(token, AppConfig.UMType) { isSuccess, message ->
+//            Log.d("song_test", "addAlias 绑定成功与否 = $isSuccess  message = $message")
+//          }
+//        }
+//
+//        override fun onFailure(s: String, s1: String) {
+//          Log.e("umpush", "注册失败：-------->  s:$s,s1:$s1")
+//        }
+//      })
+//
+//      // 接收自定义消息
+//      val messageHandler = object : UmengMessageHandler() {
+//        override fun dealWithCustomMessage(p0: Context?, p1: UMessage?) {
+//          super.dealWithCustomMessage(p0, p1)
+//          Log.e("umpush", "dealWithCustomMessage接收自定义消息：-------->  ${p1!!.custom}")
+//        }
+//      }
+//
+//      val notificationClickHandler: UmengNotificationClickHandler = object : UmengNotificationClickHandler() {
+//        override fun dealWithCustomAction(context: Context, msg: UMessage) {
+//          super.dealWithCustomAction(context, msg)
+//          Toast.makeText(context, msg.custom, Toast.LENGTH_LONG).show()
+//          Log.e("umpush", "dealWithCustomAction接收消息：-------->  ${msg.custom}")
+//        }
+//
+//        override fun launchApp(p0: Context?, p1: UMessage?) {
+//          super.launchApp(p0, p1)
+//          goToJump(p1)
+//        }
+//
+//        override fun openUrl(p0: Context?, p1: UMessage?) {
+//          super.openUrl(p0, p1)
+//          Log.e("umpush", "openUrl接收自定义消息：-------->  ${p1!!.custom}")
+//        }
+//
+//        override fun openActivity(p0: Context?, p1: UMessage?) {
+//          super.openActivity(p0, p1)
+//          Log.e("umpush", "openActivity接收自定义消息：-------->  ${p1!!.custom}")
+//        }
+//
+//
+//      }
+//      mPushAgent.notificationClickHandler = notificationClickHandler
+//      mPushAgent.messageHandler = messageHandler
 
-            }
-            mPushAgent.notificationClickHandler = notificationClickHandler
-            mPushAgent.messageHandler = messageHandler
+      //选择AUTO页面采集模式，统计SDK基础指标无需手动埋点可自动采集。建议在宿主App的Application.onCreate函数中调用此函数。
+      MobclickAgent.setPageCollectionMode(MobclickAgent.PageMode.AUTO);
     }
 
     private fun goToJump(p1: UMessage?) {

Components/newscontent/src/main/res/drawable/svg_baseline_add_24.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/black"
-      android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>

Components/newscontent/src/main/res/layout/activity_my_staff.xml

@@ -110,7 +110,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="30dp"
-            android:drawableStart="@drawable/svg_baseline_add_24"
+            android:drawableStart="@drawable/icon_black_add"
             android:text="添加"
             android:textColor="@color/black_333333"
             android:textSize="16sp" />

app/proguard-rules.pro

@@ -91,16 +91,19 @@ public static final int *;
     @android.webkit.JavascriptInterface <methods>;
 }
 
--keep class com.umeng.** {*;}
+# 友盟混淆统计
+-keep class com.umeng.** { *; }
 
--keep class com.uc.** {*;}
+-keep class com.uc.** { *; }
 
--keepclassmembers class * {
-   public <init> (org.json.JSONObject);
+-keep class com.efs.** { *; }
+
+-keepclassmembers class*{
+     public<init>(org.json.JSONObject);
 }
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
+-keepclassmembers enum*{
+      publicstatic**[] values();
+      publicstatic** valueOf(java.lang.String);
 }
 
 #umeng

app/src/main/AndroidManifest.xml

@@ -229,7 +229,7 @@
 
         <provider
             android:name="com.umeng.message.provider.MessageProvider"
-            android:authorities="com.yidian.subway.umeng.message"
+            android:authorities="com.shenghuoquan.business.umeng.message"
             android:exported="false">
             <grant-uri-permission android:pathPattern=".*" />
         </provider>

config/config.gradle

@@ -27,25 +27,35 @@ ext.dependencies = [
                 'com.yidian.pmcomponents:appupdate:0.0.7',
                 'com.yidian.xpage:xpagenative:0.0.1',
 
+                // 友盟基础组件(必选)
                 'com.umeng.umsdk:common:9.3.8',
                 'com.umeng.umsdk:asms:1.2.2',
-                'com.umeng.umsdk:crash:0.0.4',
-
+                // 友盟apm
+                'com.umeng.umsdk:apm:1.2.0',
+                // 友盟分享SDK核心库（使用U-Share必选）
                 'com.umeng.umsdk:share-core:7.1.4',
+                // 友盟分享面板核心库（使用U-Share必选）
                 'com.umeng.umsdk:share-board:7.1.4',
+                // 友盟分享模块
                 'com.umeng.umsdk:share-qq:7.1.4',
                 'com.umeng.umsdk:share-wx:7.1.4',
                 'com.tencent.mm.opensdk:wechat-sdk-android-without-mta:6.6.5',
                 'com.umeng.umsdk:share-sina:7.1.4',
-
+                // PushSDK核心库
                 'com.umeng.umsdk:push:6.3.3',
+                // PushSDK必须依赖utdid库，所以需要加入对应依赖
                 'com.umeng.umsdk:utdid:1.5.2.1',
+                // httpdns支持库，必须添加
                 'com.umeng.umsdk:alicloud-httpdns:1.3.2.3',
                 'com.umeng.umsdk:alicloud-utils:2.0.0',
                 'com.umeng.umsdk:alicloud_beacon:1.0.5',
+                // 消息推送核心库，必须添加
                 'com.umeng.umsdk:agoo-accs:3.4.2.7',
+                // 消息推送网络核心库，必须添加
                 'com.umeng.umsdk:agoo_networksdk:3.5.8',
+                // 消息推送日志核心库，必须添加
                 'com.umeng.umsdk:agoo_tlog:3.0.0.17',
+                // 消息推送网络核心库，必须添加
                 'com.umeng.umsdk:agoo_tnet4android:3.1.14.10',
 
                 'cn.jiguang.sdk:jverification:2.6.4',