Merge remote-tracking branch 'origin/4.1.67' into 4.1.69(强绑手机号)

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

config.gradle

@@ -8,15 +8,15 @@ 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-user"          : "0.0.61.08",
             "m-home"          : "0.0.22.53",
             "m-im"            : "0.0.18.35",
-            "m-dynamic"       : "0.0.7.17",
+            "m-dynamic"       : "0.0.7.19",
             "m-article"       : "0.0.0.6",
 
             "m-muse"          : "0.0.28.20",
             "m-tests"         : "0.0.24.10",
-            "m-course"        : "0.0.42.17",
+            "m-course"        : "0.0.42.19",
 
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",
@@ -92,13 +92,13 @@ ext {
             "m-consultant"    : "0.0.59.65",
             "m-fm"            : "0.0.30.01",
             "m-user"          : "0.0.61.04",
-            "m-home"          : "0.0.22.53",
+            "m-home"          : "0.0.22.54",
             "m-im"            : "0.0.18.34",
-            "m-dynamic"       : "0.0.7.17",
+            "m-dynamic"       : "0.0.7.19",
 
             "m-muse"          : "0.0.20.7",
             "m-tests"         : "0.0.24.9",
-            "m-course"        : "0.0.42.17",
+            "m-course"        : "0.0.42.19",
             //-------------- 业务模块 API 层 --------------
             "m-audioim-api"   : "0.0.6",
             "m-confide-api"   : "0.0.2.1",

m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/TrendsListAdapter.java

@@ -252,6 +252,7 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
 
         if (trend.comments!=null){
             showCommentsPart(holder, trend);
+
         }
         LogUtil.d("head: " + trend.avatar + " pos：" + position);
         LogUtil.d("time: " + trend.timeStr + " source: " + trend.from);

m-home/src/ydl/res/layout/home_button_banner_view.xml

@@ -30,7 +30,7 @@
             android:layout_height="wrap_content"
             android:textColor="@color/platform_color_FFFFFF"
             android:textSize="@dimen/platform_dp_12"
-            android:text="1W+师资"/>
+            android:text="2.2W+师资"/>
     </RelativeLayout>
 
     <RelativeLayout

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
@@ -190,15 +192,42 @@ class LoginPresenterImpl(view: ILoginContract.View) : BasePresenter<ILoginContra
                         ToastUtil.toastShort(it.msg)
                         return@subscribe
                     }
-                    if (it.data.firstLogin==1){ //  第一次登录：是注册
-                        StatusUtils.isFirstLogin = true
-                        if (media==SHARE_MEDIA.QQ){
+                    if (media == SHARE_MEDIA.QQ) {
+                        if (it.data.firstLogin == 1) {//第一次登录：是注册
+                            StatusUtils.isFirstLogin = true
                             mView.baiduActionBury(it.data.uid,UserBIConstants.POSITION_QQ_REGISTER_CLICK)
-                        }else{
+                            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)
+                        }
+                    } else {
+                        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)
                         }
-                    }else{
-                        ActionCountUtils.countUid(UserBIConstants.POSITION_LOGIN_SUCCESS_CLICK,  it.data.uid!!,sign1)
                     }
                     LoginUtils.onLogin(it.data)
                     mView.thirdLoginSuccess(it.data.userInfo!!)