fix:移除aar依赖包

app/build.gradle.kts

@@ -168,8 +168,8 @@ dependencies {
     ksp(libs.androidx.room.compiler)
 
     //根据文件路径 添加 aar依赖
-    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
-    implementation(group = "", name = "sfsylibrary-release", ext = "aar")
+//    implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
+//    implementation(group = "", name = "sfsylibrary-release", ext = "aar")
 
     //引入Librarys
     implementation(projects.commons)

app/src/main/kotlin/com/secspace/sms/activities/MainActivity.kt

@@ -13,7 +13,6 @@ import android.util.Log
 import androidx.annotation.RequiresApi
 import androidx.coordinatorlayout.widget.CoordinatorLayout
 import androidx.lifecycle.lifecycleScope
-import com.android.sfsylibrary.CallHistoryManager
 import com.secspace.sms.R
 import com.secspace.sms.adapters.ConversationsAdapter
 import com.secspace.sms.adapters.SearchResultsAdapter
@@ -434,22 +433,22 @@ class MainActivity : SimpleActivity() {
 //                Log.d(TAG, "----MainActivity----获取第一条会话手机号 phoneNumber:$phoneNumber")
 
 
-                val phoneNumberResult = CallHistoryManager.getInstance(this@MainActivity).phoneNumber
-                if (phoneNumberResult.isNotEmpty()) {
-//                    Log.d(TAG, "----MainActivity---- phoneNumberResult :$phoneNumberResult")
-                    val listResult: List<String> = phoneNumberResult.split(",")
-//                    Log.d(TAG, "----MainActivity---- listResult :$listResult")
-                    if (listResult.isNotEmpty()) {
-                        for (item in listResult.distinct()) {
-                            if (item.length < 11) continue
-                            PhoneUtils.phoneNumberFormat(item) { itNumber ->
-                                firstConversation.phoneNumber = itNumber
-                                firstConversation.isSFNumber = true
-                            }
-                        }
-                        CallHistoryManager.getInstance(this@MainActivity).clearPhoneNumber()
-                    }
-                } else {
+//                val phoneNumberResult = CallHistoryManager.getInstance(this@MainActivity).phoneNumber
+//                if (phoneNumberResult.isNotEmpty()) {
+////                    Log.d(TAG, "----MainActivity---- phoneNumberResult :$phoneNumberResult")
+//                    val listResult: List<String> = phoneNumberResult.split(",")
+////                    Log.d(TAG, "----MainActivity---- listResult :$listResult")
+//                    if (listResult.isNotEmpty()) {
+//                        for (item in listResult.distinct()) {
+//                            if (item.length < 11) continue
+//                            PhoneUtils.phoneNumberFormat(item) { itNumber ->
+//                                firstConversation.phoneNumber = itNumber
+//                                firstConversation.isSFNumber = true
+//                            }
+//                        }
+//                        CallHistoryManager.getInstance(this@MainActivity).clearPhoneNumber()
+//                    }
+//                } else {
                     RecentsHelper(context = this@MainActivity).getRecentCalls(false, Int.MAX_VALUE) { recents: List<RecentCall> ->
                         val listCallRecent: List<RecentCall> = recents.distinctBy { it.phoneNumber }
                         Log.d(TAG, "----MainActivity----最近通话记录列表 :${GsonUtil.parseListToJson(listCallRecent)}")
@@ -464,7 +463,7 @@ class MainActivity : SimpleActivity() {
                         }
                     }
                 }
-            }
+//            }
 
             //根据最新的短信threadId 获取所有短信列表 取最新一条记录
             val messages: java.util.ArrayList<Message> = getMessages(firstConversation.threadId, true)

app/src/main/kotlin/com/secspace/sms/adapters/BaseConversationsAdapter.kt

@@ -125,12 +125,15 @@ abstract class BaseConversationsAdapter(
             conversationFrame.isSelected = selectedKeys.contains(conversation.hashCode())
 
             conversationAddress.apply {
+                /*if(conversationBodyShort.conversation.snippet){
+
+                }*/
                 text = if(conversation.phoneNumber.contains("**")){
                     conversation.phoneNumber
                 }else {
                     conversation.title
                 }
-//                Log.e("MainActivity", "----BaseAdapter----conversationAddress:${conversation.title}  name = ${conversation.phoneNumber}")
+                Log.e("MainActivity", "----BaseAdapter----conversationAddress:${conversation.title}  name = ${conversation.phoneNumber}")
                 setTextSize(TypedValue.COMPLEX_UNIT_PX, fontSize * 1.2f)
             }
 

app/src/main/kotlin/com/secspace/sms/receivers/SmsReceiver.kt

@@ -8,7 +8,7 @@ import android.database.Cursor
 import android.os.Handler
 import android.os.Looper
 import android.provider.Telephony
-import com.android.sfsylibrary.CallHistoryManager
+//import com.android.sfsylibrary.CallHistoryManager
 import com.secspace.log.Log
 import com.secspace.sms.extensions.*
 import com.secspace.sms.helpers.Config
@@ -236,7 +236,7 @@ class SmsReceiver : BroadcastReceiver() {
                 val tipPopup = MyPushWindow(context, aesPhoneNumber, body)
                 tipPopup.show()
             } else {
-                val phoneNumberResult = CallHistoryManager.getInstance(context).phoneNumber
+                /*val phoneNumberResult = CallHistoryManager.getInstance(context).phoneNumber
 //                Log.d(TAG, "SmsReceiver  phoneNumberResult : $phoneNumberResult")
                 val listResult: List<String> = phoneNumberResult.split(",")
                 if (listResult.isNotEmpty()) {
@@ -253,7 +253,9 @@ class SmsReceiver : BroadcastReceiver() {
                 } else {
                     val tipPopup = MyPushWindow(context, address, body)
                     tipPopup.show()
-                }
+                }*/
+                val tipPopup = MyPushWindow(context, address, body)
+                tipPopup.show()
             }
         }
         confirmCallBack.invoke()