Merge pull request #58 from lixm1988/main

修复联系人模块偶现的crash

Author: lixm1988

EaseChatUIKit.podspec

@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'EaseChatUIKit'
-  s.version          = '4.15.1'
+  s.version          = '4.16.0'
   s.summary          = 'A easy for use ChatUIKit.'
 
 # This description is used to generate tags and improve search results.

Sources/EaseChatUIKit/Classes/Service/Client/ChatUIKitContext.swift

@@ -32,7 +32,7 @@ import UIKit
     public var chatCache: Dictionary<String,ChatUserProfileProtocol>? = Dictionary<String,ChatUserProfileProtocol>()
 
     /// The cache of user information on user. Display the info on contact-list&single-chat-conversation-item&user-profile page .
-    public var userCache: Dictionary<String,ChatUserProfileProtocol>? = Dictionary<String,ChatUserProfileProtocol>()
+    @AtomicUnfairLock public var userCache: Dictionary<String,ChatUserProfileProtocol>? = Dictionary<String,ChatUserProfileProtocol>()
 
     /// The cache of user information on group-conversation-item. The key is the user ID and the value is an object that complies with the ``ChatUserProfileProtocol`` protocol.
     public var groupCache: Dictionary<String,ChatUserProfileProtocol>? = Dictionary<String,ChatUserProfileProtocol>()

Sources/EaseChatUIKit/Classes/UI/Components/Contact/ViewModel/ContactViewModel.swift

@@ -288,9 +288,11 @@ extension ContactViewModel: ContactListActionEventsDelegate {
 
     @objc open func cacheProfiles(profiles: [ChatUserProfileProtocol]) {
         for profile in profiles {
-            ChatUIKitContext.shared?.userCache?[profile.id]?.nickname = profile.nickname
-            ChatUIKitContext.shared?.userCache?[profile.id]?.remark = profile.remark
-            ChatUIKitContext.shared?.userCache?[profile.id]?.avatarURL = profile.avatarURL
+            if let user = ChatUIKitContext.shared?.userCache?[profile.id] {
+                user.nickname = profile.nickname
+                user.remark = profile.remark
+                user.avatarURL = profile.avatarURL
+            }
         }
     }
 

Sources/EaseChatUIKit/Classes/UI/Core/Foundation/PropertyWrapper.swift

@@ -28,3 +28,44 @@ import Foundation
     }
 }
 
+@propertyWrapper
+public struct AtomicUnfairLock<T> {
+    private var value: T
+    private var lock = os_unfair_lock()
+    
+    // 初始化时设置初始值
+    public init(wrappedValue: T) {
+        self.value = wrappedValue
+    }
+    
+    // 包装的属性值，自动处理加锁解锁
+    public var wrappedValue: T {
+        mutating get {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            return value
+        }
+        set {
+            os_unfair_lock_lock(&lock)
+            defer { os_unfair_lock_unlock(&lock) }
+            value = newValue
+        }
+    }
+    
+    /// 原子性修改操作
+    /// - Parameter transform: 对值进行修改的闭包
+    public mutating func modify(_ transform: (inout T) -> Void) {
+        os_unfair_lock_lock(&lock)
+        defer { os_unfair_lock_unlock(&lock) }
+        transform(&value)
+    }
+    
+    /// 原子性读取并处理值
+    /// - Parameter transform: 处理值的闭包，返回处理结果
+    /// - Returns: 处理结果
+    public mutating func withValue<U>(_ transform: (T) -> U) -> U {
+        os_unfair_lock_lock(&lock)
+        defer { os_unfair_lock_unlock(&lock) }
+        return transform(value)
+    }
+}