Merge branch 'dev' of ssh://gitlab.yidianling.com:2224/app_android_lib/YDL-Component into dev

config.gradle

@@ -172,7 +172,7 @@ ext {
 
             //Modular Api
             "ydl-user-router"              : 'com.ydl:router:1.0.0-SNAPSHOT@aar',
-            "ydl-platform"                 : 'com.ydl:ydl-platform:0.0.12@aar',
+            "ydl-platform"                 : 'com.ydl:ydl-platform:0.0.11@aar',
             "ydl-m-user-api"               : 'com.ydl:m-user-api:0.0.5',
             "ydl-webview"                  : 'com.ydl:ydl-webview:0.0.14@aar',
             "ydl-m-muse-api"               : 'com.ydl:m-muse-api:0.0.1@aar',

m-consultant/modular.gradle

@@ -8,14 +8,14 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-consultant-module-xlzx"
                 // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = "0.0.13"
+                version = "0.0.12"
             }
 
             ydl{
                 groupId = "com.ydl"
                 artifactId = "m-consultant-module-ydl"
                 // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = "0.0.13"
+                version = "0.0.12"
             }
         }
 

m-tests/src/main/java/com/yidianling/tests/list/view/TestCategoryListActivity.kt

@@ -14,7 +14,7 @@ import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.utils.BuryPointUtils
 import com.ydl.ydlcommon.utils.DisplayUtils
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.log.LogHelper
 import com.ydl.ydlcommon.utils.remind.HttpErrorUtils
 import com.yidianling.common.tools.LogUtil

m-tests/src/main/java/com/yidianling/tests/list/view/TestListFragment.kt

@@ -20,7 +20,7 @@ import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.router.YdlCommonRouterManager
 import com.ydl.ydlcommon.utils.BuryPointUtils
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.view.listener.EndlessRecyclerViewScrollListener
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.router.RouterManager

m-user/modular.gradle

@@ -8,14 +8,14 @@ modular {
                 groupId = "com.ydl"
                 artifactId = "m-user-module-xlzx"
                 // 上报的 心理咨询 业务模块 aar 包的版本号
-                version = "0.0.21"
+                version = "0.0.20"
             }
 
             ydl{
                 groupId = "com.ydl"
                 artifactId = "m-user-module-ydl"
                 // 上报的 壹点灵 业务模块 aar 包的版本号
-                version = "0.0.21"
+                version = "0.0.20"
             }
         }
 

m-user/src/main/java/com/yidianling/user/ui/LoginActivity.java

@@ -8,7 +8,7 @@ import android.view.View;
 import com.ydl.ydlcommon.base.BaseMvpActivity;
 import com.ydl.ydlcommon.data.http.EncryptUtils;
 import com.ydl.ydlcommon.utils.ActivityManager;
-
+import com.ydl.ydlcommon.utils.UMEventUtils;
 import com.ydl.ydlcommon.utils.log.LogHelper;
 import com.ydl.ydlcommon.utils.remind.ToastHelper;
 import com.ydl.ydlcommon.view.DeleteEditTextView;

m-user/src/main/java/com/yidianling/user/ui/login/InputPassWordActivity.kt

@@ -11,7 +11,7 @@ import android.view.animation.AnimationUtils
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.view.dialog.CommonDialog
 import com.yidianling.common.tools.RxKeyboardTool

m-user/src/main/java/com/yidianling/user/ui/login/RegisterAndLoginActivity.kt

@@ -28,7 +28,7 @@ import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.actionutil.BIConstants

m-user/src/main/java/com/yidianling/user/ui/login/VerificationCodeActivity.kt

@@ -10,7 +10,7 @@ import android.view.View
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.actionutil.BIConstants

m-user/src/main/java/com/yidianling/user/ui/login/presenter/InputPassWordPresenterImpl.kt

@@ -5,7 +5,7 @@ import android.text.TextUtils
 import com.ydl.ydlcommon.mvp.base.BasePresenter
 import com.ydl.ydlcommon.router.YdlCommonOut
 import com.ydl.ydlcommon.utils.StringUtils
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.log.LogHelper

m-user/src/main/java/com/yidianling/user/ui/login/presenter/LoginPresenterImpl.kt

@@ -6,7 +6,7 @@ import android.text.TextUtils
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.mvp.base.BasePresenter
 import com.ydl.ydlcommon.router.YdlCommonOut
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.log.LogHelper

m-user/src/main/java/com/yidianling/user/ui/login/presenter/VerificationCodePresenterImpl.kt

@@ -2,7 +2,7 @@ package com.yidianling.user.ui.login.presenter
 
 import android.text.TextUtils
 import com.ydl.ydlcommon.mvp.base.BasePresenter
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.log.LogHelper

m-user/src/main/java/com/yidianling/user/widget/PhoneCode.java

@@ -16,7 +16,7 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.yidianling.user.R;
-
+import com.ydl.ydlcommon.utils.UMEventUtils;
 
 import java.util.ArrayList;
 import java.util.List;

ydl-platform/gradle.properties

 IS_PUBLISH=true
-VERSION_NAME=0.0.12
+VERSION_NAME=0.0.11
\ No newline at end of file

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

+package com.ydl.ydlcommon.utils;
+
+import android.content.Context;
+
+import com.ydl.ydl_router.provider.YDLRouterBurryPointProvider;
+
+/**
+ * Created by Wi1ls on 2016/11/11;
+ */
+//@Route(path = "/burry/point")
+public class UMEventUtils implements YDLRouterBurryPointProvider{
+
+    @Override
+    public void init(Context context) {
+
+    }
+
+    @Override
+    public void burryPoint(String s, String s1) {
+
+    }
+}

ydl-webview/src/main/java/com/ydl/webview/SafeTipView.kt

@@ -10,7 +10,7 @@ import android.view.View
 import android.widget.LinearLayout
 import com.daimajia.androidanimations.library.Techniques
 import com.daimajia.androidanimations.library.YoYo
-
+import com.ydl.ydlcommon.utils.UMEventUtils
 import kotlinx.android.synthetic.main.web_ui_private_safe_hint.view.*