fix：跳过按钮展示

config.gradle

@@ -8,7 +8,7 @@ ext {
             "m-confide"       : "0.0.49.74",
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
-            "m-user"          : "0.0.62.23",
+            "m-user"          : "0.0.62.30",
             "m-home"          : "0.0.23.48",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
@@ -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.20",
             "m-home-api"      : "0.0.4.2",
             "m-im-api"        : "0.0.12.24",
             "m-dynamic-api"   : "0.0.3.71",
@@ -93,7 +93,7 @@ ext {
             "m-confide"       : "0.0.49.74",
             "m-consultant"    : "0.0.60.25",
             "m-fm"            : "0.0.30.08",
-            "m-user"          : "0.0.62.23",
+            "m-user"          : "0.0.62.30",
             "m-home"          : "0.0.23.48",
             "m-im"            : "0.0.21.44",
             "m-dynamic"       : "0.0.7.73",
@@ -110,7 +110,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.20",
             "m-home-api"      : "0.0.4.2",
             "m-im-api"        : "0.0.12.24",
             "m-dynamic-api"   : "0.0.3.71",

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

@@ -113,7 +113,6 @@ interface UserApi {
     fun privacyAgree(@Query("uid") uid: String): Observable<BaseResponse<Any>>
 
 
-
     //服务端校验阿里一键认证
     @POST("phone/verification/init")
     fun checkAliAuth(@Body body: RequestBody): Observable<BaseResponse<PhoneAuthResponseBean>>
@@ -122,6 +121,10 @@ interface UserApi {
     @GET("site/get-privacy-content")
     fun getSecretData(): Observable<BaseResponse<SecretResponse>>
 
+    //获取隐私政策数据
+    @GET("config/queryConfigVaule?configKey=user_privacy_content")
+    fun getSecretJavaData(): Observable<BaseResponse<String>>
+
     //获取红包单号
     @FormUrlEncoded
     @POST("uc/ready-bonus")
@@ -130,7 +133,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,6 +63,7 @@ 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>
 
@@ -70,6 +71,8 @@ interface UserHttp {
 
     fun getSecretData(): Observable<BaseResponse<SecretResponse>>
 
+    fun getSecretJavaData(): Observable<BaseResponse<String>>
+
     fun getRedPacketId(param: RedPacketIdCmd): Observable<BaseResponse<RedPacketId>>
 
     fun userInfoCollectUpload(param: UserInfoCollectUploadParam): Observable<BaseAPIResponse<Any>>

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

@@ -209,6 +209,10 @@ class UserHttpImpl private constructor() : UserHttp {
         return getUserApi().getSecretData()
     }
 
+    override fun getSecretJavaData(): Observable<BaseResponse<String>> {
+        return getUserApi().getSecretJavaData()
+    }
+
     override fun getRedPacketId(param: RedPacketIdCmd): Observable<BaseResponse<RedPacketId>> {
         return RxUtils.mapObservable(param)
             .flatMap { getUserApi().getRedPacketId(it) }

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/RegisterAndLoginActivity.kt

@@ -718,7 +718,11 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
         if (isFromGuide) {
             LoginUtils.setLoginCallBack(null)
             ActivityManager.finishOtherActivity(this)
-            UserIn.mainIntent(this, 4)
+            if (StatusUtils.isFirstStartApp) {
+                UserIn.mainIntent(this, 0)
+            } else {
+                UserIn.mainIntent(this, 4)
+            }
             finish()
         } else if (isFromOneKeyLogin) {        // 来自一键登录界面
             // 如果已经登录