更新无痕埋点依赖版本号

app/src/main/java/com/ydl/component/base/DemoAppLifecycles.java

@@ -85,8 +85,6 @@ public class DemoAppLifecycles implements IAppLifecycles {
                 //子线程中初始化X5内核，防止ANR问题
                 initX5();
 
-                //数据埋点初始化--一定要放在主进程中
-                YdlBuryPointUtil.init(application);
                 if (DemoGlobalConfig.appEnv.equals(YDLConstants.ENV_PROD)){
 //                    YDLavManager.Companion.getInstances().init(application, "3387e9b251f3491e9221a9877e8f7830");
                 }else {
@@ -112,6 +110,7 @@ public class DemoAppLifecycles implements IAppLifecycles {
                     initUM(umAppkey, channel,application);
                     PlatformConfig.setWeixin("wx57a9d930270498c7", "17c031f02500ded3457a80e69d8e5e45");
                 }
+
                 PlatformConfig.setQQZone("1105070461", "6BvkUnk6wXJekcgR");
                 MobclickAgent.setScenarioType(application, MobclickAgent.EScenarioType.E_DUM_NORMAL);
                 MobclickAgent.setCatchUncaughtExceptions(!BuildConfig.DEBUG);
@@ -119,6 +118,9 @@ public class DemoAppLifecycles implements IAppLifecycles {
                 //开启友盟集成测试
                 UMConfigure.setLogEnabled(BuildConfig.DEBUG);
 
+                //数据埋点初始化 (一定要放在主进程中，因为用到了umeng统计，需要放在umeng初始化后)
+                YdlBuryPointUtil.init(application);
+
                 //安全检测
                 //YDLAppProtector.init();
 

app/src/main/java/com/ydl/component/base/DemoGlobalConfig.java

@@ -20,8 +20,8 @@ import java.util.List;
 public final class DemoGlobalConfig implements IConfigModule {
     String APP_DOMAIN = "https://api.github.com/";
     //        public static String appEnv = YDLConstants.ENV_AUTO_TEST;
-//    public static String appEnv = YDLConstants.ENV_TEST;
-    public static String appEnv = YDLConstants.ENV_PROD;
+    public static String appEnv = YDLConstants.ENV_TEST;
+//    public static String appEnv = YDLConstants.ENV_PROD;
 
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {

config.gradle

@@ -247,8 +247,8 @@ ext {
             "bugly-crashreport"            : "com.tencent.bugly:crashreport:2.8.6.0",
             "bugly-nativecrashreport"      : "com.tencent.bugly:nativecrashreport:3.6.0.1",
             "ydl-image"                    : "com.ydl:ydl-image:1.0.7-SNAPSHOT@aar",
-            "ydl-pushagent"                : "com.ydl:ydl-pushagent:0.1.9",
-            "ydl-notracepoint"             : "com.ydl:notracepoint-lib:0.1.8@aar",
+            "ydl-pushagent"                : "com.ydl:pushagent:0.1.1",
+            "ydl-notracepoint"             : "com.ydl:notracepoint-lib:0.2.2@aar",
             "ydl-js"                       : "com.ydl:ydl-js:1.0.7-SNAPSHOT@aar",
             "ydl-router"                   : "com.ydl:ydl-router:1.3.7-SNAPSHOT@aar",
             "xrecyclerview"                : "com.ydl:xrecyclerview:1.0.0-SNAPSHOT@aar",

ydl-platform/build.gradle

@@ -72,9 +72,15 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
     //====================YDL Repository====================
-    api rootProject.ext.dependencies["ydl-pushagent"]
-    api rootProject.ext.dependencies["ydl-notracepoint"]
-    api rootProject.ext.dependencies["ydl-hnet"]
+//    api rootProject.ext.dependencies["ydl-pushagent"]
+//    api rootProject.ext.dependencies["ydl-hnet"]
+    api (rootProject.ext.dependencies["ydl-notracepoint"]){
+        transitive = true
+        exclude group: 'com.google.code.gson', module: 'gson'
+        exclude group: 'com.squareup.okhttp3', module: 'okhttp3'
+        exclude group: 'com.squareup.okhttp3', module: 'logging-interceptor'
+    }
+
     api(rootProject.ext.dependencies["imagepicker"]) {
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib'
         exclude group: 'org.jetbrains.kotlin', module: 'kotlin-stdlib-jdk7'

ydl-platform/src/main/java/com/ydl/ydlcommon/utils/YdlBuryPointUtil.java

@@ -2,11 +2,12 @@ package com.ydl.ydlcommon.utils;
 
 import android.content.Context;
 
+import com.umeng.analytics.MobclickAgent;
 import com.ydl.burypointlib.BuryPointHelper;
 import com.ydl.devicesidlib.DeviceIDHelper;
 import com.ydl.pushserver.pushagent.YdlPushAgent;
+import com.ydl.pushserver.pushagent.common.listener.IYDLPushListener;
 import com.ydl.pushserver.pushagent.network.pack.RegisterEventBean;
-import com.ydl.ydlcommon.BuildConfig;
 import com.ydl.ydlcommon.base.BaseApp;
 import com.ydl.ydlcommon.base.config.YDLConstants;
 import com.ydl.ydlcommon.modular.ModularServiceManager;
@@ -30,9 +31,10 @@ public class YdlBuryPointUtil {
         try {
             context = context1;
             String appEnv = BaseApp.instance.getGlobalConfig().getAppEnv();
+            boolean appDebug = BaseApp.instance.getGlobalConfig().getAppDebug();
             boolean isTest = YDLConstants.ENV_TEST.equals(appEnv);
             if (isTest){
-                YdlPushAgent.setDebugAdree("47.97.49.44",8094);
+                YdlPushAgent.setDebugAdree("121.41.92.140",8091);
             }
 
             RegisterEventBean registerEventBean = new RegisterEventBean();
@@ -52,9 +54,20 @@ public class YdlBuryPointUtil {
 
             LogUtil.d(registerEventBean.toString());
 
-            YdlPushAgent.init(registerEventBean,BuildConfig.DEBUG);
+            YdlPushAgent.init(registerEventBean,appDebug, context1, new IYDLPushListener() {
+                @Override
+                public void onPushEvent() {
+                    MobclickAgent.onEvent(context1, "socket_push_event");
+                }
 
-            BuryPointHelper.setDebug(isTest,isEditAlis,true,BuildConfig.DEBUG);
+                @Override
+                public void onPushRescueEvent() {
+                    MobclickAgent.onEvent(context1, "socket_push_rescue_event");
+                }
+            });
+
+
+            BuryPointHelper.setDebug(isTest,isEditAlis,true,appDebug);
             BuryPointHelper.init();
 
         }catch (Exception e){