Skip to content

S
ShenghuoquanBusiness
Commit 78608c60 authored by shiyl's avatar shiyl
Browse files
Options

add 管理员更换页面添加用户协议

parent 7a31e9e6
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 76 deletions
Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/personnel/ui/ManagerChangeActivity.kt
View file @ 78608c60
package com.yidian.shenghuoquan.newscontent.personnel.ui
import android.content.Intent
import android.graphics.Color
import android.os.Bundle
import android.text.SpannableStringBuilder
import android.text.Spanned
import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan
import android.text.style.ForegroundColorSpan
import android.view.View
import androidx.core.content.ContextCompat
import com.yidian.common.AppConfig
import com.yidian.common.XRouterPathConstants
import com.yidian.common.XRouterPathConstants.Companion.PERSONAL_MANAGER_CHANGE
import com.yidian.common.base.BaseActivity
......@@ -17,10 +24,12 @@ import com.yidian.shenghuoquan.newscontent.personnel.http.PersonalRemoteDataSour
import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalChangeAccountCallBack
import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalCheckSmsCodeCallBack
import com.yidian.shenghuoquan.newscontent.personnel.http.callback.IPersonalGetSmsCodeCallBack
import com.yidian.shenghuoquan.newscontent.ui.ProtocolActivity
import com.yidian.shenghuoquan.newscontent.ui.dialog.HintDialog
import com.yidian.shenghuoquan.newscontent.utils.CountDownTimerUtils
import com.yidian.shenghuoquan.newscontent.utils.TextWatcherAdapter
import com.yidian.utils.ToastUtil
import com.yidian.xpage.XPageManager
/**
* 人员管理 —— 管理员变更
......@@ -67,6 +76,8 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
}
// 按钮不可点
setChangeButtonStatus(false)
// 初始化用户协议
initUserProtocol()
// 初始化倒计时
mCountDownTimerUtils = CountDownTimerUtils(viewBind.tvGetCode, 60000, 1000)
}
......@@ -158,19 +169,31 @@ class ManagerChangeActivity : BaseActivity<ActivityManagerChangeBinding>() {
PersonalRemoteDataSource.getChangeManager(getChangeAccountCallBack, paramsMap)
}
// viewBind.cbProtocol.setOnCheckedChangeListener { buttonView, isChecked ->
// protocolAgree = isChecked
// changeLoginButtonStatus()
// }
//
// viewBind.tvProtocol.setOnClickListener {
// ToastUtil.showToast(this, "用户协议")
// }
//
// viewBind.tvPrivacy.setOnClickListener {
// ToastUtil.showToast(this, "隐私政策")
// XPageManager.push(XRouterPathConstants.LIFE_ACCOUNT_IDENTITY, null)
// }
}
private fun initUserProtocol() {
val builder = SpannableStringBuilder().also {
it.append(resources.getString(R.string.manager_register_tips))
it.setSpan(ForegroundColorSpan(Color.parseColor("#1852F1")), 28, 39, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
it.setSpan(object : ClickableSpan() {
override fun onClick(widget: View) {
// todo 待修改为用户协议
val urlMap = HashMap<String, String>()
urlMap[ProtocolActivity.ProtocolUrlKey] = AppConfig.privacyPolicyStatement
XPageManager.push(XRouterPathConstants.PROTOCOL, urlMap)
}
}, 28, 33, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
it.setSpan(object : ClickableSpan() {
override fun onClick(widget: View) {
// todo 待修改为隐私政策
val urlMap = HashMap<String, String>()
urlMap[ProtocolActivity.ProtocolUrlKey] = AppConfig.privacyPolicyStatement
XPageManager.push(XRouterPathConstants.PROTOCOL, urlMap)
}
}, 33, 39, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
}
viewBind.tvRegisterTips.movementMethod = LinkMovementMethod.getInstance()
viewBind.tvRegisterTips.text = builder
}
/**
......
Components/newscontent/src/main/res/layout/activity_login.xml
View file @ 78608c60
......@@ -80,7 +80,7 @@
android:textSize="14sp" />
<EditText
android:id="@+id/et_old_code"
android:id="@+id/et_code"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="17dp"
......
Components/newscontent/src/main/res/layout/activity_manager_change.xml
View file @ 78608c60
......@@ -233,13 +233,13 @@
android:layout_height="44dp"
android:layout_marginStart="40dp"
android:layout_marginTop="20dp"
android:visibility="gone"
android:layout_marginEnd="40dp"
android:background="@drawable/account_btn_gradient_bg"
android:gravity="center"
android:text="确认更换"
android:textColor="@color/white"
android:textSize="18sp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_change_tips" />
......@@ -253,7 +253,7 @@
android:layout_marginEnd="@dimen/dp20"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="visible"
android:visibility="invisible"
app:layout_constraintEnd_toEndOf="@id/gl_right"
app:layout_constraintStart_toStartOf="@id/gl_left"
app:layout_constraintTop_toBottomOf="@id/tv_change_account">
......@@ -264,66 +264,8 @@
android:layout_height="wrap_content"
android:src="@drawable/icon_square_checked" />
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_marginStart="@dimen/dp10"-->
<!-- android:orientation="vertical">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_register_tips1"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="match_parent"-->
<!-- android:autoSizeMaxTextSize="12sp"-->
<!-- android:autoSizeMinTextSize="2sp"-->
<!-- android:autoSizeTextType="uniform"-->
<!-- android:maxLines="1"-->
<!-- android:text="@string/manager_register_tips1"-->
<!-- android:textColor="@color/color_999999"-->
<!-- android:textSize="@dimen/sp12"-->
<!-- tools:ignore="UnusedAttribute" />-->
<!-- <LinearLayout-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:orientation="horizontal">-->
<!-- <TextView-->
<!-- android:id="@+id/tv_register_tips2"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/manager_register_tips2"-->
<!-- android:textColor="@color/color_999999"-->
<!-- android:textSize="@dimen/sp12" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_user_agreement"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/user_agreement"-->
<!-- android:textColor="@color/color_1852F1"-->
<!-- android:textSize="@dimen/sp12" />-->
<!-- <TextView-->
<!-- android:id="@+id/tv_privacy_policy"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="@string/manager_privacy_policy"-->
<!-- android:textColor="@color/color_1852F1"-->
<!-- android:textSize="@dimen/sp12" />-->
<!-- <TextView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="。"-->
<!-- android:textColor="@color/color_999999"-->
<!-- android:textSize="@dimen/sp12" />-->
<!-- </LinearLayout>-->
<!-- </LinearLayout>-->
<TextView
android:id="@+id/tv_register_tips1"
android:id="@+id/tv_register_tips"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp10"
......@@ -331,7 +273,6 @@
android:textColor="@color/color_999999"
android:textSize="@dimen/sp12" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
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