Merge branch 'd/v_register' into 'd/v4.3.95'

新用户注册登录

See merge request app_android_lib/YDL-Component!134

app/src/main/java/com/ydl/component/MainActivity.kt

@@ -291,6 +291,7 @@ class MainActivity : BaseLceActivity<DemoContract.View, DemoContract.Presenter>(
         
     }
 
+    @SuppressLint("MissingSuperCall")
     override fun onDestroy() {
         if (serviceConnection != null) {
             unbindService(serviceConnection)

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

@@ -21,9 +21,9 @@ 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_TEST;
 //    public static String appEnv = YDLConstants.ENV_NEW_TEST;//配置未上传到maven库
-//    public static String appEnv = YDLConstants.ENV_PROD;
+    public static String appEnv = YDLConstants.ENV_PROD;
     @Override
     public void injectAppLifecycle(@NotNull Context context, @NotNull List<IAppLifecycles> lifecycles) {
         lifecycles.add(new DemoAppLifecycles());

app/src/main/res/anim/common_dialog_default_in.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="ResourceName">
+    <alpha
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0"
+        android:duration="600"
+        />
+    <scale
+        android:pivotX="50%"
+        android:pivotY="50%"
+        android:fromXScale="0.0"
+        android:toXScale="1.0"
+        android:fromYScale="0.0"
+        android:toYScale="1.0"
+        android:duration="600"/>
+
+</set>
\ No newline at end of file

app/src/main/res/anim/common_dialog_default_out.xml

+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    tools:ignore="ResourceName">
+    <alpha
+        android:duration="300"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        />
+    <!--
+     <scale
+         android:pivotX="50%"
+         android:pivotY="50%"
+         android:fromXScale="1.0"
+         android:toXScale="0.0"
+         android:fromYScale="1.0"
+         android:toYScale="0.0"
+         android:duration="500"/>
+ -->
+
+</set>
\ No newline at end of file

build.gradle

@@ -76,7 +76,7 @@ apply plugin: 'modular-plugin'
 
 modular {
 
-    compileSdkVersion 27
+    compileSdkVersion 28
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8

config.gradle

@@ -8,8 +8,8 @@ ext {
             "m-confide"       : "0.0.50.19",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.26",
-            "m-home"          : "0.0.23.79",
+            "m-user"          : "0.0.62.46",
+            "m-home"          : "0.0.23.80",
             "m-im"            : "0.0.21.51",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.10",
@@ -26,7 +26,7 @@ ext {
             "m-fm-api"        : "0.0.3",
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.19",
+            "m-user-api"      : "0.0.10.22",
             "m-home-api"      : "0.0.4.2",
             "m-im-api"        : "0.0.12.24",
             "m-dynamic-api"   : "0.0.3.71",
@@ -97,8 +97,8 @@ ext {
             "m-confide"       : "0.0.50.19",
             "m-consultant"    : "0.0.60.27",
             "m-fm"            : "0.0.30.09",
-            "m-user"          : "0.0.62.26",
-            "m-home"          : "0.0.23.79",
+            "m-user"          : "0.0.62.46",
+            "m-home"          : "0.0.23.80",
             "m-im"            : "0.0.21.51",
             "m-dynamic"       : "0.0.7.74",
             "m-article"       : "0.0.0.8",
@@ -114,7 +114,7 @@ ext {
             "m-fm-api"        : "0.0.3",
             "m-muse-api"      : "0.0.1",
             "m-tests-api"     : "0.0.2",
-            "m-user-api"      : "0.0.10.19",
+            "m-user-api"      : "0.0.10.22",
             "m-home-api"      : "0.0.4.2",
             "m-im-api"        : "0.0.12.24",
             "m-dynamic-api"   : "0.0.3.71",

m-home/src/main/res/values/styles.xml

@@ -11,13 +11,6 @@
         <item name="colorAccent">@color/platform_main_theme</item>
     </style>
 
-    <style name="MeditationTabLayoutStyle" parent="Widget.Design.TabLayout">
-        <item name="tabIndicatorColor">@color/white</item>
-        <item name="tabIndicatorHeight">2dp</item>
-        <item name="tabIndicatorFullWidth">false</item>
-        <item name="tabSelectedTextColor">@color/white</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:textColor">@color/white_60</item>
-    </style>
+
 
 </resources>
\ No newline at end of file

m-home/src/xlzx/java/com/yidianling/home/ui/fragment/YdlHomeFragment.kt

@@ -22,7 +22,6 @@ import com.ydl.ydlcommon.utils.StatusBarUtils
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.ydl.ydlcommon.utils.remind.ToastHelper
-import com.yidianling.common.tools.ToastUtil
 import com.yidianling.consultant.api.IConsultantService
 import com.yidianling.home.R
 import com.yidianling.home.adapter.YdlHomeAdapter
@@ -85,7 +84,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
      * 如果是第一次加载，则调用所有接口进行刷新，否则，只调用咨询和倾诉接口
      */
     private var isFromCreate: Boolean = true
-    var startTime by Delegates.notNull<Long>()
+    var startTime = System.currentTimeMillis()
     var endTime by Delegates.notNull<Long>()
     override fun layoutResId(): Int {
         return R.layout.home_fragment_home_module
@@ -139,24 +138,6 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
 
     }
 
-    /**
-     * 初始化状态栏位置
-     */
-//    private fun initStatus() {
-//
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {//4.4以下不支持状态栏变色
-//            val statusBarHeight = StatusBarUtils.getStatusBarHeight(activity)
-//            var homeTitleBarHeight = resources.getDimension(R.dimen.home_home_title_bar_height)
-//            val lp1 = view_search_toolbar_bg.layoutParams as RelativeLayout.LayoutParams
-//            lp1.height = (homeTitleBarHeight + statusBarHeight).toInt()
-//            view_search_toolbar_bg.layoutParams = lp1
-//
-//            val lp2 = toolbar.layoutParams as CollapsingToolbarLayout.LayoutParams
-//            lp2.topMargin = statusBarHeight
-//            toolbar.layoutParams = lp2
-//        }
-//    }
-
     override fun initDataAndEventLazy() {
     }
 
@@ -236,7 +217,7 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
                 //展示弹窗
                 if (aa == null) {
                     //99元3小时弹出事件
-                    ActionCountUtils.count(HomeBIConstants.YDL_HOME_POPUPWINDOWS_PAGE_POPUP,act.title)
+                    ActionCountUtils.count(HomeBIConstants.YDL_HOME_POPUPWINDOWS_PAGE_POPUP,act?.title?:"1")
                     aa = ActivityDialog(mActivity!!, act.imageBanner, act.linkUrl, act.title)
                     aa?.show()
                     aa?.setOnDismissListener {
@@ -374,12 +355,12 @@ class YdlHomeFragment : BaseMvpFragment<IHomeContract.View, HomePresenterImpl>()
     }
     override fun onStop() {
         super.onStop()
-        endTime=System.currentTimeMillis()
+        endTime = System.currentTimeMillis()
         ActionCountUtils.count(HomeBIConstants.YDL_HOME_DWELL_TIME,(endTime-startTime).toString())
     }
     override fun onResume() {
         super.onResume()
-        startTime=System.currentTimeMillis()
+        startTime = System.currentTimeMillis()
         if (userVisibleHint) {
             ActionCountUtils.count(HomeBIConstants.YDL_USER_MAIN_PAGE_VISIT)
             if (isFromCreate) {

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeButtonBannerView.kt

@@ -45,7 +45,7 @@ class HomeButtonBannerView(private val mContext: Context, private var homeEvent:
             homeEvent?.askMoreClick()
         }
         homeModuleButtonBannerThird.setOnClickListener {
-            homeEvent?.nowConfideClick()
+            homeEvent?.nowConfideClick(false)
         }
         homeModuleButtonBannerFourth.setOnClickListener {
             homeEvent?.psychologyTestClick()

m-home/src/xlzx/java/com/yidianling/home/ui/view/HomeConfideExpertInfoView.kt

@@ -74,11 +74,11 @@ class HomeConfideExpertInfoView(
             view_line.visibility = View.VISIBLE
         }
         this.setOnClickListener {
-            homeEvent!!.confideClick(bean.linkUrl, bean.doctorId)
+            homeEvent?.confideClick(bean.linkUrl, bean.confidedId.toString(), bean.doctorId, bean.uid.toString())
         }
 
         iv_confide_voice.setOnClickListener {
-            homeEvent!!.confidePlayClick(iv_confide_voice, bean)
+            homeEvent?.confidePlayClick(iv_confide_voice, bean)
         }
     }
 
@@ -147,7 +147,7 @@ class HomeConfideExpertInfoView(
             if (bodyBean.confideLine == 2) {//喊他上线  私聊
                 homeEvent!!.toChatForMsg(bodyBean.uid.toString())
             } else {
-                homeEvent!!.confideClick(bodyBean.linkUrl,bodyBean.doctorId)
+                homeEvent!!.confideClick(bodyBean.linkUrl, bodyBean.confidedId.toString(), bodyBean.doctorId, bodyBean.uid.toString())
             }
         }
     }

m-home/src/main/java/com/yidianling/home/MeditationTypeAdapter.kt → m-home/src/ydl/java/com/yidianling/home/adapter/MeditationTypeAdapter.kt

-package com.yidianling.home
+package com.yidianling.home.adapter
 
-//import com.ydl.ydlcommon.router.IYDLRouterConstant.Companion.ROUTER_MUSE_PLAY
 import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
@@ -18,6 +17,7 @@ import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.modular.ModularServiceManager
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
+import com.yidianling.home.R
 import com.yidianling.home.constants.HomeBIConstants
 import com.yidianling.home.model.bean.MeditationModuleBean
 import com.yidianling.user.api.service.IUserService
@@ -39,13 +39,13 @@ class MeditationTypeAdapter(
             CONTENT_TYPE -> {
                 MeditationTypeViewHolder(
                     LayoutInflater.from(context)
-                        .inflate(R.layout.layout_meditation_item, parent, false)
+                        .inflate(R.layout.home_layout_meditation_item, parent, false)
                 )
             }
             else -> {
                 MeditationTypeMoreViewHolder(
                     LayoutInflater.from(context)
-                        .inflate(R.layout.layout_meditation_more_type, parent, false)
+                        .inflate(R.layout.home_layout_meditation_more_type, parent, false)
                 )
             }
         }

m-home/src/main/java/com/yidianling/home/MeditationViewPagerAdapter.kt → m-home/src/ydl/java/com/yidianling/home/adapter/MeditationViewPagerAdapter.kt

-package com.yidianling.home
+package com.yidianling.home.adapter
 
 import android.content.Context
 import android.view.LayoutInflater
@@ -6,6 +6,7 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.yidianling.home.R
 import com.yidianling.home.model.bean.MeditationModuleBean
 
 class MeditationViewPagerAdapter(private val context: Context, private val data:
@@ -14,7 +15,7 @@ class MeditationViewPagerAdapter(private val context: Context, private val data:
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MeditationViewPagerViewHolder {
         return MeditationViewPagerViewHolder(LayoutInflater
-            .from(context).inflate(R.layout.layout_meditation_entrance,parent,false))
+            .from(context).inflate(R.layout.home_layout_meditation_entrance,parent,false))
     }
 
     override fun onBindViewHolder(holder: MeditationViewPagerViewHolder, position: Int) {

m-home/src/ydl/java/com/yidianling/home/ui/view/HomeMuseView.kt

@@ -18,7 +18,7 @@ import com.ydl.webview.H5Params
 import com.ydl.webview.NewH5Activity
 import com.ydl.ydlcommon.utils.Utils
 import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
-import com.yidianling.home.MeditationViewPagerAdapter
+import com.yidianling.home.adapter.MeditationViewPagerAdapter
 import com.yidianling.home.R
 import com.yidianling.home.constants.HomeBIConstants
 import com.yidianling.home.constract.HomeViewConfig

m-home/src/ydl/res/values/styles.xml

@@ -10,4 +10,14 @@
     <style name="activityDialog" parent="NoTitleTheme">
         <item name="android:windowIsTranslucent">true</item>
     </style>
+
+    <style name="MeditationTabLayoutStyle" parent="Widget.Design.TabLayout">
+        <item name="tabIndicatorColor">@color/white</item>
+        <item name="tabIndicatorHeight">2dp</item>
+        <item name="tabIndicatorFullWidth">false</item>
+        <item name="tabSelectedTextColor">@color/white</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">@color/white_60</item>
+
+    </style>
 </resources>
\ No newline at end of file

m-muse/src/main/java/com/yidianling/muse/service/MeditationWindowService.kt

@@ -316,14 +316,6 @@ class MeditationWindowService : Service() {
     }
 
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-
-//        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-//            val manager = getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
-//            val channel = NotificationChannel("壹点灵", "play", NotificationManager.IMPORTANCE_HIGH)
-//            manager.createNotificationChannel(channel)
-//            val notification = NotificationCompat.Builder(this, "壹点灵").build()
-//            startForeground(1, notification)
-//        }
         return super.onStartCommand(intent, flags, startId)
     }
 

m-user/src/main/java/com/yidianling/user/LoginUtils.kt

@@ -121,7 +121,8 @@ object LoginUtils {
         if (size <= 2) {//当前stack只有两个页面，必然没有MainActivity
             ActivityManager.finishAll()
             if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {
-                activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
+                UserIn.mainIntent(activity)
+//                activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
             } else {
                 UserIn.mainIntent(activity)
             }
@@ -150,7 +151,8 @@ object LoginUtils {
             } else {
                 ActivityManager.finishAll()
                 if (StatusUtils.isFirstLogin && StatusUtils.isFirstStartApp) {
-                    activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
+                    UserIn.mainIntent(activity)
+//                    activity.startActivity(Intent(activity, CollectSexAndBirthActivity::class.java))
                 } else {
                     UserIn.mainIntent(activity)
                 }

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

@@ -32,21 +32,40 @@ class UserBIConstants {
         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"
+
         //登录主页浏览事件（包含随便逛逛）
         const val POSITION_LOGIN_ONE_PAGE_VISIT = "login_main_one_page_visit"
+
         //登录主页浏览事件（不包含随便逛逛）
         const val POSITION_LOGIN_TWO_PAGE_VISIT = "login_main_two_page_visit"
 
+        //隐私授权页事件埋点
+        const val PRIVACY_AUTHORIZATION_CLICK =
+            "privacy_authorization_page|privacy_authorization_click"
+
+        //手机注册页 手机号一键登录页右上角点击跳过
+        const val USER_REGISTER_PAGE_SKIP_CLICK = "user_register_page|skip_click"
+
+        //隐私授权二次确认弹窗
+        const val PRIVACY_AUTHORIZATION_TWO_CLICK =
+            "privacy_authorization_page|privacy_authorization_two_click"
+
         //百度监测 用户信息收集页面
         const val COLLECT_USER_INFO_PAGE = "collect_user_info_page"
 
-        const val COLLECT_USER_INFO_PAGE_VISIT = "collect_user_info_page_visit" //百度监测 用户信息收集页面--页面浏览事件
-        const val COLLECT_USER_INFO_SEX_MAN_CLICK = "collect_user_info_sex_man_click" // （sign1存储状态（1代表选中，2代表取消），String） //百度监测 用户信息收集页面--性别男按钮点击
-        const val COLLECT_USER_INFO_SEX_FEMALE_CLICK = "collect_user_info_sex_female_click" // （sign1存储状态（1代表选中，2代表取消），String） //百度监测 用户信息收集页面--性别女按钮点击
-        const val COLLECT_USER_INFO_NEXT_CLICK= "collect_user_info_next_click" //百度监测 用户信息收集页面--下一步点击
-        const val COLLECT_USER_INFO_EXIT_CLICK= "collect_user_info_exit_click" //百度监测 用户信息收集页面--退出点击
+        const val COLLECT_USER_INFO_PAGE_VISIT =
+            "collect_user_info_page_visit" //百度监测 用户信息收集页面--页面浏览事件
+        const val COLLECT_USER_INFO_SEX_MAN_CLICK =
+            "collect_user_info_sex_man_click" // （sign1存储状态（1代表选中，2代表取消），String） //百度监测 用户信息收集页面--性别男按钮点击
+        const val COLLECT_USER_INFO_SEX_FEMALE_CLICK =
+            "collect_user_info_sex_female_click" // （sign1存储状态（1代表选中，2代表取消），String） //百度监测 用户信息收集页面--性别女按钮点击
+        const val COLLECT_USER_INFO_NEXT_CLICK =
+            "collect_user_info_next_click" //百度监测 用户信息收集页面--下一步点击
+        const val COLLECT_USER_INFO_EXIT_CLICK =
+            "collect_user_info_exit_click" //百度监测 用户信息收集页面--退出点击
 
         //百度监测 收集感兴趣话题页
         const val COLLECT_TOPIC_PAGE = "collect_topic_page"

m-user/src/main/java/com/yidianling/user/http/UserApi.kt

@@ -113,14 +113,15 @@ interface UserApi {
     fun privacyAgree(@Query("uid") uid: String): Observable<BaseResponse<Any>>
 
 
-
     //服务端校验阿里一键认证
     @POST("phone/verification/init")
     fun checkAliAuth(@Body body: RequestBody): Observable<BaseResponse<PhoneAuthResponseBean>>
 
+
     //获取隐私政策数据
-    @GET("site/get-privacy-content")
-    fun getSecretData(): Observable<BaseResponse<SecretResponse>>
+    @GET("config/queryConfigVaule?configKey=user_privacy_content")
+    @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
+    fun getSecretJavaData(): Observable<BaseResponse<String>>
 
     //获取红包单号
     @FormUrlEncoded
@@ -130,7 +131,7 @@ interface UserApi {
 
     //上传用户信息数据接口
     @POST("user/collect/submit")
-    @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
+    @Headers(YDL_DOMAIN + YDL_DOMAIN_JAVA)
     fun uploadUserInfo(@Body body: RequestBody): Observable<BaseAPIResponse<Any>>
 
     //获取关注问题数据接口

m-user/src/main/java/com/yidianling/user/http/UserHttp.kt

@@ -63,12 +63,13 @@ interface UserHttp {
     fun privacyAgree(uid: String): Observable<BaseResponse<Any>>
 
     fun thirdPartJavaLogin(param: ThirdLoginParam): Observable<BaseResponse<UserResponseBean>>
+
     // 友盟第三方登录
     fun umLogin(activity: Activity, media: SHARE_MEDIA): Observable<ThirdLoginParam>
 
     fun unBindThirdLogin(param: UnBindThirdLoginParam): Observable<BaseResponse<Any>>
 
-    fun getSecretData(): Observable<BaseResponse<SecretResponse>>
+    fun getSecretJavaData(): Observable<BaseResponse<String>>
 
     fun getRedPacketId(param: RedPacketIdCmd): Observable<BaseResponse<RedPacketId>>
 

m-user/src/main/java/com/yidianling/user/http/UserHttpImpl.kt

@@ -205,8 +205,9 @@ class UserHttpImpl private constructor() : UserHttp {
         return getUserApi().unBindThirdLogin(body)
     }
 
-    override fun getSecretData(): Observable<BaseResponse<SecretResponse>> {
-        return getUserApi().getSecretData()
+
+    override fun getSecretJavaData(): Observable<BaseResponse<String>> {
+        return getUserApi().getSecretJavaData()
     }
 
     override fun getRedPacketId(param: RedPacketIdCmd): Observable<BaseResponse<RedPacketId>> {

m-user/src/main/java/com/yidianling/user/modular_service/UserServiceImp.kt

@@ -291,16 +291,12 @@ public class UserServiceImp : IUserService {
 
     @SuppressLint("CheckResult")
     override fun getSecretDataApi(activity: Activity, listener: SecretDataListener) {
-        UserHttpImpl.Companion.getInstance().getSecretData()
+        UserHttpImpl.Companion.getInstance().getSecretJavaData()
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(Consumer {
-                if (it.code === 0) {
-                    if (it.data.getIs_open() === 1) {
-                        SecretActivity.startProtocol(activity, it.data.getContent())
-                    } else {
-                        listener.onOtherAction()
-                    }
+                if (it.code == 200) {
+                    SecretActivity.startProtocol(activity, it.data)
                 } else {
                     listener.onOtherAction()
                 }

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

@@ -39,6 +39,7 @@ import com.yidianling.user.api.listener.LoginCallBackListener
 import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.http.LoginApiRequestUtil
 import com.yidianling.user.http.request.PhoneLoginAutoParam
+import com.yidianling.user.route.UserIn
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.schedulers.Schedulers
 import java.math.BigDecimal
@@ -301,6 +302,7 @@ object OneKeyLoginHelp {
                 }
                 .build()
         )
+
         var loginLogo = "ic_ydl_login_logo"
         var loginHeight = 40
         var loginWidth = 118
@@ -313,6 +315,34 @@ object OneKeyLoginHelp {
             loginWidth = 60
             appPrivacyOneTip = "壹点灵专家使用协议"
         }
+        //跳过按钮
+        val jumpLogin = TextView(mActivity)
+        val jumpLoginlayoutParams = RelativeLayout.LayoutParams(
+            RelativeLayout.LayoutParams.MATCH_PARENT,
+            RelativeLayout.LayoutParams.WRAP_CONTENT
+        )
+        jumpLoginlayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, RelativeLayout.TRUE)
+//        jumpLoginlayoutParams.addRule(RelativeLayout.ALIGN_PARENT_RIGHT, RelativeLayout.TRUE)
+        jumpLoginlayoutParams.setMargins(
+            RxImageTool.dp2px(0f),
+            RxImageTool.dp2px(0f),
+            RxImageTool.dp2px(10f),
+            RxImageTool.dp2px(68f)
+        )
+        jumpLogin.text = "跳过"
+        jumpLogin.setTextColor(Color.parseColor("#999999"))
+        jumpLogin.setTextSize(TypedValue.COMPLEX_UNIT_SP, 15f)
+        jumpLogin.gravity = Gravity.RIGHT
+        jumpLogin.layoutParams = jumpLoginlayoutParams
+        phoneNumberAuthHelper.addAuthRegistViewConfig(
+            "jump_login", AuthRegisterViewConfig.Builder()
+                .setView(jumpLogin)
+                .setRootViewId(AuthRegisterViewConfig.RootViewId.ROOT_VIEW_ID_BODY)
+                .setCustomInterface {
+                    UserIn.mainIntent(mActivity)
+                }
+                .build()
+        )
         phoneNumberAuthHelper.setAuthUIConfig(
             AuthUIConfig.Builder()
                 .setStatusBarColor(Color.TRANSPARENT)

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

@@ -275,7 +275,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
 
         setHint()
         requestFocus()
-
         if (isBindPhone) {
             skip_bind.visibility = View.VISIBLE
             iv_select_protocol.visibility = View.GONE
@@ -309,6 +308,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
 
         if (isFromGuide) {
             img_reg_back.visibility = View.INVISIBLE
+            skip_bind.visibility = View.VISIBLE
             img_reg_back.isEnabled = false
         }
         //根据来源不同为当前页面埋点
@@ -331,6 +331,10 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
                 sign1 = ""
             )
         }
+        et_phone_number.postDelayed(Runnable {
+            RxKeyboardTool.showSoftInput(this,et_phone_number)
+        },500)
+
     }
 
     private fun requestFocus() {
@@ -353,6 +357,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
      */
     private fun setClickEvent() {
         skip_bind.setOnClickListener {
+            ActionCountUtils.count(UserBIConstants.USER_REGISTER_PAGE_SKIP_CLICK)
             ActionCountUtils.count(
                 uid = "",
                 partId = UserBIConstants.PART_ID_LOGIN_MAIN,
@@ -714,7 +719,11 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         if (isFromGuide) {
             LoginUtils.setLoginCallBack(null)
             ActivityManager.finishOtherActivity(this)
+            if (StatusUtils.isFirstStartApp) {
+                UserIn.mainIntent(this, 0)
+            } else {
                 UserIn.mainIntent(this, 4)
+            }
             finish()
         } else if (isFromOneKeyLogin) {        // 来自一键登录界面
             // 如果已经登录

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

@@ -8,7 +8,9 @@ import android.view.KeyEvent
 import com.ydl.ydlcommon.base.BaseActivity
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.StatusBarUtils
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.user.R
+import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.widget.SecretDialog
 import kotlinx.android.synthetic.main.user_activity_secret.*
 
@@ -58,14 +60,25 @@ class SecretActivity : BaseActivity() {
         initStatus()
 
         user_secret_no_agree.setOnClickListener {
+            ActionCountUtils.count(UserBIConstants.PRIVACY_AUTHORIZATION_CLICK, "拒绝")
             if (null == secretDialog) {
                 secretDialog = SecretDialog(this, object : SecretDialog.OnSecretDialogListener {
                     override fun onCancel() {
+                        ActionCountUtils.count(
+                            UserBIConstants.PRIVACY_AUTHORIZATION_TWO_CLICK,
+                            "拒绝"
+                        )
+                        user_secret_no_agree.postDelayed(Runnable {
                             setResult(SECRET_PAGE_REQUEST_FAILURE_CODE)
                             finish()
+                        }, 400)
                     }
 
                     override fun onSure() {
+                        ActionCountUtils.count(
+                            UserBIConstants.PRIVACY_AUTHORIZATION_TWO_CLICK,
+                            "同意"
+                        )
                         agreeAction()
                     }
                 })
@@ -76,6 +89,7 @@ class SecretActivity : BaseActivity() {
         }
 
         user_secret_agree.setOnClickListener {
+            ActionCountUtils.count(UserBIConstants.PRIVACY_AUTHORIZATION_CLICK, "同意")
             agreeAction()
         }
 

m-user/src/main/java/com/yidianling/user/widget/SecretDescriptionDialog.kt

@@ -15,7 +15,9 @@ import android.view.View
 import android.view.WindowManager
 import com.ydl.ydlcommon.utils.SharedPreferencesEditor
 import com.ydl.ydlcommon.utils.Utils
+import com.ydl.ydlcommon.utils.actionutil.ActionCountUtils
 import com.yidianling.user.R
+import com.yidianling.user.constants.UserBIConstants
 import com.yidianling.user.ui.login.H5Activity
 import kotlinx.android.synthetic.main.user_dialog_secret.*
 
@@ -40,10 +42,15 @@ class SecretDescriptionDialog(
         user_secret_desc.text = Html.fromHtml(mSecretProtocolString)
 
         user_secret_no_agree.setOnClickListener {
+            ActionCountUtils.count(
+                UserBIConstants.PRIVACY_AUTHORIZATION_TWO_CLICK,
+                "拒绝"
+            )
             listener?.onCancel()
         }
 
         user_secret_agree.setOnClickListener {
+            ActionCountUtils.count(UserBIConstants.PRIVACY_AUTHORIZATION_CLICK, "同意")
             agreeAction()
         }
 

m-user/src/main/res/drawable/shape_bg_white_secret.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/white" />
+
+    <corners android:radius="8dp" />
+
+</shape>
\ No newline at end of file

m-user/src/main/res/layout/user_activity_secret.xml

@@ -3,49 +3,44 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:background="#ffffff">
-
-    <ImageView
-        android:layout_width="match_parent"
+    android:paddingStart="@dimen/platform_dp_38"
+    android:paddingEnd="@dimen/platform_dp_38"
+    android:paddingTop="@dimen/platform_dp_38"
+    android:paddingBottom="@dimen/platform_dp_38"
+    android:gravity="center"
+    android:background="#60000000">
+    <RelativeLayout
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:adjustViewBounds="true"
-        android:src="@drawable/user_secret_top_bg" />
+        android:background="@drawable/shape_bg_white_secret"
+        >
 
         <RelativeLayout
             android:id="@+id/user_top_rl"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:layout_marginTop="10dp">
+            android:gravity="center"
+            android:layout_marginTop="@dimen/platform_dp_24">
 
             <TextView
                 android:id="@+id/secrey_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_marginLeft="25dp"
-            android:layout_marginTop="40dp"
-            android:text="壹点灵"
-            android:textColor="#242424"
-            android:textSize="28dp"
-            android:textStyle="bold" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/secrey_title"
-            android:layout_marginLeft="25dp"
-            android:text="隐私政策概要"
+                android:text="壹点灵服务使用协议及隐私\n条款概要"
                 android:textColor="#242424"
-            android:textSize="28dp"
+                android:textSize="18sp"
+                android:gravity="center"
                 android:textStyle="bold" />
 
         </RelativeLayout>
 
         <ScrollView
             android:layout_below="@+id/user_top_rl"
-        android:layout_alignBottom="@+id/secret_bottom_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:layout_marginBottom="42dp">
+            android:id="@+id/scroll"
+            android:layout_marginTop="@dimen/platform_dp_12"
+            >
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -57,17 +52,14 @@
                 <TextView
                     android:id="@+id/user_secret_desc"
                     android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
+                    android:layout_height="300dp"
                     android:lineHeight="20dp"
-                tools:text="感谢您信任并使用壹点灵APP，\n
-我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\n\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\n
-2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\n
-3. 我们会采业界先进的安全措施保护您的信息安全;\n
-4. 未经您同意，我们不会从第三方处获取、共享或向其提供您的信息;\n
-5. 您可以查询、更正、删除您的个人信息。"
-                android:textColor="#444444"
-                android:textSize="14dp" />
+                    tools:text="尊敬的用户，应最新的法律法规及监管政策要求，向您推送以下说明\n
+1、您可通过《隐私保护政策》了解我们会收集哪些个人信息，如何使用，储存信息等事项；\n
+2、我们会采取严格的数据安全保障措施保护您的信息安全；\n
+3、点击“同意”，我们将严格按照《隐私保护政策》为您提供服务；\n"
+                    android:textColor="#666666"
+                    android:textSize="15sp" />
 
             </LinearLayout>
         </ScrollView>
@@ -77,16 +69,16 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-        android:layout_alignParentBottom="true"
-        android:layout_marginBottom="185dp"
+            android:layout_below="@id/scroll"
+            android:layout_marginTop="@dimen/platform_dp_15"
             android:layout_marginLeft="@dimen/platform_dp_25">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="阅读完整版"
-            android:textColor="#444444"
-            android:textSize="14dp" />
+                android:textColor="#666666"
+                android:textSize="15sp" />
 
             <TextView
                 android:id="@+id/user_use_btn"
@@ -94,7 +86,7 @@
                 android:layout_height="wrap_content"
                 android:text="《用户使用协议》"
                 android:textColor="#159CEF"
-            android:textSize="14dp" />
+                android:textSize="15sp" />
 
             <TextView
                 android:layout_width="wrap_content"
@@ -103,23 +95,37 @@
                 android:textColor="#444444"
                 android:textSize="14dp" />
 
+
+        </LinearLayout>
         <TextView
             android:id="@+id/user_secret_protect_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="《隐私保护政策》"
             android:textColor="#159CEF"
+            android:layout_marginLeft="@dimen/platform_dp_25"
+            android:layout_below="@id/secret_bottom_text"
+            android:layout_marginTop="@dimen/platform_dp_5"
+            android:textSize="15sp" />
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="了解全部的条款内容"
+            android:textColor="#666666"
+            android:id="@+id/tv_all_content"
+            android:layout_marginLeft="@dimen/platform_dp_25"
+            android:layout_below="@id/user_secret_protect_btn"
+            android:layout_marginTop="@dimen/platform_dp_5"
             android:textSize="14dp" />
-    </LinearLayout>
-
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
             android:layout_marginLeft="25dp"
             android:layout_marginRight="25dp"
-        android:layout_marginBottom="40dp"
             android:orientation="horizontal"
+            android:layout_below="@id/tv_all_content"
+            android:layout_marginTop="@dimen/platform_dp_30"
+            android:layout_marginBottom="@dimen/platform_dp_30"
             android:background="#ffffff">
 
             <TextView
@@ -130,9 +136,9 @@
                 android:layout_weight="1"
                 android:background="@drawable/user_secret_left_btn_bg"
                 android:gravity="center"
-            android:text="不同意并退出"
+                android:text="拒绝"
                 android:textColor="#999999"
-            android:textSize="16dp" />
+                android:textSize="17sp" />
 
             <TextView
                 android:id="@+id/user_secret_agree"
@@ -142,11 +148,14 @@
                 android:layout_weight="1"
                 android:background="@drawable/user_secret_right_btn_bg"
                 android:gravity="center"
-            android:text="同意并继续"
+                android:text="同意"
+                android:textSize="17sp"
                 android:textColor="#FFFFFF"
-            android:textSize="16dp" />
+                android:textStyle="bold" />
 
         </LinearLayout>
+    </RelativeLayout>
+
 
 
 </RelativeLayout>
\ No newline at end of file

m-user/src/main/res/layout/user_dialog_secret.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:tools="http://schemas.android.com/tools"
     xmlns:myapp="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent" android:layout_height="wrap_content"
-              android:orientation="vertical"
->
-
-    <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content"
-                  android:orientation="vertical"
-                  android:layout_marginLeft="34dp"
-                  android:layout_marginRight="34dp"
-                  android:background="@drawable/user_secret_dialog_bg">
-
-
-        <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content">
-            <com.ydl.ydlcommon.view.widgets.RoundImageView
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-                    myapp:pa_borderRadius="12dp"
-                    myapp:pa_type="pa_round"
-                    android:adjustViewBounds="true"
-                    android:src="@drawable/user_secret_top_bg"/>
+    android:orientation="vertical">
 
-            <RelativeLayout
-                    android:id="@+id/user_top_rl"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-                    android:layout_marginTop="10dp">
+        android:layout_marginLeft="34dp"
+        android:layout_marginRight="34dp"
+        android:background="@drawable/user_secret_dialog_bg"
+        android:gravity="center"
+        android:orientation="vertical">
 
         <TextView
             android:id="@+id/secrey_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                        android:layout_marginLeft="25dp"
-                        android:layout_marginTop="40dp"
-                        android:text="隐私政策"
-                        android:textColor="#242424"
-                        android:textSize="28dp"
-                        android:textStyle="bold"/>
-
-                <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/secrey_title"
-                        android:layout_marginLeft="25dp"
-                        android:text="及使用协议说明"
+            android:layout_marginTop="@dimen/platform_dp_25"
+            android:gravity="center"
+            android:text="壹点灵服务使用协议及隐私\n
+条款概要"
             android:textColor="#242424"
-                        android:textSize="28dp"
-                        android:textStyle="bold"/>
+            android:textSize="18sp"
+            android:textStyle="bold" />
 
-            </RelativeLayout>
-        </RelativeLayout>
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="300dp">
 
-        <RelativeLayout android:layout_width="match_parent" android:layout_height="194dp">
             <ScrollView
                 android:layout_width="match_parent"
-                    android:layout_height="194dp"
-                    android:scrollbars="none"
-            >
+                android:layout_height="300dp"
+                android:scrollbars="none">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
+                    android:layout_height="300dp"
                     android:layout_marginLeft="25dp"
-                        android:layout_marginRight="25dp"
-                >
+                    android:layout_marginRight="25dp">
+
                     <TextView
                         android:id="@+id/user_secret_desc"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="30dp"
                         android:lineHeight="20dp"
-                            tools:text="感谢您信任并使用壹点灵APP，\n
-我们深知个人隐私的重要性，为了您更好的使用本APP，希望您着重关注：\n\n1. 为向您提供交易相关基本功能，我们会收集、使用必要的信息;\n
-2. 基于您的明示授权，我们可能会获取您的位置(为您提供附近的咨询师等)、设备号信息(以保障您账号与交易安全)等信息，您有权拒绝或取消授权;\n
-3. 我们会采业界先进的安全措施保护您的信息安全;\n
-4. 未经您同意，我们不会从第三方处获取、共享或向其提供您的信息;\n
-5. 您可以查询、更正、删除您的个人信息。"
-                            android:textColor="#444444"
-                            android:textSize="14dp"/>
+                        android:textColor="#666666"
+                        android:textSize="15sp"
+                        tools:text="尊敬的用户，应最新的法律法规及监管政策要求，向您推送以下说明\n
+1、您可通过《隐私保护政策》了解我们
+会收集哪些个人信息，如何使用，储
+存信息等事项；\n
+2、我们会采取严格的数据安全保障措施保护您的信息安全；\n
+3、点击“同意”，我们将严格按照《隐私保护政策》为您提供服务；
+" />
 
                 </RelativeLayout>
             </ScrollView>
+
             <View
-                    android:background="@drawable/user_secret_dectription_bg"
+                android:layout_width="match_parent"
+                android:layout_height="30dp"
                 android:layout_alignParentBottom="true"
-                    android:layout_width="match_parent" android:layout_height="30dp"/>
+                android:background="@drawable/user_secret_dectription_bg" />
 
         </RelativeLayout>
 
 
         <TextView
             android:id="@+id/tv_content"
-                android:layout_marginTop="15dp"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginLeft="25dp"
+            android:layout_marginTop="15dp"
             android:layout_marginRight="25dp"
-                android:text="阅读完整版《用户使用协议》、《隐私保护政策》"
+            android:text="阅读完整版《用户使用协议》、\n《隐私保护政策》"
             android:textColor="#444444"
-                android:textSize="14dp"/>
+            android:textSize="15sp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="25dp"
+            android:layout_marginTop="@dimen/platform_dp_3"
+            android:layout_marginRight="25dp"
+            android:text="了解全部的条款内容"
+            android:textColor="#666666"
+            android:textSize="15sp">
 
+        </TextView>
         <!--<TextView-->
         <!--android:layout_width="wrap_content"-->
         <!--android:layout_height="wrap_content"-->
@@ -134,38 +125,39 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-                android:layout_marginTop="15dp"
-                android:layout_marginBottom="24dp"
             android:layout_alignParentBottom="true"
             android:layout_marginLeft="25dp"
+            android:layout_marginTop="30dp"
             android:layout_marginRight="25dp"
-                android:orientation="vertical"
-                android:background="#ffffff">
-
-            <TextView
-                    android:id="@+id/user_secret_agree"
-                    android:layout_width="match_parent"
-                    android:layout_height="44dp"
-                    android:layout_weight="1"
-                    android:background="@drawable/user_secret_right_btn_bg"
-                    android:gravity="center"
-                    android:text="同意"
-                    android:textColor="#FFFFFF"
-                    android:textSize="16dp"/>
+            android:layout_marginBottom="24dp"
+            android:background="#ffffff"
+            android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/user_secret_no_agree"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="10dp"
                 android:layout_weight="1"
+                android:background="@drawable/user_secret_left_btn_bg"
                 android:gravity="center"
                 android:text="拒绝"
                 android:textColor="#999999"
                 android:textSize="16dp" />
 
+            <TextView
+                android:id="@+id/user_secret_agree"
+                android:layout_width="0dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="@dimen/platform_dp_10"
+                android:layout_weight="1"
+                android:background="@drawable/user_secret_right_btn_bg"
+                android:gravity="center"
+                android:text="同意"
+                android:textColor="#FFFFFF"
+                android:textSize="16dp"
+                android:textStyle="bold" />
         </LinearLayout>
-
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

ydl-platform/src/main/java/com/ydl/ydlcommon/base/BaseActivity.kt

@@ -10,7 +10,6 @@ import android.util.Log
 import android.view.View
 import android.view.ViewGroup
 import android.widget.FrameLayout
-import android.widget.LinearLayout
 import com.trello.rxlifecycle2.android.ActivityEvent
 import com.ydl.ydlcommon.R
 import com.ydl.ydlcommon.base.lifecycle.IActivityLifecycleable
@@ -19,7 +18,6 @@ import com.ydl.ydlcommon.ui.LoadingDialogFragment
 import com.ydl.ydlcommon.utils.ActivityManager
 import com.ydl.ydlcommon.utils.AndroidSystemHelper
 import com.ydl.ydlcommon.utils.StatusBarUtils
-import com.yidianling.common.tools.RxImageTool
 import io.reactivex.subjects.BehaviorSubject
 import io.reactivex.subjects.Subject
 import kotlin.properties.Delegates