Commit 7755a575 by zhangchengbo

fix:优化手机号脱敏展示逻辑

parent 179394eb
......@@ -16,6 +16,7 @@ import com.secspace.sms.databinding.ItemConversationBinding
import com.secspace.sms.extensions.config
import com.secspace.sms.extensions.getAllDrafts
import com.secspace.sms.models.Conversation
import com.secspace.sms.util.PhoneFromUtil
import com.secspace.sms.util.PhoneUtils
import com.simplemobiletools.commons.adapters.MyRecyclerViewListAdapter
import com.simplemobiletools.commons.extensions.*
......@@ -130,7 +131,7 @@ abstract class BaseConversationsAdapter(
conversationAddress.apply {
Log.d(TAG, "setupView: conversation = ${Gson().toJson(conversation)}")
text = if(conversation.userName.isNotEmpty()){
text = if(conversation.userName.isNotEmpty() && !PhoneFromUtil.isNumeric(conversation.userName)){
conversation.userName
} else if (conversation.phoneNumber.contains("**")) {
conversation.phoneNumber
......@@ -147,7 +148,7 @@ abstract class BaseConversationsAdapter(
phoneNumber.replace("+86", "")
}
PhoneUtils.phoneNumberFormat(phoneNumber) { itNumber ->
text = conversation.userName.ifEmpty { itNumber }
text = if(conversation.userName.isNotEmpty() && !PhoneFromUtil.isNumeric(conversation.userName)) conversation.userName else itNumber
}
}
}
......
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