Skip to content

A
android_vediosocial
Commit f292b393 authored by 595163050's avatar 595163050
Browse files
Options

修改真人认证时，返回修改二维码路径问题

parent 60a64dbc
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 12 deletions
video/app/build.gradle
View file @ f292b393
......@@ -15,8 +15,8 @@ android {
applicationId "com.duben.loveplayletd"
minSdkVersion rootProject.ext.androidMinSdkVersion
targetSdkVersion rootProject.ext.androidTargetSdkVersion
versionCode 808
versionName "8.0.8"
versionCode 809
versionName "8.0.9"
flavorDimensions "default"
// dex突破65535的限制
......
video/app/src/main/java/com/duben/loveplayletd/ui/activitys/RealAuthActivity.kt
View file @ f292b393
......@@ -68,7 +68,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
private var mStep = 1
private var isEnterFlag = false
// private var isEnterFlag = false
private var isWechatQrCodeUrl = false
private var wechatQrCodeUrl = ""
private var readAuthImageUrl = ""
......@@ -107,6 +107,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
changeStepStatus(1)
}
realAuthPresenter.getFacePage()
}
......@@ -202,15 +203,19 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
finish()
}
}
R.id.iv_next_step -> {
doStep()
}
R.id.iv_auth -> {
showAlbum()
}
R.id.iv_wechat_qrcode -> {
showAlbum()
}
R.id.layout_sg -> {
val defaultValue = if (TextUtils.isEmpty(userProfileData?.userHeight)) {
"170CM"
......@@ -219,6 +224,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
}
showPickDialog(UserProfile.PROFILE_SG.str, defaultValue)
}
R.id.layout_tz -> {
val defaultValue = if (TextUtils.isEmpty(userProfileData?.bodyWeight)) {
"50KG"
......@@ -227,15 +233,19 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
}
showPickDialog(UserProfile.PROFILE_TZ.str, defaultValue)
}
R.id.layout_sx -> {
showPickDialog(UserProfile.PROFILE_SX.str, userProfileData?.appearance)
}
R.id.layout_jyfw -> {
showAddressDialog()
}
R.id.layout_zy -> {
showJobPick()
}
R.id.layout_gxbq -> {
val bundle = Bundle()
userProfileData?.let {
......@@ -269,8 +279,10 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
ll_step3.visibility = View.GONE
ll_step4.visibility = View.GONE
}
2 -> {
}
3 -> {
tv_step_1.setBackgroundResource(R.drawable.shape_orange_round)
tv_step_2.setBackgroundResource(R.drawable.shape_orange_round)
......@@ -285,6 +297,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
ll_step4.visibility = View.GONE
realAuthPresenter.getUserInfo()
}
4 -> {
tv_step_1.setBackgroundResource(R.drawable.shape_orange_round)
tv_step_2.setBackgroundResource(R.drawable.shape_orange_round)
......@@ -311,6 +324,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
luban(readAuthImageUrl)
}
}
2 -> {}
3 -> {
userProfileData?.let {
......@@ -342,6 +356,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
realAuthPresenter.setUserInfo(it)
}
}
4 -> {
if (TextUtils.isEmpty(et_wechat_no.text.toString())) {
showToast("请输入您的微信号")
......@@ -353,13 +368,14 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
return
}
if (isEnterFlag) {
readyGo(FollowWechatActivity::class.java)
} else {
luban(wechatQrCodeUrl)
}
// if (isEnterFlag) {
// readyGo(FollowWechatActivity::class.java)
// } else {
luban(wechatQrCodeUrl)
// }
}
else -> {}
}
}
......@@ -501,6 +517,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
})
mSinglePickDialog?.show()
}
UserProfile.PROFILE_TZ.str -> {
mSinglePickDialog = SinglePickDialog(
this,
......@@ -517,6 +534,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
})
mSinglePickDialog?.show()
}
UserProfile.PROFILE_SX.str -> {
mSinglePickDialog = SinglePickDialog(
this,
......@@ -533,6 +551,7 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
})
mSinglePickDialog?.show()
}
else -> {}
}
}
......@@ -544,18 +563,23 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
UserProfile.PROFILE_SG.str -> {
UserProfile.PROFILE_SG.arr
}
UserProfile.PROFILE_TZ.str -> {
UserProfile.PROFILE_TZ.arr
}
UserProfile.PROFILE_SX.str -> {
UserProfile.PROFILE_SX.arr
}
UserProfile.PROFILE_JYFW.str -> {
UserProfile.PROFILE_JYFW.arr
}
UserProfile.PROFILE_ZY.str -> {
UserProfile.PROFILE_ZY.arr
}
else -> {
UserProfile.UNKNOWN.arr
}
......@@ -620,12 +644,19 @@ class RealAuthActivity : BaseActivity(), View.OnClickListener, RealAuthView {
}
override fun setWechatQRCodeSuc() {
this.isEnterFlag = true
// this.isEnterFlag = true
et_wechat_no.setText("")
wechatQrCodeUrl = ""
iv_wechat_qrcode.setImageResource(R.drawable.iv_add_images_add)
showToast("恭喜您完成真人认证！")
readyGo(FollowWechatActivity::class.java)
}
override fun setWechatQRCodeFail() {}
override fun setWechatQRCodeFail() {
et_wechat_no.setText("")
wechatQrCodeUrl = ""
iv_wechat_qrcode.setImageResource(R.drawable.iv_add_images_add)
}
private fun showAlbum() {
val windowAnimationStyle = PictureWindowAnimationStyle()
......
video/app/src/main/res/layout/activity_real_auth.xml
View file @ f292b393
......@@ -224,7 +224,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="30dp"
android:text="添加联系方式"
android:text="添加微信号"
android:textColor="@color/white"
android:textSize="18sp" />
......@@ -242,7 +242,7 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginTop="20dp"
android:text="添加联系方式"
android:text="添加微信号"
android:textColor="@color/white"
android:textSize="18sp" />
......
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