Skip to content

fix conflict with ChatUIkit #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 25, 2025
Merged

fix conflict with ChatUIkit #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fcb5f17
fix conflict with ChatUIkit
zjc19891106 Aug 25, 2025
3ff7be3
Merge branch 'easemob:dev' into dev
zjc19891106 Aug 25, 2025
9ce80a7
Update README.md
zjc19891106 Aug 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 24 additions & 18 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,63 +252,64 @@ class AppDelegate：UIResponder，UIApplicationDelegate {

``` XML
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23504" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="22181" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="vXZ-lx-hvc">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23506"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22182"/>
<capability name="System colors in document resources" minToolsVersion="11.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
<!--View Controller-->
<scene sceneID="ufC-wZ-h7g">
<objects>
<viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="EaseCallUIKitQuickStart"customModuleProvider="target" sceneMemberID="viewController">
<viewController id="vXZ-lx-hvc" customClass="ViewController" customModule="EaseCallUIKitQuickStart" customModuleProvider="target" sceneMemberID="viewController">
<layoutGuides>
<viewControllerLayoutGuide type="top" id="jyV-Pf-zRb"/>
<viewControllerLayoutGuide type="bottom" id="2fi-mo-0CV"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="kh9-bI-dsS">
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<textField opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="248" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="call user or group with id" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="laE-OW-CWK">
<rect key="frame" x="75" y="191" width="225" height="40"/>
<rect key="frame" x="94.5" y="171" width="225" height="40"/>
<color key="backgroundColor" systemColor="systemGray5Color"/>
<constraints>
<constraint firstAttribute="height" constant="40" id="kOp-K7-HeC"/>
<constraint firstAttribute="width" constant="225" id="width-laE-OW-CWK"/>
</constraints>
<color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
<color key="textColor" systemColor="labelColor"/>
<fontDescription key="fontDescription" type="system" pointSize="18"/>
<textInputTraits key="textInputTraits"/>
</textField>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zid-qi-Z7H">
<rect key="frame" x="161.5" y="254" width="52.5" height="35"/>
<rect key="frame" x="180.5" y="234" width="53" height="35"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="Qdf-ZL-nrv"/>
<constraint firstAttribute="width" constant="53" id="width-zid-qi-Z7H"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="filled" title="Call"/>
<connections>
<action selector="callAction:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="21A-e9-7bB"/>
</connections>
</button>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1TW-7c-QOv">
<rect key="frame" x="154" y="316" width="66" height="35"/>
<rect key="frame" x="174" y="284" width="66" height="35"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="X5z-2c-9KQ"/>
<constraint firstAttribute="width" constant="66" id="width-1TW-7c-QOv"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="filled" title="Login"/>
<connections>
<action selector="loginAction:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="D5E-pO-2Jw"/>
</connections>
</button>
<segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" translatesAutoresizingMaskIntoConstraints="NO" id="KgU-kb-zgq">
<rect key="frame" x="89" y="129" width="197" height="32"/>
<rect key="frame" x="108.5" y="109" width="197" height="32"/>
<constraints>
<constraint firstAttribute="height" constant="31" id="49T-gN-YNX"/>
<constraint firstAttribute="height" constant="32" id="49T-gN-YNX"/>
<constraint firstAttribute="width" constant="197" id="64h-61-hN9"/>
</constraints>
<segments>
Expand All @@ -321,19 +322,18 @@ class AppDelegate：UIResponder，UIApplicationDelegate {
</connections>
</segmentedControl>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Qd-2k-2aV">
<rect key="frame" x="161" y="370" width="53" height="35"/>
<rect key="frame" x="180.5" y="334" width="53" height="35"/>
<constraints>
<constraint firstAttribute="height" constant="35" id="fuc-9c-KcU"/>
<constraint firstAttribute="width" constant="53" id="u4m-wu-cwy"/>
</constraints>
<state key="normal" title="Button"/>
<buttonConfiguration key="configuration" style="filled" title="Log"/>
<connections>
<action selector="logAction:" destination="vXZ-lx-hvc" eventType="touchUpInside" id="QkB-ye-mNH"/>
</connections>
</button>
</subviews>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
<constraints>
<constraint firstItem="zid-qi-Z7H" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="3PV-gJ-xUs"/>
<constraint firstItem="zid-qi-Z7H" firstAttribute="top" secondItem="laE-OW-CWK" secondAttribute="bottom" constant="23" id="3d9-xN-rVV"/>
Expand All @@ -343,7 +343,7 @@ class AppDelegate：UIResponder，UIApplicationDelegate {
<constraint firstItem="0Qd-2k-2aV" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="Ptx-cV-DpW"/>
<constraint firstItem="laE-OW-CWK" firstAttribute="centerX" secondItem="kh9-bI-dsS" secondAttribute="centerX" id="ZDm-c5-ZIK"/>
<constraint firstItem="1TW-7c-QOv" firstAttribute="centerY" secondItem="kh9-bI-dsS" secondAttribute="centerY" id="a05-e3-vQV"/>
<constraint firstItem="0Qd-2k-2aV" firstAttribute="top" secondItem="1TW-7c-QOv" secondAttribute="bottom" constant="19" id="r8t-en-w10"/>
<constraint firstItem="0Qd-2k-2aV" firstAttribute="top" secondItem="1TW-7c-QOv" secondAttribute="bottom" constant="15" id="r8t-en-w10"/>
<constraint firstItem="laE-OW-CWK" firstAttribute="top" secondItem="jyV-Pf-zRb" secondAttribute="bottom" constant="171" id="vBn-aQ-3Q3"/>
</constraints>
</view>
Expand All @@ -361,12 +361,18 @@ class AppDelegate：UIResponder，UIApplicationDelegate {
</scene>
</scenes>
<resources>
<systemColor name="systemBackgroundColor">
<color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
<systemColor name="systemBlueColor">
<color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="systemGray5Color">
<color red="0.89803921568627454" green="0.89803921568627454" blue="0.91764705882352937" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</systemColor>
<systemColor name="labelColor">
<color white="0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</systemColor>
</resources>
</document>

Expand Down
4 changes: 2 additions & 2 deletions Sources/EaseCallUIKit/Classes/Commons/Extension/ArrayExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ public extension Array {
}

///数组越界防护
subscript(safe idx: Index) -> Element? {
subscript(safely idx: Index) -> Element? {
if idx < 0 { return nil }
return idx < self.endIndex ? self[idx] : nil
}

subscript(safe range: Range<Int>) -> ArraySlice<Element>? {
subscript(safely range: Range<Int>) -> ArraySlice<Element>? {
if range.startIndex < 0 { return nil }
return range.endIndex <= self.endIndex ? self[range.startIndex...range.endIndex]:nil
}
Expand Down
12 changes: 6 additions & 6 deletions Sources/EaseCallUIKit/Classes/Commons/Theme/ColorTheme.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,22 +140,22 @@ public extension UIColor {
@objcMembers class ColorTheme: NSObject {

internal static func switchHues(hues: [CGFloat]) {
if let primaryHue = hues[safe: 0] {
if let primaryHue = hues[safely: 0] {
self.primaryHue = primaryHue
}
if let secondaryHue = hues[safe: 1] {
if let secondaryHue = hues[safely: 1] {
self.secondaryHue = secondaryHue
}
if let errorHue = hues[safe: 2] {
if let errorHue = hues[safely: 2] {
self.errorHue = errorHue
}
if let neutralHue = hues[safe: 3] {
if let neutralHue = hues[safely: 3] {
self.neutralHue = neutralHue
}
if let neutralSpecialHue = hues[safe: 4] {
if let neutralSpecialHue = hues[safely: 4] {
self.neutralSpecialHue = neutralSpecialHue
}
if let gradientEndHue = hues[safe: 5] {
if let gradientEndHue = hues[safely: 5] {
self.gradientEndHue = gradientEndHue
}
}
Expand Down
4 changes: 2 additions & 2 deletions Sources/EaseCallUIKit/Classes/Commons/Utils/CallNavigationBar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,9 +300,9 @@ extension CallNavigationBar: UICollectionViewDataSource,UICollectionViewDelegate
public func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: "EaseChatNavigationBarRightCell", for: indexPath) as? EaseChatNavigationBarRightCell
if self.originalRenderRightImage {
cell?.imageView.image = self.rightImages[safe: indexPath.row]
cell?.imageView.image = self.rightImages[safely: indexPath.row]
} else {
cell?.imageView.image = self.rightImages[safe: indexPath.row]?.withTintColor(Theme.style == .dark ? UIColor.callTheme.neutralColor98:UIColor.callTheme.neutralColor3)
cell?.imageView.image = self.rightImages[safely: indexPath.row]?.withTintColor(Theme.style == .dark ? UIColor.callTheme.neutralColor98:UIColor.callTheme.neutralColor3)
}
return cell ?? UICollectionViewCell()
}
Expand Down
2 changes: 1 addition & 1 deletion Sources/EaseCallUIKit/Classes/CoreService/Implements/CallKitManager+RTC.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ extension CallKitManager: AgoraRtcEngineDelegate {
consoleLogInfo("rtcEngine networkQuality uid: \(uid) txQuality: \(txQuality.rawValue) rxQuality: \(rxQuality.rawValue) is unknown, skipping update", type: .debug)
return
}
let uids = [NSNumber(value: uid)]
let uids = [NSNumber(value: uid == 0 ? UInt32(uid):self.currentUserRTCUID)]
// Get userId by RTC uid
ChatClient.shared().getUserId(byRTCUIds: uids) { [weak self] relations, error in
guard let `self` = self else { return }
Expand Down
6 changes: 3 additions & 3 deletions Sources/EaseCallUIKit/Classes/UI/Controllers/MultiCallParticipantsController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ extension MultiCallParticipantsController: UITableViewDelegate,UITableViewDataSo
if cell == nil {
cell = GroupParticipantsCell(style: .default, reuseIdentifier: "GroupParticipantsCell")
}
if let profile = self.participants[safe: indexPath.row] {
if let profile = self.participants[safely: indexPath.row] {
cell?.refresh(profile: profile, keyword: "")
cell?.nickName.textColor = .white
}
Expand All @@ -201,7 +201,7 @@ extension MultiCallParticipantsController: UITableViewDelegate,UITableViewDataSo
}

@objc open func didSelectRowAt(indexPath: IndexPath) {
if let profile = self.participants[safe: indexPath.row] {
if let profile = self.participants[safely: indexPath.row] {
profile.selected = !profile.selected
self.participantsList.reloadData()
}
Expand All @@ -225,7 +225,7 @@ extension MultiCallParticipantsController: UITableViewDelegate,UITableViewDataSo
self.fetchParticipants()
}
var unknownInfoIds = [String]()
if let profile = self.participants[safe: indexPath.row] {
if let profile = self.participants[safely: indexPath.row] {
if profile.nickname.isEmpty || profile.avatarURL.isEmpty {
unknownInfoIds.append(profile.id)
}
Expand Down