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

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

@@ -23,9 +23,6 @@ object UserHelper {
     private val user_setting_name_sp = "ydl_user_setting"
     private val user_setting_key_sp = "ydl_user_setting_key"
 
-    // 存储用户的手机号
-    public const val USER_PHONE = "user_phone"
-
     //用户信息//缓存
     private var userTemp: UserResponseBean? = null
 
@@ -38,8 +35,6 @@ object UserHelper {
             userTemp = userInfo
             var str = gson.toJson(userTemp)
             SharedPreferencesEditor.putFileString(user_info_name_sp, user_info_key_sp, str)
-            // 存储登录所使用的手机号
-            SharedPreferencesEditor.putString(USER_PHONE,userInfo?.userInfo?.phone)
 
             UserInfoCache.getInstance().saveYDLUser("\"" + userInfo?.uid + "\"",
                     userInfo?.userInfo?.nick_name, userInfo?.userInfo?.head)

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

@@ -9,7 +9,6 @@ import com.ydl.ydlcommon.data.http.BaseResponse
 import com.yidianling.user.api.bean.UserResponseBean
 import com.yidianling.user.bean.CollectFocusItemBean
 import com.yidianling.user.http.response.*
-import com.yidianling.user.mine.bean.RedPackDataForRegister
 import com.yidianling.user.mine.bean.RedPacketId
 import io.reactivex.Observable
 import okhttp3.RequestBody
@@ -120,6 +119,7 @@ interface UserApi {
     //检查手机号来源
     @GET("user/phone_detection")
     @Headers( YDL_DOMAIN+ YDL_DOMAIN_JAVA)
+//    @Headers("Content-type:application/json;charset=UTF-8","userPort:1")
     fun checkPhoneStatus(@Query("phone") phone: String, @Query("countryCode") countryCode: String): Observable<BaseResponse<ChcekPhoneResponeBean>>
 
     //服务端校验阿里一键认证

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

@@ -9,6 +9,7 @@ import android.widget.ImageView
 import android.widget.RelativeLayout
 import android.widget.TextView
 import com.alibaba.android.arouter.launcher.ARouter
+import com.meituan.android.walle.WalleChannelReader
 import com.mobile.auth.gatewayauth.*
 import com.mobile.auth.gatewayauth.model.TokenRet
 import com.ydl.ydlcommon.base.BaseActivity
@@ -36,6 +37,7 @@ object OneKeyLoginHelp {
     var mIsOpenOneKeyLogin = false   // 是否开启一键登录
     var mIsFromGuide = true
     var mAuthType = PhoneNumberAuthHelper.SERVICE_TYPE_LOGIN              // 1：本机号码校验 2: ⼀键登录
+    private var checkBoxHidden = true         // 协议勾选框是否展示
     private lateinit var mActivity: BaseActivity
 
 
@@ -54,6 +56,10 @@ object OneKeyLoginHelp {
                 it.setAuthSDKInfo(YDL_EXPERT_APP_KEY)
             }
         }
+        // 获取渠道
+        val channel = WalleChannelReader.getChannel(activity)
+        checkBoxHidden = !(channel=="huawei"||channel=="vivo")
+
     }
 
     /**
@@ -234,7 +240,7 @@ object OneKeyLoginHelp {
                 .setAppPrivacyOne(appPrivacyOneTip, appPrivacyOne)
                 .setAppPrivacyTwo("隐私协议", appPrivacyTwo)
                 .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))
-//                .setCheckboxHidden(true) //  设置是否同意协议的checkbox隐藏
+                .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
                 .setPrivacyBefore("登录即代表您同意")
                 .setScreenOrientation(ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT) //  设置竖屏
                 .setAuthPageActIn("in_activity", "out_activity")
@@ -282,7 +288,7 @@ object OneKeyLoginHelp {
                 .setAppPrivacyOne("壹点灵用户使用协议", "https://h5.ydl.com/SDUserProtol")
                 .setAppPrivacyTwo("隐私协议", "https://m.ydl.com/Protol/yinsi")
                 .setAppPrivacyColor(Color.parseColor("#999999"), Color.parseColor("#1da1f2"))
-//                .setCheckboxHidden(true) //  设置是否同意协议的checkbox隐藏
+                .setCheckboxHidden(checkBoxHidden) //  设置是否同意协议的checkbox隐藏
                 .setPrivacyBefore("登录即代表您同意")
                 .setDialogHeight(dialogHeight)
                 .setDialogBottom(true)

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

@@ -180,11 +180,6 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
                 when (tokenRet.code) {
                     ResultCode.CODE_ERROR_ENV_CHECK_SUCCESS->{             //  终端环境支持认证
                         isCanAuth =true
-                        val phone = SharedPreferencesEditor.getString(UserHelper.USER_PHONE)
-                        phone?.let {
-                            et_phone_number.setSelection(phone.length)
-                            iv_del.visibility = View.VISIBLE
-                        }
                     }
                     ResultCode.CODE_SUCCESS -> {                          // 获取token成功
                         val aliAuthBean = AliAuthBean()