diff --git a/Podfile b/Podfile
index 2541af6..b0f13b5 100644
--- a/Podfile
+++ b/Podfile
@@ -7,11 +7,11 @@ target 'yana' do
# Pods for yana
-# # IM 即时通讯
-# pod 'NIMSDK_LITE'
-# # 基础库
-# pod 'NEChatKit', '10.6.1'
-# pod 'NEChatUIKit', '10.6.1' # 会话（聊天）组件
+ # IM 即时通讯
+ pod 'NIMSDK_LITE'
+ # 基础库
+ pod 'NEChatKit', '10.8.3'
+ pod 'NEChatUIKit', '10.8.3' # 会话（聊天）组件
# pod 'NEContactUIKit', '10.6.1' # 通讯录组件
# pod 'NELocalConversationUIKit', '10.6.1' # 本地会话列表组件。
diff --git a/Podfile.lock b/Podfile.lock
index 1392e4d..b128510 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,5 +1,49 @@
PODS:
- Alamofire (5.10.2)
+ - CocoaLumberjack (3.9.0):
+ - CocoaLumberjack/Core (= 3.9.0)
+ - CocoaLumberjack/Core (3.9.0)
+ - libwebp (1.5.0):
+ - libwebp/demux (= 1.5.0)
+ - libwebp/mux (= 1.5.0)
+ - libwebp/sharpyuv (= 1.5.0)
+ - libwebp/webp (= 1.5.0)
+ - libwebp/demux (1.5.0):
+ - libwebp/webp
+ - libwebp/mux (1.5.0):
+ - libwebp/demux
+ - libwebp/sharpyuv (1.5.0)
+ - libwebp/webp (1.5.0):
+ - libwebp/sharpyuv
+ - MJRefresh (3.7.5)
+ - NEChatKit (10.8.3):
+ - NEChatKit/NOS (= 10.8.3)
+ - NEChatKit/NOS (10.8.3):
+ - NECommonKit (= 9.7.3)
+ - NECoreIM2Kit/NOS (= 1.1.4)
+ - NEChatUIKit (10.8.3):
+ - NEChatUIKit/NOS (= 10.8.3)
+ - NEChatUIKit/NOS (10.8.3):
+ - MJRefresh (= 3.7.5)
+ - NEChatKit/NOS
+ - NECommonUIKit (= 9.7.9)
+ - SDWebImageSVGKitPlugin
+ - SDWebImageWebPCoder
+ - NECommonKit (9.7.3):
+ - YXAlog
+ - NECommonUIKit (9.7.9):
+ - NECommonKit
+ - SDWebImage
+ - NECoreIM2Kit/NOS (1.1.4):
+ - NECoreKit (= 9.7.9)
+ - NIMSDK_LITE (= 10.9.10)
+ - NECoreKit (9.7.9):
+ - YXAlog
+ - NIMSDK_LITE (10.9.10):
+ - NIMSDK_LITE/NOS (= 10.9.10)
+ - YXArtemis_XCFramework
+ - NIMSDK_LITE/NOS (10.9.10):
+ - YXArtemis_XCFramework
- QCloudCore (6.5.1):
- QCloudCore/Default (= 6.5.1)
- QCloudCore/Default (6.5.1):
@@ -9,24 +53,72 @@ PODS:
- QCloudCOSXML/Default (6.5.1):
- QCloudCore (= 6.5.1)
- QCloudTrack/Beacon (6.5.1)
+ - SDWebImage (5.21.1):
+ - SDWebImage/Core (= 5.21.1)
+ - SDWebImage/Core (5.21.1)
+ - SDWebImageSVGKitPlugin (1.4.0):
+ - SDWebImage/Core (~> 5.10)
+ - SVGKit (~> 3.0)
+ - SDWebImageWebPCoder (0.14.6):
+ - libwebp (~> 1.0)
+ - SDWebImage/Core (~> 5.17)
+ - SVGKit (3.0.0):
+ - CocoaLumberjack (~> 3.0)
+ - YXAlog (1.0.10)
+ - YXArtemis_XCFramework (1.1.6)
DEPENDENCIES:
- Alamofire
+ - NEChatKit (= 10.8.3)
+ - NEChatUIKit (= 10.8.3)
+ - NIMSDK_LITE
- QCloudCOSXML
SPEC REPOS:
trunk:
- Alamofire
+ - CocoaLumberjack
+ - libwebp
+ - MJRefresh
+ - NEChatKit
+ - NEChatUIKit
+ - NECommonKit
+ - NECommonUIKit
+ - NECoreIM2Kit
+ - NECoreKit
+ - NIMSDK_LITE
- QCloudCore
- QCloudCOSXML
- QCloudTrack
+ - SDWebImage
+ - SDWebImageSVGKitPlugin
+ - SDWebImageWebPCoder
+ - SVGKit
+ - YXAlog
+ - YXArtemis_XCFramework
SPEC CHECKSUMS:
Alamofire: 7193b3b92c74a07f85569e1a6c4f4237291e7496
+ CocoaLumberjack: 5644158777912b7de7469fa881f8a3f259c2512a
+ libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
+ MJRefresh: fdf5e979eb406a0341468932d1dfc8b7f9fce961
+ NEChatKit: c0a2a527781395edfc557836132f36fc0509e05c
+ NEChatUIKit: caa0d2cf0877ca563535ee949ad3e5459b41abe3
+ NECommonKit: 0be3f56473f3ccb3d08289b4e0b2439b0bd3a1de
+ NECommonUIKit: f9a867dae3b6c0b7b580370fc0b1cec66a6a8bf7
+ NECoreIM2Kit: e37e0c51480eeb13ff1e2869e6064aa2ce4734d0
+ NECoreKit: 533667ce015fb88cbfd059ad55ae250210d83204
+ NIMSDK_LITE: 94df1f1bc5b583c534f6433d39fc70e9990ac424
QCloudCore: 6f8c67b96448472d2c6a92b9cfe1bdb5abbb1798
QCloudCOSXML: 92f50a787b4e8d9a7cb6ea8e626775256b4840a7
QCloudTrack: 20b79388365b4c8ed150019c82a56f1569f237f8
+ SDWebImage: f29024626962457f3470184232766516dee8dfea
+ SDWebImageSVGKitPlugin: 7542dd07c344ec3415ded0461a1161a6f087e0c9
+ SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
+ SVGKit: 1ad7513f8c74d9652f94ed64ddecda1a23864dea
+ YXAlog: 02cad3f1e942bed69a95ff4ddbf41e4ee9d713bf
+ YXArtemis_XCFramework: d9a8b9439d7a6c757ed00ada53a6d2dd9b13f9c7
-PODFILE CHECKSUM: b6f9510b987dbfd80d7a7e45c13b229f9c4c6e63
+PODFILE CHECKSUM: 7b99a3755f2026c3c7131495cfb2d0b0f23dc59f
COCOAPODS: 1.16.2
diff --git a/yana.xcodeproj/project.pbxproj b/yana.xcodeproj/project.pbxproj
index f18f458..a80615d 100644
--- a/yana.xcodeproj/project.pbxproj
+++ b/yana.xcodeproj/project.pbxproj
@@ -495,8 +495,11 @@
);
INFOPLIST_FILE = yana/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "E-PARTi";
+ INFOPLIST_KEY_NSCameraUsageDescription = "需要使用相机拍照上传图片";
INFOPLIST_KEY_NSLocalNetworkUsageDescription = "此App将可发现和连接到您所用网络上的设备。";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "“eparty”需要您的同意，才可以进行定位服务，访问网络状态";
+ INFOPLIST_KEY_NSMicrophoneUsageDescription = "“eparty”需要您的同意,才可以进行语音聊天";
+ INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "“eparty”需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
@@ -553,8 +556,11 @@
);
INFOPLIST_FILE = yana/Info.plist;
INFOPLIST_KEY_CFBundleDisplayName = "E-PARTi";
+ INFOPLIST_KEY_NSCameraUsageDescription = "需要使用相机拍照上传图片";
INFOPLIST_KEY_NSLocalNetworkUsageDescription = "此App将可发现和连接到您所用网络上的设备。";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "“eparty”需要您的同意，才可以进行定位服务，访问网络状态";
+ INFOPLIST_KEY_NSMicrophoneUsageDescription = "“eparty”需要您的同意,才可以进行语音聊天";
+ INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "“eparty”需要您的同意,才可以访问相册并选择您需要上传的图片，然后展示在您的个人主页上，便于他人查看";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen;
diff --git a/yana/AppDelegate.swift b/yana/AppDelegate.swift
index 0b6b55a..4fd48ac 100644
--- a/yana/AppDelegate.swift
+++ b/yana/AppDelegate.swift
@@ -1,14 +1,10 @@
import UIKit
-//import NIMSDK
class AppDelegate: UIResponder, UIApplicationDelegate {
private func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) async -> Bool {
- // 预加载用户信息缓存
await UserInfoManager.preloadCache()
-
-// NIMConfigurationManager.setupNimSDK()
-
+
return true
}
}
diff --git a/yana/Info.plist b/yana/Info.plist
index 3aae323..d5b7ef5 100644
--- a/yana/Info.plist
+++ b/yana/Info.plist
@@ -9,8 +9,6 @@
NSWiFiUsageDescription
应用需要访问 Wi-Fi 信息以提供网络相关功能
- NSCameraUsageDescription
- 需要使用相机拍照上传图片
UIAppFonts
Bayon-Regular.ttf
diff --git a/yana/Views/Components/UserIDDisplay.swift b/yana/Views/Components/UserIDDisplay.swift
index 4c6c832..c46cf2a 100644
--- a/yana/Views/Components/UserIDDisplay.swift
+++ b/yana/Views/Components/UserIDDisplay.swift
@@ -17,7 +17,7 @@ struct UserIDDisplay: View {
var body: some View {
HStack(spacing: 4) {
- Text("ID: \(String(uid))")
+ Text("ID: \(String(uid)) 数据没有返回 erban no～")
.font(.system(size: fontSize))
.foregroundColor(textColor)
@@ -71,4 +71,4 @@ struct UserIDDisplay: View {
UserIDDisplay(uid: 987654321, fontSize: 16, textColor: .black, isDisplayCopy: false)
}
.padding()
-}
\ No newline at end of file
+}
diff --git a/yana/yana-Bridging-Header.h b/yana/yana-Bridging-Header.h
index e137aba..e9c5c0d 100644
--- a/yana/yana-Bridging-Header.h
+++ b/yana/yana-Bridging-Header.h
@@ -12,3 +12,5 @@
// CommonCrypto for MD5 hash
#import
+#import
+