fix openinstall渠道统计问题修复,接入openinstall注册统计方法

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.48.92",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.60.91",
+            "m-user"          : "0.0.60.97",
             "m-home"          : "0.0.22.53",
             "m-im"            : "0.0.18.34",
             "m-dynamic"       : "0.0.7.15",
@@ -33,7 +33,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.73",
+            "ydl-platform"    : "0.0.39.80",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.35",
@@ -91,7 +91,7 @@ ext {
             "m-confide"       : "0.0.48.92",
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
-            "m-user"          : "0.0.60.91",
+            "m-user"          : "0.0.60.97",
             "m-home"          : "0.0.22.53",
             "m-im"            : "0.0.18.34",
             "m-dynamic"       : "0.0.7.15",
@@ -114,7 +114,7 @@ ext {
             //-------------- 功能组件 --------------
 
             //第一步
-            "ydl-platform"    : "0.0.39.72",
+            "ydl-platform"    : "0.0.39.80",
 
             //第二步 若干
             "ydl-webview"     : "0.0.38.35",

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

@@ -6,8 +6,6 @@ import android.text.TextUtils
 import android.util.Log
 import android.view.View
 import com.fm.openinstall.OpenInstall
-import com.fm.openinstall.listener.AppInstallAdapter
-import com.fm.openinstall.model.AppData
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.bean.StatusBarOptions
 import com.ydl.ydlcommon.data.http.RxUtils
@@ -17,7 +15,6 @@ import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.UserInfoCache
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.yidianling.common.tools.LogUtil
 import com.yidianling.im.api.bean.IMLoginInfo
 import com.yidianling.im.api.bean.IMRequestCallback
 import com.yidianling.user.LoginUtils
@@ -33,6 +30,7 @@ import com.yidianling.user.route.UserIn
 import com.yidianling.user.safePrivate.FingerPrintCheckActivity
 import com.yidianling.user.safePrivate.FingerPrintUtil
 import com.yidianling.user.safePrivate.HandUnlockCheckActivity
+import com.yidianling.user.ui.login.OneKeyLoginHelp
 import io.reactivex.Observable
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
@@ -69,7 +67,6 @@ class SmsLoginActivity : BaseActivity() {
     private lateinit var phoneNum: String
     private lateinit var code: String
     private var isFromSplash: Boolean = false
-    private var openInstallKey = ""
 
     override fun layoutResId(): Int {
         return com.yidianling.user.R.layout.user_activity_get_identifying_code
@@ -176,13 +173,15 @@ class SmsLoginActivity : BaseActivity() {
      * 注册流程成功之后，进行百度监测 注册埋点
      */
     fun baiduActionBury() {
-        if (openInstallKey.isNotEmpty() && StatusUtils.isUseOpenInstall) {
+        if (OneKeyLoginHelp.openInstallKey.isNotEmpty() && StatusUtils.isUseOpenInstall) {
             ActionCountUtils.baiduCount(
                 UserBIConstants.APP_REGISTER_PAGE,
                 UserBIConstants.POSITION_CODE_REGISTER_CLICK,
                 25,
-               openInstallKey
+                OneKeyLoginHelp.openInstallKey
             )
+            // 用户注册成功后调用
+            OpenInstall.reportRegister();
         } else {
             ActionCountUtils.baiduCount(
                 UserBIConstants.APP_REGISTER_PAGE,

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

@@ -20,7 +20,6 @@ import com.yidianling.common.tools.RxKeyboardTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.LoginUtils
 import com.yidianling.user.R
-import com.yidianling.user.StatusUtils
 import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.ui.login.contract.IInputPassWordContract
 import com.yidianling.user.ui.login.presenter.InputPassWordPresenterImpl
@@ -60,7 +59,13 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
         /**
          * 重重新设置密码（调用这个方法需要传验证码）
          */
-        fun start(activity: Activity, phone: String, countryCode: String, codeStatus: Int, msgCode: String) {
+        fun start(
+            activity: Activity,
+            phone: String,
+            countryCode: String,
+            codeStatus: Int,
+            msgCode: String
+        ) {
             if (TextUtils.isEmpty(phone)) {
                 ToastUtil.toastShort("手机号不能为空")
                 return
@@ -100,7 +105,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
 
     private fun setWindowStatusBarColor() {
         StatusBarUtils.Companion.setWindowStatusBarColor(this, R.color.white)
-        StatusBarUtils.Companion.setStatusBarLightMode(this,true)
+        StatusBarUtils.Companion.setStatusBarLightMode(this, true)
     }
 
     private fun initView() {
@@ -125,11 +130,11 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
                 tv_msm_login.visibility = View.GONE
 //                tv_setPass2.visibility = View.VISIBLE
                 tv_password_orSet_title.text = "设置新密码"
-                et_input_password.hint="输入新密码"
-                forget_password_hint.visibility=View.VISIBLE
+                et_input_password.hint = "输入新密码"
+                forget_password_hint.visibility = View.VISIBLE
                 //设置密码时默认密码明文显示
                 iv_visibility.isSelected = true
-                login_password.text="完成"
+                login_password.text = "完成"
                 switchPwdShowType()
             }
         }
@@ -140,39 +145,39 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
      * 注册流程成功之后，进行百度埋点
      */
     override fun baiduActionBury() {
-        if (StatusUtils.isUseOpenInstall) {
-            ActionCountUtils.baiduCount(
-                UserBIConstants.APP_REGISTER_PAGE,
-                UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
-                25,
-                OneKeyLoginHelp.openInstallKey
-            )
-        } else {
-            ActionCountUtils.baiduCount(
-                UserBIConstants.APP_REGISTER_PAGE,
-                UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
-                25
-            )
-        }
+        ActionCountUtils.baiduCount(
+            UserBIConstants.APP_REGISTER_PAGE,
+            UserBIConstants.POSITION_PHONE_REGISTER_CLICK,
+            25
+        )
     }
 
 
     private fun setClickEvent() {
-        et_input_password.addTextChangedListener(object:TextWatcher{
+        et_input_password.addTextChangedListener(object : TextWatcher {
             override fun afterTextChanged(s: Editable?) {
                 //设置新密码的时候做校验，输入密码不做校验
-                if (codeStatus== STATUS_SET_PWD){
-                    if (checkPassWordNoAnim()){
-                        login_password.isEnabled=true
-                        login_password.background= ContextCompat.getDrawable(this@InputPassWordActivity,R.drawable.bg_one_click_login)
+                if (codeStatus == STATUS_SET_PWD) {
+                    if (checkPassWordNoAnim()) {
+                        login_password.isEnabled = true
+                        login_password.background = ContextCompat.getDrawable(
+                            this@InputPassWordActivity,
+                            R.drawable.bg_one_click_login
+                        )
                     }
-                }else{
-                    if (s.toString().length>=6){
-                        login_password.isEnabled=true
-                        login_password.background= ContextCompat.getDrawable(this@InputPassWordActivity,R.drawable.bg_one_click_login)
-                    }else{
-                        login_password.isEnabled=false
-                        login_password.background=ContextCompat.getDrawable(this@InputPassWordActivity,R.drawable.login_password_unable_bg_24dp)
+                } else {
+                    if (s.toString().length >= 6) {
+                        login_password.isEnabled = true
+                        login_password.background = ContextCompat.getDrawable(
+                            this@InputPassWordActivity,
+                            R.drawable.bg_one_click_login
+                        )
+                    } else {
+                        login_password.isEnabled = false
+                        login_password.background = ContextCompat.getDrawable(
+                            this@InputPassWordActivity,
+                            R.drawable.login_password_unable_bg_24dp
+                        )
                     }
 
                 }
@@ -207,14 +212,16 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
 
                 //设置新密码
                 if (checkPassWord()) {
-                    mPresenter.resetPwd(et_input_password.text.toString(), userPhoneNumber!!, msgCode!!, countryCode!!)
+                    mPresenter.resetPwd(
+                        et_input_password.text.toString(),
+                        userPhoneNumber!!,
+                        msgCode!!,
+                        countryCode!!
+                    )
                 }
             }
         }
 
-       /* input_iv_del.setOnClickListener {
-            et_input_password.setText("")
-        }*/
         iv_visibility.setOnClickListener {
 
             iv_visibility.isSelected = !iv_visibility.isSelected
@@ -224,13 +231,25 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
         tv_msm_login.setOnClickListener {
 
             //短信登录
-            VerificationCodeActivity.start(this, userPhoneNumber!!, countryCode!!, VerificationCodeActivity.STATUS_LOGIN_BY_CODE, false, true)
+            VerificationCodeActivity.start(
+                this,
+                userPhoneNumber!!,
+                countryCode!!,
+                VerificationCodeActivity.STATUS_LOGIN_BY_CODE,
+                false,
+                true
+            )
             overridePendingTransition(0, 0)
         }
         tv_forget.setOnClickListener {
 
             //忘记密码
-            VerificationCodeActivity.start(this, userPhoneNumber!!, countryCode!!, VerificationCodeActivity.STATUS_FORGET_PWD)
+            VerificationCodeActivity.start(
+                this,
+                userPhoneNumber!!,
+                countryCode!!,
+                VerificationCodeActivity.STATUS_FORGET_PWD
+            )
             overridePendingTransition(0, 0)
         }
     }
@@ -283,9 +302,9 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
             input_iv_next.visibility = View.VISIBLE
             input_progressBarNormal.visibility = View.GONE
         }*/
-        if (state){
+        if (state) {
             showProgressDialog()
-        }else{
+        } else {
             dismissProgressDialog()
         }
     }
@@ -308,6 +327,7 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
         }
         return true
     }
+
     /**
      * 校验密码
      */
@@ -322,21 +342,25 @@ class InputPassWordActivity : BaseMvpActivity<IInputPassWordContract.View,IInput
         }
         return true
     }
+
     override fun startAnim() {
         val shake = AnimationUtils.loadAnimation(this, R.anim.user_shake_input)//加载动画资源文件 
         et_input_password.startAnimation(shake)
         view_lin.startAnimation(shake)
         view_lin.setBackgroundColor(Color.parseColor("#FB6761"))
-        login_password.isEnabled=false
-        login_password.background=ContextCompat.getDrawable(this@InputPassWordActivity,R.drawable.login_password_unable_bg_24dp)
+        login_password.isEnabled = false
+        login_password.background = ContextCompat.getDrawable(
+            this@InputPassWordActivity,
+            R.drawable.login_password_unable_bg_24dp
+        )
     }
 
     override fun showNormalDialog() {
         CommonDialog.create(this)
-                .setMessage("专家账号，请下载壹点灵专家版app喔")
-                .setRightClick("确定") {
-                }
-                .show()
+            .setMessage("专家账号，请下载壹点灵专家版app喔")
+            .setRightClick("确定") {
+            }
+            .show()
     }
 
     override fun closeActivity() {

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

@@ -7,6 +7,7 @@ import android.content.Context
 import android.content.pm.ActivityInfo
 import android.graphics.Color
 import android.text.TextUtils
+import android.util.Log
 import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
@@ -16,6 +17,7 @@ import android.widget.TextView
 import com.fm.openinstall.OpenInstall
 import com.fm.openinstall.listener.AppInstallAdapter
 import com.fm.openinstall.model.AppData
+import com.fm.openinstall.model.Error
 import com.meituan.android.walle.WalleChannelReader
 import com.mobile.auth.gatewayauth.*
 import com.mobile.auth.gatewayauth.model.TokenRet
@@ -442,6 +444,8 @@ object OneKeyLoginHelp {
                                             25,
                                             openInstallKey
                                         )
+                                        // 用户注册成功后调用
+                                        OpenInstall.reportRegister();
                                     } else {
                                         ActionCountUtils.countUid(
                                             UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,

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

@@ -17,8 +17,6 @@ import android.view.View
 import android.view.animation.AnimationUtils
 import com.alibaba.android.arouter.facade.annotation.Route
 import com.fm.openinstall.OpenInstall
-import com.fm.openinstall.listener.AppInstallAdapter
-import com.fm.openinstall.model.AppData
 import com.meituan.android.walle.WalleChannelReader
 import com.mobile.auth.gatewayauth.PhoneNumberAuthHelper
 import com.mobile.auth.gatewayauth.ResultCode
@@ -189,6 +187,8 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
             25,
             OneKeyLoginHelp.openInstallKey
         )
+        // 用户注册成功后调用
+        OpenInstall.reportRegister();
     }
 
 

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

@@ -13,14 +13,11 @@ import android.view.animation.AnimationUtils
 import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
 import com.fm.openinstall.OpenInstall
-import com.fm.openinstall.listener.AppInstallAdapter
-import com.fm.openinstall.model.AppData
 import com.ydl.ydlcommon.base.BaseMvpActivity
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.YDLCacheUtils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
-import com.yidianling.common.tools.LogUtil
 import com.yidianling.common.tools.RxKeyboardTool
 import com.yidianling.common.tools.ToastUtil
 import com.yidianling.user.LoginUtils
@@ -281,6 +278,8 @@ class VerificationCodeActivity :
                 25,
                 OneKeyLoginHelp.openInstallKey
             )
+            // 用户注册成功后调用
+            OpenInstall.reportRegister();
         } else {
             ActionCountUtils.baiduCount(
                 UserBIConstants.APP_REGISTER_PAGE,