Commit cafab03a by zhangchengbo

feat:添加短信号码对手机通话记录检索对比,2.检索为顺丰号码再次对短信记录进行检索对比进行掩码操作

parent 62f6203e
...@@ -6,7 +6,6 @@ import android.content.Intent ...@@ -6,7 +6,6 @@ import android.content.Intent
import android.os.Handler import android.os.Handler
import android.os.Looper import android.os.Looper
import android.provider.Telephony import android.provider.Telephony
import android.util.Log
import com.secspace.sms.extensions.* import com.secspace.sms.extensions.*
import com.secspace.sms.helpers.RecentsHelper import com.secspace.sms.helpers.RecentsHelper
import com.secspace.sms.helpers.refreshMessages import com.secspace.sms.helpers.refreshMessages
...@@ -23,7 +22,6 @@ import com.simplemobiletools.commons.helpers.SimpleContactsHelper ...@@ -23,7 +22,6 @@ import com.simplemobiletools.commons.helpers.SimpleContactsHelper
import com.simplemobiletools.commons.helpers.ensureBackgroundThread import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.models.PhoneNumber import com.simplemobiletools.commons.models.PhoneNumber
import com.simplemobiletools.commons.models.SimpleContact import com.simplemobiletools.commons.models.SimpleContact
import com.simplemobiletools.commons.util.GsonUtil
class SmsReceiver : BroadcastReceiver() { class SmsReceiver : BroadcastReceiver() {
private val TAG: String = "shuju" private val TAG: String = "shuju"
...@@ -100,8 +98,9 @@ class SmsReceiver : BroadcastReceiver() { ...@@ -100,8 +98,9 @@ class SmsReceiver : BroadcastReceiver() {
if (lastNumber.isNotBlank()) { if (lastNumber.isNotBlank()) {
conversation.phoneNumber = lastNumber conversation.phoneNumber = lastNumber
conversation.isSFNumber = true
} }
Log.e(TAG, "----handleConversation----handleConversation 掩码后的 Json:${GsonUtil.parseBeanToJson(conversation)}") // Log.e(TAG, "----SmsReceiver----handleConversation 掩码后的 Json:${GsonUtil.parseBeanToJson(conversation)}")
try { try {
context.insertOrUpdateConversation(conversation) context.insertOrUpdateConversation(conversation)
} catch (ignored: Exception) { } catch (ignored: Exception) {
...@@ -161,7 +160,7 @@ class SmsReceiver : BroadcastReceiver() { ...@@ -161,7 +160,7 @@ class SmsReceiver : BroadcastReceiver() {
subscriptionId subscriptionId
) )
} }
Log.e(TAG, "----handleMessage----handleMessage message:${GsonUtil.parseBeanToJson(message)}") // Log.e(TAG, "----SmsReceiver----handleMessage message:${GsonUtil.parseBeanToJson(message)}")
context.messagesDB.insertOrUpdate(message) context.messagesDB.insertOrUpdate(message)
if (context.config.isArchiveAvailable) { if (context.config.isArchiveAvailable) {
context.updateConversationArchivedStatus(threadId, false) context.updateConversationArchivedStatus(threadId, false)
...@@ -193,33 +192,26 @@ class SmsReceiver : BroadcastReceiver() { ...@@ -193,33 +192,26 @@ class SmsReceiver : BroadcastReceiver() {
RecentsHelper(context = context).getRecentCalls(false, Int.MAX_VALUE) { recents: List<RecentCall> -> RecentsHelper(context = context).getRecentCalls(false, Int.MAX_VALUE) { recents: List<RecentCall> ->
val listCallRecent = recents.distinctBy { it.phoneNumber } val listCallRecent = recents.distinctBy { it.phoneNumber }
Log.e(TAG, "----SmsReceiver----最近通话 recents:${listCallRecent} disListSize:${listCallRecent.size}") // Log.e(TAG, "----SmsReceiver----最近通话 recents:${listCallRecent} disListSize:${listCallRecent.size}")
val findResult: Int = listCallRecent.count { it.phoneNumber.trim() == phoneNumber.trim() } val findResult: Int = listCallRecent.count { it.phoneNumber.trim() == phoneNumber.trim() }
//从最近通话记录中找到了号码 进行掩码操作 //从最近通话记录中找到了号码 进行掩码操作
if (findResult > 0) { if (findResult > 0) {
//获取所有短信 //获取所有短信
val allConversations = context.conversationsDB.getNonArchived() as ArrayList<Conversation> val allConversations = context.conversationsDB.getNonArchived() as ArrayList<Conversation>
Log.e(TAG, " 获取DB 短信列表 allConversations:${GsonUtil.parseListToJson(allConversations)}")
val searchResult = getIndexById(allConversations, threadId) val searchResult = getIndexById(allConversations, threadId)
Log.e(TAG, "----SmsReceiver----手机号掩码操作 searchResult:${searchResult}")
if (searchResult < 0) return@getRecentCalls if (searchResult < 0) return@getRecentCalls
allConversations.forEach { allConversations.forEach {
if (it.threadId == threadId && it.phoneNumber == phoneNumber) { if (it.threadId == threadId && it.phoneNumber == phoneNumber) {
PhoneUtils.phoneNumberFormat(phoneNumber) { itNumber -> PhoneUtils.phoneNumberFormat(phoneNumber) { itNumber ->
Log.e( /*Log.e(
TAG, TAG,
"----SmsReceiver----手机号掩码操作 itNumber:${itNumber} 所在集合下标=${searchResult} threadId:${it.threadId} threadId:$threadId context.getThreadId:${ "----SmsReceiver----手机号掩码操作 itNumber:${itNumber} 所在集合下标=${searchResult} threadId:${it.threadId} threadId:$threadId context.getThreadId:${
context.getThreadId(phoneNumber) context.getThreadId(phoneNumber)
}" }"
) )*/
val messgeData = allConversations[searchResult].copy(isSFNumber = true, phoneNumber = itNumber)
context.conversationsDB.insertOrUpdate(messgeData)
context.insertOrUpdateConversation2(messgeData)
lastNumber = itNumber lastNumber = 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