Merge remote-tracking branch 'origin/4.1.67' into 4.1.67

config.gradle

@@ -8,8 +8,8 @@ ext {
             "m-confide"       : "0.0.48.92",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.61.04",
-            "m-home"          : "0.0.22.54",
+            "m-user"          : "0.0.61.08",
+            "m-home"          : "0.0.22.53",
             "m-im"            : "0.0.18.35",
             "m-dynamic"       : "0.0.7.19",
             "m-article"       : "0.0.0.6",

m-user/src/main/java/com/yidianling/user/constants/UserBIConstants.kt

@@ -30,6 +30,7 @@ class UserBIConstants {
         const val POSITION_PHONE_REGISTER_CLICK = "phone_register_click" //手机号密码第一次登录
         const val POSITION_ALIYUN_REGISTER_CLICK = "aliyun_register_click" //阿里云第一次一键登录
         const val POSITION_CODE_REGISTER_CLICK = "code_register_click" //短信第一次登录
+        const val POSITION_FIRST_LOAD_AND_OPEN_CLICK = "activation_click" //第一次安装并且第一打开
         //随便逛逛点击
         const val POSITION_LOOK_AROUND_CLICK = "look_around_click"
         //登录主页浏览事件（包含随便逛逛）

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

@@ -11,6 +11,7 @@ import android.text.method.HideReturnsTransformationMethod
 import android.text.method.PasswordTransformationMethod
 import android.view.View
 import android.view.animation.AnimationUtils
+import com.fm.openinstall.OpenInstall
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
@@ -150,6 +151,14 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
             UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
             25
         )
+        ActionCountUtils.baiduCount(
+            UserBIConstants.APP_REGISTER_PAGE,
+            UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
+            25,
+            OneKeyLoginHelp.openInstallKey
+        )
+        // 用户注册成功后调用
+        OpenInstall.reportRegister();
     }
 
 

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

@@ -3,6 +3,7 @@ package com.yidianling.user.ui.login.presenter
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.text.TextUtils
+import com.fm.openinstall.OpenInstall
 import com.umeng.socialize.bean.SHARE_MEDIA
 import com.ydl.ydlcommon.mvp.base.BasePresenter
 import com.ydl.ydlcommon.router.YdlCommonOut
@@ -18,6 +19,7 @@ import com.yidianling.user.http.UserHttpImpl
 import com.yidianling.user.http.request.BindPhoneJavaParam
 import com.yidianling.user.http.request.CheckAliAuthParam
 import com.yidianling.user.http.request.PhoneLoginAutoParam
+import com.yidianling.user.ui.login.OneKeyLoginHelp
 import com.yidianling.user.ui.login.contract.ILoginContract
 import com.yidianling.user.ui.login.model.LoginModelImpl
 import io.reactivex.android.schedulers.AndroidSchedulers
@@ -194,6 +196,17 @@ class LoginPresenterImpl(view: ILoginContract.View) : BasePresenter<ILoginContra
                         if (it.data.firstLogin == 1) {//第一次登录：是注册
                             StatusUtils.isFirstLogin = true
                             mView.baiduActionBury(it.data.uid,UserBIConstants.POSITION_QQ_REGISTER_CLICK)
+                            ActionCountUtils.baiduCount(
+                                it.data.uid,
+                                UserBIConstants.APP_REGISTER_PAGE,
+                                UserBIConstants.POSITION_QQ_REGISTER_CLICK,
+                                "",
+                                "",
+                                25,
+                                OneKeyLoginHelp.openInstallKey
+                            )
+                            // 用户注册成功后调用
+                            OpenInstall.reportRegister();
                         } else {
                             ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,  it.data.uid!!,sign1)
                         }
@@ -201,6 +214,17 @@ class LoginPresenterImpl(view: ILoginContract.View) : BasePresenter<ILoginContra
                         if (it.data.firstLogin == 1) {//第一次登录：是注册
                             StatusUtils.isFirstLogin = true
                             mView.baiduActionBury(it.data.uid,UserBIConstants.POSITION_WX_REGISTER_CLICK)
+                            ActionCountUtils.baiduCount(
+                                it.data.uid,
+                                UserBIConstants.APP_REGISTER_PAGE,
+                                UserBIConstants.POSITION_WX_REGISTER_CLICK,
+                                "",
+                                "",
+                                25,
+                                OneKeyLoginHelp.openInstallKey
+                            )
+                            // 用户注册成功后调用
+                            OpenInstall.reportRegister();
                         } else {
                             ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,  it.data.uid!!,sign1)
                         }