Commit 4705ffecb990bd41b6f7d697fd11f6efc4599a56

Authored by 王军波
1 parent 8ba6ac3d

更新2.1.1

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