From ec0a0c29028fe95e17959adf29c8b2ff71fe65c9 Mon Sep 17 00:00:00 2001 From: lijia Date: Tue, 18 Jun 2024 16:07:25 +0800 Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=8D=8F=E8=AE=AE=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../push/TagAliasOperatorHelper.java | 4 +- .../ui/account/LoginActivity.kt | 57 +++++++++++++++++-- .../utils/UserUtils.kt | 2 +- app/src/main/res/layout/activity_login.xml | 4 +- 4 files changed, 59 insertions(+), 8 deletions(-) diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java index 757567c..c7e4a6b 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/push/TagAliasOperatorHelper.java @@ -52,7 +52,7 @@ public class TagAliasOperatorHelper { } logs += ", errorCode:" + jPushMessage.getErrorCode(); Log.e(TAG, logs); - ToastUtils.showToast(context,logs); +// ToastUtils.showToast(context,logs); } } public void onCheckTagOperatorResult(Context context, JPushMessage jPushMessage){ @@ -66,7 +66,7 @@ public class TagAliasOperatorHelper { }else{ String logs = "Failed to modify tags, errorCode:" + jPushMessage.getErrorCode(); Log.e(TAG, logs); - ToastUtils.showToast(context,logs); +// ToastUtils.showToast(context,logs); } } public void onAliasOperatorResult(Context context, JPushMessage jPushMessage) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/LoginActivity.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/LoginActivity.kt index 6f561a6..ce66958 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/LoginActivity.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/account/LoginActivity.kt @@ -4,12 +4,19 @@ import android.Manifest import android.content.Context import android.content.Intent import android.os.Bundle +import android.text.TextPaint +import android.text.method.LinkMovementMethod +import android.text.style.ClickableSpan import android.util.Log import android.view.View +import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import androidx.core.text.toSpannable import com.arpa.glex.bean.UserBean +import com.arpa.hndahesudintocctmsdriver.R import com.arpa.hndahesudintocctmsdriver.base.AppConfig +import com.arpa.hndahesudintocctmsdriver.base.WebActivity import com.arpa.hndahesudintocctmsdriver.databinding.ActivityLoginBinding import com.arpa.hndahesudintocctmsdriver.event.RefreshEvent import com.arpa.hndahesudintocctmsdriver.net.BaseObserver @@ -67,17 +74,59 @@ class LoginActivity : BaseActivity(), View.OnClickListener binding.ok.setOnClickListener(this) binding.imgHead.setOnLongClickListener { - // TODO: 调试图片上传 -// ActivityUtils.startActivity(mContext, AuthTrailerActivity::class.java,Bundle().apply { -// putString(AppConfig.CAR_ID,"25") -// }) ActivityUtils.startActivity(mContext, SelectRoleActivity::class.java) // ActivityUtils.startActivity(mContext, HomeActivity::class.java) return@setOnLongClickListener true } + dealAgreement() + } + private fun dealAgreement(){ + val toSpannable = binding.tvContent.text.toSpannable() + toSpannable.run { + val start = indexOf("《") + setSpan(object : ClickableSpan(){ + override fun onClick(widget: View) { + //用户服务协议点击事件 + startActivity(Intent(this@LoginActivity, WebActivity::class.java).apply { + putExtra("url", "http://agreement.dahehuoyun.com/huawei/#/private") + putExtra("title", "用户服务协议") + }) + } + + override fun updateDrawState(ds: TextPaint) { + super.updateDrawState(ds) + ds.color = resources.getColor(R.color.theme_color, null) + // 去掉下划线 + ds.isUnderlineText = false + } + }, start, start + 8, 0) + + val end = lastIndexOf("《") + + setSpan(object : ClickableSpan(){ + override fun onClick(widget: View) { + //用户服务协议点击事件 + startActivity(Intent(this@LoginActivity, WebActivity::class.java).apply { + putExtra("url", "http://agreement.dahehuoyun.com/#/user") + putExtra("title", "隐私政策") + }) + } + + override fun updateDrawState(ds: TextPaint) { + super.updateDrawState(ds) + ds.color = resources.getColor(R.color.theme_color, null) + // 去掉下划线 + ds.isUnderlineText = false + } + }, end, end + 6, 0) + } + binding.tvContent.run { + movementMethod = LinkMovementMethod.getInstance() + setText(toSpannable, TextView.BufferType.SPANNABLE) + } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/UserUtils.kt b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/UserUtils.kt index f5bb37e..598e615 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/UserUtils.kt +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/utils/UserUtils.kt @@ -50,7 +50,7 @@ class UserUtils private constructor() { fun loginIn(context: Context, userBean: UserBean) { SPUtils.instance.setUserInfo(context, Gson().toJson(userBean)) //设置推送别名 -// PushHelper.setAlias(context, userBean) + PushHelper.setAlias(context, userBean) // ActivityUtils.startActivity( // context, diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 9bf577a..8d44e86 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -98,6 +98,7 @@ android:textSize="@dimen/sp_15" />