Commit 0fcf3c2a by 刘鹏

feat : 登录提示文案修改,获取国家接口修复

parent d3075dc6
...@@ -8,7 +8,7 @@ ext { ...@@ -8,7 +8,7 @@ ext {
"m-confide" : "0.0.49.10", "m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91", "m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.03", "m-fm" : "0.0.30.03",
"m-user" : "0.0.61.63", "m-user" : "0.0.61.65",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.19.75", "m-im" : "0.0.19.75",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
...@@ -91,7 +91,7 @@ ext { ...@@ -91,7 +91,7 @@ ext {
"m-confide" : "0.0.49.10", "m-confide" : "0.0.49.10",
"m-consultant" : "0.0.59.91", "m-consultant" : "0.0.59.91",
"m-fm" : "0.0.30.01", "m-fm" : "0.0.30.01",
"m-user" : "0.0.61.63", "m-user" : "0.0.61.65",
"m-home" : "0.0.22.70", "m-home" : "0.0.22.70",
"m-im" : "0.0.19.75", "m-im" : "0.0.19.75",
"m-dynamic" : "0.0.7.28", "m-dynamic" : "0.0.7.28",
......
...@@ -27,7 +27,7 @@ interface UserApi { ...@@ -27,7 +27,7 @@ interface UserApi {
//国家列表 //国家列表
@FormUrlEncoded @FormUrlEncoded
@POST("api/user/country-list") @POST("user/country-list")
fun countryList(@Field(YDLConstants.HOLDER_PARAM ) params: String): Observable<BaseResponse<CountryResponse>> fun countryList(@Field(YDLConstants.HOLDER_PARAM ) params: String): Observable<BaseResponse<CountryResponse>>
//判断手机号是否存在 //判断手机号是否存在
......
...@@ -249,7 +249,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont ...@@ -249,7 +249,7 @@ class RegisterAndLoginActivity : BaseMvpActivity<ILoginContract.View, ILoginCont
//下一步 //下一步
ll_next.setOnClickListener { ll_next.setOnClickListener {
if (iv_select_protocol.visibility == View.VISIBLE && !isAgreeProtocol) { if (iv_select_protocol.visibility == View.VISIBLE && !isAgreeProtocol) {
ToastUtil.toastShort("请您先同意壹点灵《用户使用协议》、《隐私保护政策》,才能登录使用") ToastUtil.toastShort("请阅读并勾选页面协议")
return@setOnClickListener return@setOnClickListener
} }
if (checkPhone()) { if (checkPhone()) {
......
...@@ -181,8 +181,8 @@ ...@@ -181,8 +181,8 @@
<ImageView <ImageView
android:id="@+id/iv_select_protocol" android:id="@+id/iv_select_protocol"
android:layout_width="wrap_content" android:layout_width="16dp"
android:layout_height="wrap_content" android:layout_height="16dp"
android:src="@drawable/user_login_protocol_unselected_new" /> android:src="@drawable/user_login_protocol_unselected_new" />
<TextView <TextView
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment