Skip to content

Commit e159d85

Browse files
authored
Merge pull request #872 from DimensionDev/ios/20250411
Ios/20250411
2 parents b7f5ad5 + fd00cf7 commit e159d85

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+20197
-19786
lines changed

iosApp/iosApp.xcodeproj/project.pbxproj

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,11 @@
2424
644C84F82D535D0B00E92D0D /* JXPagingView in Frameworks */ = {isa = PBXBuildFile; productRef = 644C84F72D535D0B00E92D0D /* JXPagingView */; };
2525
64541A902DA3CE5A001208C7 /* Tiercel in Frameworks */ = {isa = PBXBuildFile; productRef = 64541A8F2DA3CE5A001208C7 /* Tiercel */; };
2626
64655C2D2CFD6CA000255488 /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 64655C2C2CFD6CA000255488 /* Debug.xcconfig */; };
27+
646CABC52DAE876C00B9EA6F /* ExyteChat in Frameworks */ = {isa = PBXBuildFile; productRef = 646CABC42DAE876C00B9EA6F /* ExyteChat */; };
2728
6488800B2D1AD43E00EFE72C /* JXSegmentedView in Frameworks */ = {isa = PBXBuildFile; productRef = 6488800A2D1AD43E00EFE72C /* JXSegmentedView */; };
2829
6489B3312D68D50800D8AEBB /* SVGView in Frameworks */ = {isa = PBXBuildFile; productRef = 6489B3302D68D50800D8AEBB /* SVGView */; };
2930
648EE5BD2D8D71EA00A457AA /* SwiftfulRouting in Frameworks */ = {isa = PBXBuildFile; productRef = 648EE5BC2D8D71EA00A457AA /* SwiftfulRouting */; };
31+
64A2DC662DAD21BF008EF8C2 /* ExyteChat in Frameworks */ = {isa = PBXBuildFile; productRef = 64A2DC652DAD21BF008EF8C2 /* ExyteChat */; };
3032
64B780542D9D3B7F00955C56 /* TagCloud in Frameworks */ = {isa = PBXBuildFile; productRef = 64B780532D9D3B7F00955C56 /* TagCloud */; };
3133
64BA00252D1AD84D0053F205 /* JXPhotoBrowser in Frameworks */ = {isa = PBXBuildFile; productRef = 64BA00242D1AD84D0053F205 /* JXPhotoBrowser */; };
3234
64BBDA722CFDD8420052E599 /* SwiftDate in Frameworks */ = {isa = PBXBuildFile; productRef = 64BBDA712CFDD8420052E599 /* SwiftDate */; };
@@ -78,6 +80,7 @@
7880
files = (
7981
64541A902DA3CE5A001208C7 /* Tiercel in Frameworks */,
8082
64E877CC2D0842C5003559B9 /* Fuzi in Frameworks */,
83+
646CABC52DAE876C00B9EA6F /* ExyteChat in Frameworks */,
8184
64E208712CF8458A001C64EF /* FLAnimatedImage in Frameworks */,
8285
0690507B2CAE634C007FC957 /* Awesome in Frameworks */,
8386
066AD0452B3ACDC1006F28F4 /* Collections in Frameworks */,
@@ -95,6 +98,7 @@
9598
64E2087A2CF84670001C64EF /* Generated in Frameworks */,
9699
64BA00252D1AD84D0053F205 /* JXPhotoBrowser in Frameworks */,
97100
06B8514B2B6B228600DFA075 /* FirebaseAnalytics in Frameworks */,
101+
64A2DC662DAD21BF008EF8C2 /* ExyteChat in Frameworks */,
98102
64C17B592DA3E683000291EA /* GRDB in Frameworks */,
99103
64E890742D2D28400001B93D /* MJRefresh in Frameworks */,
100104
6489B3312D68D50800D8AEBB /* SVGView in Frameworks */,
@@ -256,6 +260,8 @@
256260
64B780532D9D3B7F00955C56 /* TagCloud */,
257261
64541A8F2DA3CE5A001208C7 /* Tiercel */,
258262
64C17B582DA3E683000291EA /* GRDB */,
263+
64A2DC652DAD21BF008EF8C2 /* ExyteChat */,
264+
646CABC42DAE876C00B9EA6F /* ExyteChat */,
259265
);
260266
productName = iosApp;
261267
productReference = 7555FF7B242A565900829871 /* Flare.app */;
@@ -311,6 +317,7 @@
311317
64B780522D9D3B7F00955C56 /* XCRemoteSwiftPackageReference "TagCloud" */,
312318
64541A8E2DA3CE5A001208C7 /* XCRemoteSwiftPackageReference "Tiercel" */,
313319
64C17B572DA3E683000291EA /* XCRemoteSwiftPackageReference "GRDB.swift" */,
320+
646CABC32DAE876C00B9EA6F /* XCRemoteSwiftPackageReference "Chat" */,
314321
);
315322
productRefGroup = 7555FF7C242A565900829871 /* Products */;
316323
projectDirPath = "";
@@ -724,6 +731,14 @@
724731
minimumVersion = 3.2.6;
725732
};
726733
};
734+
646CABC32DAE876C00B9EA6F /* XCRemoteSwiftPackageReference "Chat" */ = {
735+
isa = XCRemoteSwiftPackageReference;
736+
repositoryURL = "https://github.com/exyte/Chat.git";
737+
requirement = {
738+
kind = upToNextMajorVersion;
739+
minimumVersion = 2.6.0;
740+
};
741+
};
727742
648880092D1AD43E00EFE72C /* XCRemoteSwiftPackageReference "JXSegmentedView" */ = {
728743
isa = XCRemoteSwiftPackageReference;
729744
repositoryURL = "https://github.com/pujiaxin33/JXSegmentedView";
@@ -892,6 +907,11 @@
892907
package = 64541A8E2DA3CE5A001208C7 /* XCRemoteSwiftPackageReference "Tiercel" */;
893908
productName = Tiercel;
894909
};
910+
646CABC42DAE876C00B9EA6F /* ExyteChat */ = {
911+
isa = XCSwiftPackageProductDependency;
912+
package = 646CABC32DAE876C00B9EA6F /* XCRemoteSwiftPackageReference "Chat" */;
913+
productName = ExyteChat;
914+
};
895915
6488800A2D1AD43E00EFE72C /* JXSegmentedView */ = {
896916
isa = XCSwiftPackageProductDependency;
897917
package = 648880092D1AD43E00EFE72C /* XCRemoteSwiftPackageReference "JXSegmentedView" */;
@@ -907,6 +927,10 @@
907927
package = 648EE5BB2D8D71EA00A457AA /* XCRemoteSwiftPackageReference "SwiftfulRouting" */;
908928
productName = SwiftfulRouting;
909929
};
930+
64A2DC652DAD21BF008EF8C2 /* ExyteChat */ = {
931+
isa = XCSwiftPackageProductDependency;
932+
productName = ExyteChat;
933+
};
910934
64B780532D9D3B7F00955C56 /* TagCloud */ = {
911935
isa = XCSwiftPackageProductDependency;
912936
package = 64B780522D9D3B7F00955C56 /* XCRemoteSwiftPackageReference "TagCloud" */;

iosApp/iosApp/AppDelegate.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ class AppDelegate: NSObject, ApplicationDelegate {
2222
_ = DownloadManager.shared
2323
return true
2424
}
25-
26-
// 处理后台下载
27-
func application(_ application: UIApplication,
28-
handleEventsForBackgroundURLSession identifier: String,
29-
completionHandler: @escaping () -> Void) {
3025

26+
// 处理后台下载
27+
func application(_: UIApplication,
28+
handleEventsForBackgroundURLSession identifier: String,
29+
completionHandler: @escaping () -> Void)
30+
{
3131
if identifier == DownloadManager.shared.sessionManager.identifier {
3232
DownloadManager.shared.setCompletionHandler(completionHandler)
3333
}

iosApp/iosApp/Data/UserManager.swift

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,15 @@ class UserManager {
2525
return AccountTypeGuest()
2626
}
2727

28+
/// 判断给定用户是否是当前登录用户
29+
func isCurrentUser(user: UiUserV2) -> Bool {
30+
if let currentUser = getCurrentUser() {
31+
// 比较用户ID
32+
return user.key.id == currentUser.key.id
33+
}
34+
return false
35+
}
36+
2837
func initialize() {
2938
guard !isInitialized else { return }
3039

iosApp/iosApp/FlareApp.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ struct FlareApp: SwiftUI.App {
1919
// 初始化AppBarTabSettingStore(使用游客模式)
2020
// UserManager初始化完成后会自动更新为正确的账号
2121
AppBarTabSettingStore.shared.initialize(with: AccountTypeGuest(), user: nil)
22-
22+
2323
// DownloadManager初始化
2424
_ = DownloadManager.shared
2525
}

iosApp/iosApp/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
<string>需要访问相册权限以保存图片</string>
4646
<key>NSPhotoLibraryUsageDescription</key>
4747
<string>需要访问相册权限以保存图片</string>
48+
<key>NSMicrophoneUsageDescription</key>
49+
<string>需要访问麦克风权限以录制语音消息</string>
4850
<key>UIApplicationSceneManifest</key>
4951
<dict>
5052
<key>UIApplicationSupportsMultipleScenes</key>

0 commit comments

Comments
 (0)