iOS Team / CNLiveChatManagerSDKDemo · Commits

Commit 4705ffecb990bd41b6f7d697fd11f6efc4599a56

Authored by 王军波
1 parent 8ba6ac3d

更新2.1.1

Inline Side-by-side
Showing 20 changed files with 17 additions and 15 deletions
CNLiveChatSDKDemo/CNLiveChatSDKDemo.xcodeproj/project.pbxproj
  View file @4705ffe
@@ -7,10 +7,10 @@ @@ -7,10 +7,10 @@
7 objects = { 7 objects = {
8 8
9 /* Begin PBXBuildFile section */ 9 /* Begin PBXBuildFile section */
10 - D20C82AB1EEE892400BB609F /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82AA1EEE892400BB609F /* CNLiveChatManager.framework */; };  
11 - D20C82AD1EEE892800BB609F /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82AA1EEE892400BB609F /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };  
12 - D20C82AF1EEE892B00BB609F /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82A81EEE891D00BB609F /* CNLiveMsgTools.framework */; };  
13 - D20C82B01EEE892B00BB609F /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82A81EEE891D00BB609F /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 10 + D20C82B61EEEA34200BB609F /* CNLiveChatManager.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82B51EEEA34200BB609F /* CNLiveChatManager.framework */; };
  11 + D20C82B81EEEA34500BB609F /* CNLiveChatManager.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82B51EEEA34200BB609F /* CNLiveChatManager.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
  12 + D20C82BA1EEEA34800BB609F /* CNLiveMsgTools.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82B31EEEA33900BB609F /* CNLiveMsgTools.framework */; };
  13 + D20C82BB1EEEA34800BB609F /* CNLiveMsgTools.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = D20C82B31EEEA33900BB609F /* CNLiveMsgTools.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
14 D2239CD41EE94F31005572FB /* praiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2239CD31EE94F31005572FB /* praiseModel.m */; }; 14 D2239CD41EE94F31005572FB /* praiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D2239CD31EE94F31005572FB /* praiseModel.m */; };
15 D231941F1E70101500111C3B /* MessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D231941E1E70101500111C3B /* MessageModel.m */; }; 15 D231941F1E70101500111C3B /* MessageModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D231941E1E70101500111C3B /* MessageModel.m */; };
16 D231C8A61E6FFC2700EAC427 /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D231C8A51E6FFC2700EAC427 /* ChatRoomViewController.m */; }; 16 D231C8A61E6FFC2700EAC427 /* ChatRoomViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D231C8A51E6FFC2700EAC427 /* ChatRoomViewController.m */; };
@@ -26,14 +26,14 @@ @@ -26,14 +26,14 @@
26 /* End PBXBuildFile section */ 26 /* End PBXBuildFile section */
27 27
28 /* Begin PBXCopyFilesBuildPhase section */ 28 /* Begin PBXCopyFilesBuildPhase section */
29 - D20C82AE1EEE892900BB609F /* Embed Frameworks */ = { 29 + D20C82B91EEEA34500BB609F /* Embed Frameworks */ = {
30 isa = PBXCopyFilesBuildPhase; 30 isa = PBXCopyFilesBuildPhase;
31 buildActionMask = 2147483647; 31 buildActionMask = 2147483647;
32 dstPath = ""; 32 dstPath = "";
33 dstSubfolderSpec = 10; 33 dstSubfolderSpec = 10;
34 files = ( 34 files = (
35 - D20C82AD1EEE892800BB609F /* CNLiveChatManager.framework in Embed Frameworks */,  
36 - D20C82B01EEE892B00BB609F /* CNLiveMsgTools.framework in Embed Frameworks */, 35 + D20C82B81EEEA34500BB609F /* CNLiveChatManager.framework in Embed Frameworks */,
  36 + D20C82BB1EEEA34800BB609F /* CNLiveMsgTools.framework in Embed Frameworks */,
37 ); 37 );
38 name = "Embed Frameworks"; 38 name = "Embed Frameworks";
39 runOnlyForDeploymentPostprocessing = 0; 39 runOnlyForDeploymentPostprocessing = 0;
@@ -41,8 +41,8 @@ @@ -41,8 +41,8 @@
41 /* End PBXCopyFilesBuildPhase section */ 41 /* End PBXCopyFilesBuildPhase section */
42 42
43 /* Begin PBXFileReference section */ 43 /* Begin PBXFileReference section */
44 - D20C82A81EEE891D00BB609F /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };  
45 - D20C82AA1EEE892400BB609F /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; }; 44 + D20C82B31EEEA33900BB609F /* CNLiveMsgTools.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveMsgTools.framework; sourceTree = "<group>"; };
  45 + D20C82B51EEEA34200BB609F /* CNLiveChatManager.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveChatManager.framework; sourceTree = "<group>"; };
46 D2239CD21EE94F31005572FB /* praiseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = praiseModel.h; sourceTree = "<group>"; }; 46 D2239CD21EE94F31005572FB /* praiseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = praiseModel.h; sourceTree = "<group>"; };
47 D2239CD31EE94F31005572FB /* praiseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = praiseModel.m; sourceTree = "<group>"; }; 47 D2239CD31EE94F31005572FB /* praiseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = praiseModel.m; sourceTree = "<group>"; };
48 D231941D1E70101500111C3B /* MessageModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageModel.h; sourceTree = "<group>"; }; 48 D231941D1E70101500111C3B /* MessageModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageModel.h; sourceTree = "<group>"; };
@@ -73,8 +73,8 @@ @@ -73,8 +73,8 @@
73 isa = PBXFrameworksBuildPhase; 73 isa = PBXFrameworksBuildPhase;
74 buildActionMask = 2147483647; 74 buildActionMask = 2147483647;
75 files = ( 75 files = (
76 - D20C82AF1EEE892B00BB609F /* CNLiveMsgTools.framework in Frameworks */,  
77 - D20C82AB1EEE892400BB609F /* CNLiveChatManager.framework in Frameworks */, 76 + D20C82BA1EEEA34800BB609F /* CNLiveMsgTools.framework in Frameworks */,
  77 + D20C82B61EEEA34200BB609F /* CNLiveChatManager.framework in Frameworks */,
78 ); 78 );
79 runOnlyForDeploymentPostprocessing = 0; 79 runOnlyForDeploymentPostprocessing = 0;
80 }; 80 };
@@ -119,8 +119,6 @@ @@ -119,8 +119,6 @@
119 D264D5971E6FDE02002CDF41 = { 119 D264D5971E6FDE02002CDF41 = {
120 isa = PBXGroup; 120 isa = PBXGroup;
121 children = ( 121 children = (
122 - D20C82AA1EEE892400BB609F /* CNLiveChatManager.framework */,  
123 - D20C82A81EEE891D00BB609F /* CNLiveMsgTools.framework */,  
124 D264D5A21E6FDE02002CDF41 /* CNLiveChatSDKDemo */, 122 D264D5A21E6FDE02002CDF41 /* CNLiveChatSDKDemo */,
125 D264D5A11E6FDE02002CDF41 /* Products */, 123 D264D5A11E6FDE02002CDF41 /* Products */,
126 ); 124 );
@@ -137,6 +135,8 @@ @@ -137,6 +135,8 @@
137 D264D5A21E6FDE02002CDF41 /* CNLiveChatSDKDemo */ = { 135 D264D5A21E6FDE02002CDF41 /* CNLiveChatSDKDemo */ = {
138 isa = PBXGroup; 136 isa = PBXGroup;
139 children = ( 137 children = (
  138 + D20C82B51EEEA34200BB609F /* CNLiveChatManager.framework */,
  139 + D20C82B31EEEA33900BB609F /* CNLiveMsgTools.framework */,
140 D264D5A61E6FDE02002CDF41 /* AppDelegate.h */, 140 D264D5A61E6FDE02002CDF41 /* AppDelegate.h */,
141 D264D5A71E6FDE02002CDF41 /* AppDelegate.m */, 141 D264D5A71E6FDE02002CDF41 /* AppDelegate.m */,
142 D23194201E70101B00111C3B /* Model */, 142 D23194201E70101B00111C3B /* Model */,
@@ -170,7 +170,7 @@ @@ -170,7 +170,7 @@
170 D264D59C1E6FDE02002CDF41 /* Sources */, 170 D264D59C1E6FDE02002CDF41 /* Sources */,
171 D264D59D1E6FDE02002CDF41 /* Frameworks */, 171 D264D59D1E6FDE02002CDF41 /* Frameworks */,
172 D264D59E1E6FDE02002CDF41 /* Resources */, 172 D264D59E1E6FDE02002CDF41 /* Resources */,
173 - D20C82AE1EEE892900BB609F /* Embed Frameworks */, 173 + D20C82B91EEEA34500BB609F /* Embed Frameworks */,
174 ); 174 );
175 buildRules = ( 175 buildRules = (
176 ); 176 );
@@ -365,6 +365,7 @@ @@ -365,6 +365,7 @@
365 FRAMEWORK_SEARCH_PATHS = ( 365 FRAMEWORK_SEARCH_PATHS = (
366 "$(inherited)", 366 "$(inherited)",
367 "$(PROJECT_DIR)", 367 "$(PROJECT_DIR)",
  368 + "$(PROJECT_DIR)/CNLiveChatSDKDemo",
368 ); 369 );
369 GCC_PREFIX_HEADER = "$(SRCROOT)/CNLiveChatSDKDemo/PrefixHeader.pch"; 370 GCC_PREFIX_HEADER = "$(SRCROOT)/CNLiveChatSDKDemo/PrefixHeader.pch";
370 INFOPLIST_FILE = CNLiveChatSDKDemo/Info.plist; 371 INFOPLIST_FILE = CNLiveChatSDKDemo/Info.plist;
@@ -383,6 +384,7 @@ @@ -383,6 +384,7 @@
383 FRAMEWORK_SEARCH_PATHS = ( 384 FRAMEWORK_SEARCH_PATHS = (
384 "$(inherited)", 385 "$(inherited)",
385 "$(PROJECT_DIR)", 386 "$(PROJECT_DIR)",
  387 + "$(PROJECT_DIR)/CNLiveChatSDKDemo",
386 ); 388 );
387 GCC_PREFIX_HEADER = "$(SRCROOT)/CNLiveChatSDKDemo/PrefixHeader.pch"; 389 GCC_PREFIX_HEADER = "$(SRCROOT)/CNLiveChatSDKDemo/PrefixHeader.pch";
388 INFOPLIST_FILE = CNLiveChatSDKDemo/Info.plist; 390 INFOPLIST_FILE = CNLiveChatSDKDemo/Info.plist;
CNLiveChatSDKDemo/CNLiveChatManager.framework/CNLiveChatManager renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/CNLiveChatManager
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatManager.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatManager.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatMessage.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatStatusDefine.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatStatusDefine.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveChatUserInfo.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentCountResult.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentCountResult.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentDetailInfoResult.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentDetailInfoResult.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentListResult.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentListResult.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentManager.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Headers/CNLiveCommentManager.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveChatManager.framework/Info.plist renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveChatManager.framework/Info.plist
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveMsgTools.framework/CNLiveMsgTools renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/CNLiveMsgTools
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveMsgTools.framework/Emoji.plist renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/Emoji.plist
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveMsgTools.framework/Headers/CNLiveMsgManager.h renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/Headers/CNLiveMsgManager.h
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveMsgTools.framework/Info.plist renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/Info.plist
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveMsgTools.framework/RCConfig.plist renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/RCConfig.plist
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveMsgTools.framework/en.lproj/RongCloudKit.strings renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/en.lproj/RongCloudKit.strings
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveMsgTools.framework/release_notes_ios.txt renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/release_notes_ios.txt
  View file @4705ffe
CNLiveChatSDKDemo/CNLiveMsgTools.framework/zh-Hans.lproj/RongCloudKit.strings renamed to CNLiveChatSDKDemo/CNLiveChatSDKDemo/CNLiveMsgTools.framework/zh-Hans.lproj/RongCloudKit.strings
View file @4705ffe
No preview for this file type
CNLiveChatSDKDemo/CNLiveChatSDKDemo/ViewController.m
  View file @4705ffe
@@ -44,7 +44,7 @@ @@ -44,7 +44,7 @@
44 44
45 - (UIButton *)chatRoomBtn { 45 - (UIButton *)chatRoomBtn {
46 if (!_chatRoomBtn) { 46 if (!_chatRoomBtn) {
47 - _chatRoomBtn = [self createButtonWithFrame:CGRectMake((KScreenWidth - 100) * 0.5, KScreenHeight * 0.6, 100, 30) title:@"聊天室"]; 47 + _chatRoomBtn = [self createButtonWithFrame:CGRectMake((KScreenWidth - 100) * 0.5, KScreenHeight * 0.55, 100, 30) title:@"聊天室"];
48 [_chatRoomBtn addTarget:self action:@selector(goToChatRoom) forControlEvents:UIControlEventTouchUpInside]; 48 [_chatRoomBtn addTarget:self action:@selector(goToChatRoom) forControlEvents:UIControlEventTouchUpInside];
49 } 49 }
50 return _chatRoomBtn; 50 return _chatRoomBtn;