iOS Team / LiveVideoCloud · Commits

Commit f7db071f33bc190798a0b8b667d5ae2c18ca053d

Authored by 王军波
1 parent 1bd7c2c2

更换SDK

Inline Side-by-side
Showing 6 changed files with 22 additions and 28 deletions
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
  View file @f7db071
@@ -165,12 +165,6 @@ @@ -165,12 +165,6 @@
165 D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; }; 165 D25BF8831E7F775F007FB138 /* LVCUGCPlayerLoadingView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8821E7F775F007FB138 /* LVCUGCPlayerLoadingView.m */; };
166 D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; }; 166 D25BF8901E7F7F8F007FB138 /* UGCLoading.jpeg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */; };
167 D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; }; 167 D25BF8931E7FBAEA007FB138 /* LVCUGCBackgroundView.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */; };
168 - D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };  
169 - D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };  
170 - D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; };  
171 - D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };  
172 - D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; };  
173 - D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };  
174 D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; }; 168 D25BF8A01E80C4BD007FB138 /* UIImage+LVCVagueImage.m in Sources */ = {isa = PBXBuildFile; fileRef = D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */; };
175 D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; }; 169 D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D25BF8A21E80C4FC007FB138 /* Accelerate.framework */; };
176 D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; }; 170 D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; };
@@ -181,9 +175,15 @@ @@ -181,9 +175,15 @@
181 D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; }; 175 D2888DB71E6EC1B8003A77C8 /* LVCMyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888DB61E6EC1B8003A77C8 /* LVCMyViewController.m */; };
182 D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; }; 176 D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; };
183 D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; }; 177 D2A803081E80BD6F009D6F1C /* TopToolView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2A803071E80BD6F009D6F1C /* TopToolView.m */; };
  178 + D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
  179 + D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  180 + D2B2ED7C1E88F90F00F7538A /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
  181 + D2B2ED7D1E88F90F00F7538A /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
184 D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; }; 182 D2B7B2511E8247D400ED084E /* ChatBarrageManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2501E8247D400ED084E /* ChatBarrageManager.m */; };
185 D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; }; 183 D2B7B2541E824B2D00ED084E /* ChatBarrageView.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */; };
186 D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; }; 184 D2B7B2571E8261EF00ED084E /* ChatBarrOperation.m in Sources */ = {isa = PBXBuildFile; fileRef = D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */; };
  185 + D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */; };
  186 + D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */; };
187 /* End PBXBuildFile section */ 187 /* End PBXBuildFile section */
188 188
189 /* Begin PBXContainerItemProxy section */ 189 /* Begin PBXContainerItemProxy section */
@@ -211,8 +211,8 @@ @@ -211,8 +211,8 @@
211 dstSubfolderSpec = 10; 211 dstSubfolderSpec = 10;
212 files = ( 212 files = (
213 811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */, 213 811BB6851E8106AF005C6291 /* CNLivePlayerSDK.framework in Embed Frameworks */,
214 - D25BF89B1E7FE046007FB138 /* CNLiveChatManager.framework in Embed Frameworks */,  
215 - D25BF89D1E7FE049007FB138 /* CNLiveMsgTools.framework in Embed Frameworks */, 214 + D2B2ED7B1E88F90C00F7538A /* CNLiveChatManager.framework in Embed Frameworks */,
  215 + D2B2ED7D1E88F90F00F7538A /* CNLiveMsgTools.framework in Embed Frameworks */,
216 ); 216 );
217 name = "Embed Frameworks"; 217 name = "Embed Frameworks";
218 runOnlyForDeploymentPostprocessing = 0; 218 runOnlyForDeploymentPostprocessing = 0;
@@ -551,8 +551,6 @@ @@ -551,8 +551,6 @@
551 D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; }; 551 D25BF88F1E7F7F8F007FB138 /* UGCLoading.jpeg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = UGCLoading.jpeg; sourceTree = "<group>"; };
552 D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; }; 552 D25BF8911E7FBAEA007FB138 /* LVCUGCBackgroundView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCUGCBackgroundView.h; sourceTree = "<group>"; };
553 D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; }; 553 D25BF8921E7FBAEA007FB138 /* LVCUGCBackgroundView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCUGCBackgroundView.m; sourceTree = "<group>"; };
554 - D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };  
555 - D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };  
556 D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; }; 554 D25BF89E1E80C4BD007FB138 /* UIImage+LVCVagueImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImage+LVCVagueImage.h"; sourceTree = "<group>"; };
557 D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; }; 555 D25BF89F1E80C4BD007FB138 /* UIImage+LVCVagueImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImage+LVCVagueImage.m"; sourceTree = "<group>"; };
558 D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; }; 556 D25BF8A21E80C4FC007FB138 /* Accelerate.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Accelerate.framework; path = System/Library/Frameworks/Accelerate.framework; sourceTree = SDKROOT; };
@@ -577,6 +575,8 @@ @@ -577,6 +575,8 @@
577 D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageView.m; sourceTree = "<group>"; }; 575 D2B7B2531E824B2D00ED084E /* ChatBarrageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrageView.m; sourceTree = "<group>"; };
578 D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrOperation.h; sourceTree = "<group>"; }; 576 D2B7B2551E8261EF00ED084E /* ChatBarrOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ChatBarrOperation.h; sourceTree = "<group>"; };
579 D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrOperation.m; sourceTree = "<group>"; }; 577 D2B7B2561E8261EF00ED084E /* ChatBarrOperation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ChatBarrOperation.m; sourceTree = "<group>"; };
  578 + D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
  579 + D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
580 /* End PBXFileReference section */ 580 /* End PBXFileReference section */
581 581
582 /* Begin PBXFrameworksBuildPhase section */ 582 /* Begin PBXFrameworksBuildPhase section */
@@ -586,11 +586,11 @@ @@ -586,11 +586,11 @@
586 files = ( 586 files = (
587 D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */, 587 D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */,
588 D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */, 588 D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */,
589 - D25BF89A1E7FE046007FB138 /* CNLiveChatManager.framework in Frameworks */,  
590 - D25BF8971E7FE01B007FB138 /* CNLiveMsgTools.framework in Frameworks */,  
591 - D25BF8991E7FE033007FB138 /* CNLiveChatManager.framework in Frameworks */,  
592 - D25BF89C1E7FE049007FB138 /* CNLiveMsgTools.framework in Frameworks */, 589 + D2B2ED7C1E88F90F00F7538A /* CNLiveMsgTools.framework in Frameworks */,
  590 + D2B2ED7A1E88F90C00F7538A /* CNLiveChatManager.framework in Frameworks */,
  591 + D2D236B51E88F8E600B7C517 /* CNLiveMsgTools.framework in Frameworks */,
593 811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */, 592 811BB6831E8106A2005C6291 /* CNLivePlayerSDK.framework in Frameworks */,
  593 + D2D236B41E88F8E600B7C517 /* CNLiveChatManager.framework in Frameworks */,
594 ); 594 );
595 runOnlyForDeploymentPostprocessing = 0; 595 runOnlyForDeploymentPostprocessing = 0;
596 }; 596 };
@@ -660,9 +660,9 @@ @@ -660,9 +660,9 @@
660 812E504E1E7699B9004F5FCD /* CNLiveSDK */ = { 660 812E504E1E7699B9004F5FCD /* CNLiveSDK */ = {
661 isa = PBXGroup; 661 isa = PBXGroup;
662 children = ( 662 children = (
  663 + D2D236B21E88F8E600B7C517 /* CNLiveChatManager.framework */,
  664 + D2D236B31E88F8E600B7C517 /* CNLiveMsgTools.framework */,
663 811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */, 665 811BB6821E8106A2005C6291 /* CNLivePlayerSDK.framework */,
664 - D25BF8981E7FE033007FB138 /* CNLiveChatManager.framework */,  
665 - D25BF8961E7FE01B007FB138 /* CNLiveMsgTools.framework */,  
666 D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */, 666 D25BF87C1E7B8C78007FB138 /* KSYGPUResource.bundle */,
667 ); 667 );
668 path = CNLiveSDK; 668 path = CNLiveSDK;
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/CNLiveChatManager
View file @f7db071
No preview for this file type
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h
  View file @f7db071
@@ -20,17 +20,17 @@ @@ -20,17 +20,17 @@
20 /** 20 /**
21 目标ID(消息来自聊天室的ID / 接收者ID) 21 目标ID(消息来自聊天室的ID / 接收者ID)
22 */ 22 */
23 -@property (nonatomic, assign) NSString *targetId; 23 +@property (nonatomic, copy) NSString *targetId;
24 24
25 /** 25 /**
26 消息ID(本地存储的消息的唯一值（数据库索引唯一值）) 26 消息ID(本地存储的消息的唯一值（数据库索引唯一值）)
27 */ 27 */
28 -@property (nonatomic, assign) NSString *messageId; 28 +@property (nonatomic, copy) NSString *messageId;
29 29
30 /** 30 /**
31 消息内容 31 消息内容
32 */ 32 */
33 -@property (nonatomic, strong) NSString *messageContent; 33 +@property (nonatomic, copy) NSString *messageContent;
34 34
35 /** 35 /**
36 发送者的用户信息(userId, name, portraitUri) 36 发送者的用户信息(userId, name, portraitUri)
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h
  View file @f7db071
@@ -13,17 +13,17 @@ @@ -13,17 +13,17 @@
13 /*! 13 /*!
14 用户ID(一旦以一个用户ID连接到服务器,就不能再修改用户ID了,如果修改也会被忽略) 14 用户ID(一旦以一个用户ID连接到服务器,就不能再修改用户ID了,如果修改也会被忽略)
15 */ 15 */
16 -@property(nonatomic, strong, readonly) NSString *userId; 16 +@property(nonatomic, copy, readonly) NSString *userId;
17 17
18 /*! 18 /*!
19 用户名称 19 用户名称
20 */ 20 */
21 -@property(nonatomic, strong) NSString *name; 21 +@property(nonatomic, copy) NSString *name;
22 22
23 /*! 23 /*!
24 用户头像的URL 24 用户头像的URL
25 */ 25 */
26 -@property(nonatomic, strong) NSString *portraitUri; 26 +@property(nonatomic, copy) NSString *portraitUri;
27 27
28 /*! 28 /*!
29 用户信息的初始化方法, 29 用户信息的初始化方法,
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveChatManager.framework/Modules/module.modulemap deleted 100644 → 0
  View file @1bd7c2c
1 -framework module CNLiveChatManager {  
2 - umbrella header "CNLiveChatManager.h"  
3 -  
4 - export *  
5 - module * { export * }  
6 -}  
LiveVideoCloud/LiveVideoCloud/Classes/CNLiveSDK/CNLiveMsgTools.framework/CNLiveMsgTools
View file @f7db071
No preview for this file type