Commit fe37cc0b6a4db426d1f141af921c557f0fbc4643
1 parent
d59230b4
no message
Showing
4 changed files
with
156 additions
and
3 deletions
LiveVideoCloud.xcodeproj/project.pbxproj
... | ... | @@ -283,6 +283,19 @@ |
283 | 283 | D25BF8A51E80EC76007FB138 /* 头像.jpg in Resources */ = {isa = PBXBuildFile; fileRef = D25BF8A41E80EC76007FB138 /* 头像.jpg */; }; |
284 | 284 | D260E6101F0CE8690095E49D /* praiseModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D260E60F1F0CE8690095E49D /* praiseModel.m */; }; |
285 | 285 | D263AFC21F13300600A963A6 /* CNLiveStat.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D263AFC11F13300600A963A6 /* CNLiveStat.framework */; }; |
286 | + D275E95D1F29F9F900768F26 /* CNLiveQQ.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E9391F29F9F900768F26 /* CNLiveQQ.m */; }; | |
287 | + D275E95E1F29F9F900768F26 /* CNLiveShare.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E93B1F29F9F900768F26 /* CNLiveShare.m */; }; | |
288 | + D275E95F1F29F9F900768F26 /* CNLiveShareModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E93D1F29F9F900768F26 /* CNLiveShareModel.m */; }; | |
289 | + D275E9601F29F9F900768F26 /* CNLiveSina.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E93F1F29F9F900768F26 /* CNLiveSina.m */; }; | |
290 | + D275E9611F29F9F900768F26 /* CNLiveUserInfoModel.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E9421F29F9F900768F26 /* CNLiveUserInfoModel.m */; }; | |
291 | + D275E9621F29F9F900768F26 /* CNLiveWeChat.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E9441F29F9F900768F26 /* CNLiveWeChat.m */; }; | |
292 | + D275E9631F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.m in Sources */ = {isa = PBXBuildFile; fileRef = D275E9461F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.m */; }; | |
293 | + D275E9641F29F9F900768F26 /* TencentOpenAPI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D275E9491F29F9F900768F26 /* TencentOpenAPI.framework */; }; | |
294 | + D275E9651F29F9F900768F26 /* TencentOpenApi_IOS_Bundle.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D275E94A1F29F9F900768F26 /* TencentOpenApi_IOS_Bundle.bundle */; }; | |
295 | + D275E9661F29F9F900768F26 /* libWeiboSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D275E94C1F29F9F900768F26 /* libWeiboSDK.a */; }; | |
296 | + D275E9671F29F9F900768F26 /* WeiboSDK.bundle in Resources */ = {isa = PBXBuildFile; fileRef = D275E9551F29F9F900768F26 /* WeiboSDK.bundle */; }; | |
297 | + D275E9681F29F9F900768F26 /* libWeChatSDK.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D275E9591F29F9F900768F26 /* libWeChatSDK.a */; }; | |
298 | + D275E9691F29F9F900768F26 /* read_me.txt in Resources */ = {isa = PBXBuildFile; fileRef = D275E95A1F29F9F900768F26 /* read_me.txt */; }; | |
286 | 299 | D2888D941E6EB8B4003A77C8 /* LVCTabBar.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */; }; |
287 | 300 | D2888D9E1E6EBF1B003A77C8 /* LVCLiveViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = D2888D9B1E6EBF1B003A77C8 /* LVCLiveViewController.m */; }; |
288 | 301 | D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */ = {isa = PBXBuildFile; fileRef = D29D88471E88C53300543A03 /* LVCUGCLivePrepareView.m */; }; |
... | ... | @@ -885,6 +898,40 @@ |
885 | 898 | D260E60E1F0CE8690095E49D /* praiseModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = praiseModel.h; sourceTree = "<group>"; }; |
886 | 899 | D260E60F1F0CE8690095E49D /* praiseModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = praiseModel.m; sourceTree = "<group>"; }; |
887 | 900 | D263AFC11F13300600A963A6 /* CNLiveStat.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = CNLiveStat.framework; sourceTree = "<group>"; }; |
901 | + D275E9371F29F9F900768F26 /* CNLiveEventHandlerDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveEventHandlerDef.h; sourceTree = "<group>"; }; | |
902 | + D275E9381F29F9F900768F26 /* CNLiveQQ.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveQQ.h; sourceTree = "<group>"; }; | |
903 | + D275E9391F29F9F900768F26 /* CNLiveQQ.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveQQ.m; sourceTree = "<group>"; }; | |
904 | + D275E93A1F29F9F900768F26 /* CNLiveShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveShare.h; sourceTree = "<group>"; }; | |
905 | + D275E93B1F29F9F900768F26 /* CNLiveShare.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveShare.m; sourceTree = "<group>"; }; | |
906 | + D275E93C1F29F9F900768F26 /* CNLiveShareModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveShareModel.h; sourceTree = "<group>"; }; | |
907 | + D275E93D1F29F9F900768F26 /* CNLiveShareModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveShareModel.m; sourceTree = "<group>"; }; | |
908 | + D275E93E1F29F9F900768F26 /* CNLiveSina.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveSina.h; sourceTree = "<group>"; }; | |
909 | + D275E93F1F29F9F900768F26 /* CNLiveSina.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveSina.m; sourceTree = "<group>"; }; | |
910 | + D275E9401F29F9F900768F26 /* CNLiveTypeDef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveTypeDef.h; sourceTree = "<group>"; }; | |
911 | + D275E9411F29F9F900768F26 /* CNLiveUserInfoModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveUserInfoModel.h; sourceTree = "<group>"; }; | |
912 | + D275E9421F29F9F900768F26 /* CNLiveUserInfoModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveUserInfoModel.m; sourceTree = "<group>"; }; | |
913 | + D275E9431F29F9F900768F26 /* CNLiveWeChat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CNLiveWeChat.h; sourceTree = "<group>"; }; | |
914 | + D275E9441F29F9F900768F26 /* CNLiveWeChat.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CNLiveWeChat.m; sourceTree = "<group>"; }; | |
915 | + D275E9451F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSDictionary+CNLiveSafeDictionary.h"; sourceTree = "<group>"; }; | |
916 | + D275E9461F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSDictionary+CNLiveSafeDictionary.m"; sourceTree = "<group>"; }; | |
917 | + D275E9491F29F9F900768F26 /* TencentOpenAPI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = TencentOpenAPI.framework; sourceTree = "<group>"; }; | |
918 | + D275E94A1F29F9F900768F26 /* TencentOpenApi_IOS_Bundle.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = TencentOpenApi_IOS_Bundle.bundle; sourceTree = "<group>"; }; | |
919 | + D275E94C1F29F9F900768F26 /* libWeiboSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeiboSDK.a; sourceTree = "<group>"; }; | |
920 | + D275E94D1F29F9F900768F26 /* WBHttpRequest+WeiboGame.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboGame.h"; sourceTree = "<group>"; }; | |
921 | + D275E94E1F29F9F900768F26 /* WBHttpRequest+WeiboShare.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboShare.h"; sourceTree = "<group>"; }; | |
922 | + D275E94F1F29F9F900768F26 /* WBHttpRequest+WeiboToken.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboToken.h"; sourceTree = "<group>"; }; | |
923 | + D275E9501F29F9F900768F26 /* WBHttpRequest+WeiboUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "WBHttpRequest+WeiboUser.h"; sourceTree = "<group>"; }; | |
924 | + D275E9511F29F9F900768F26 /* WBHttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBHttpRequest.h; sourceTree = "<group>"; }; | |
925 | + D275E9521F29F9F900768F26 /* WBSDKBasicButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBSDKBasicButton.h; sourceTree = "<group>"; }; | |
926 | + D275E9531F29F9F900768F26 /* WBSDKCommentButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBSDKCommentButton.h; sourceTree = "<group>"; }; | |
927 | + D275E9541F29F9F900768F26 /* WBSDKRelationshipButton.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WBSDKRelationshipButton.h; sourceTree = "<group>"; }; | |
928 | + D275E9551F29F9F900768F26 /* WeiboSDK.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = WeiboSDK.bundle; sourceTree = "<group>"; }; | |
929 | + D275E9561F29F9F900768F26 /* WeiboSDK.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeiboSDK.h; sourceTree = "<group>"; }; | |
930 | + D275E9571F29F9F900768F26 /* WeiboUser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeiboUser.h; sourceTree = "<group>"; }; | |
931 | + D275E9591F29F9F900768F26 /* libWeChatSDK.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libWeChatSDK.a; sourceTree = "<group>"; }; | |
932 | + D275E95A1F29F9F900768F26 /* read_me.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = read_me.txt; sourceTree = "<group>"; }; | |
933 | + D275E95B1F29F9F900768F26 /* WXApi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApi.h; sourceTree = "<group>"; }; | |
934 | + D275E95C1F29F9F900768F26 /* WXApiObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WXApiObject.h; sourceTree = "<group>"; }; | |
888 | 935 | D2888D921E6EB8B4003A77C8 /* LVCTabBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCTabBar.h; sourceTree = "<group>"; }; |
889 | 936 | D2888D931E6EB8B4003A77C8 /* LVCTabBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LVCTabBar.m; sourceTree = "<group>"; }; |
890 | 937 | D2888D9A1E6EBF1B003A77C8 /* LVCLiveViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LVCLiveViewController.h; sourceTree = "<group>"; }; |
... | ... | @@ -957,12 +1004,15 @@ |
957 | 1004 | D2393D2C1F02682000D3EE17 /* CNLiveUserSystemSDK.framework in Frameworks */, |
958 | 1005 | D2393D241F0256E900D3EE17 /* libz.tbd in Frameworks */, |
959 | 1006 | D2393D221F0256DC00D3EE17 /* libc++.tbd in Frameworks */, |
1007 | + D275E9641F29F9F900768F26 /* TencentOpenAPI.framework in Frameworks */, | |
960 | 1008 | D2393D201F0256AA00D3EE17 /* libsqlite3.tbd in Frameworks */, |
961 | 1009 | 8181D5431F1366F500959E3D /* CNLiveShortVideoSDK.framework in Frameworks */, |
962 | 1010 | D25BF8A31E80C4FC007FB138 /* Accelerate.framework in Frameworks */, |
963 | 1011 | D2393D0E1F0250A100D3EE17 /* libWeChatSDK.a in Frameworks */, |
964 | 1012 | D2393D1D1F0250A700D3EE17 /* libWeiboSDK.a in Frameworks */, |
1013 | + D275E9681F29F9F900768F26 /* libWeChatSDK.a in Frameworks */, | |
965 | 1014 | 8181D5441F1366F500959E3D /* GPUImage.framework in Frameworks */, |
1015 | + D275E9661F29F9F900768F26 /* libWeiboSDK.a in Frameworks */, | |
966 | 1016 | 8181D5721F13674200959E3D /* CNLivePlayerSDK.framework in Frameworks */, |
967 | 1017 | D2575C7D1E76A4F300E3A8FC /* NHGiftAnimtionSDK.a in Frameworks */, |
968 | 1018 | D263AFC21F13300600A963A6 /* CNLiveStat.framework in Frameworks */, |
... | ... | @@ -1445,6 +1495,7 @@ |
1445 | 1495 | D2029B831E6EAAA50027CD92 /* LiveVideoCloud */ = { |
1446 | 1496 | isa = PBXGroup; |
1447 | 1497 | children = ( |
1498 | + D275E9351F29F9F900768F26 /* CNLiveShareSDK */, | |
1448 | 1499 | D2029D0E1E6EAF510027CD92 /* AppDelegate */, |
1449 | 1500 | D2029BBB1E6EADD70027CD92 /* AppCustoms */, |
1450 | 1501 | D2029CDC1E6EAE2E0027CD92 /* UtilKits */, |
... | ... | @@ -2209,6 +2260,87 @@ |
2209 | 2260 | name = Frameworks; |
2210 | 2261 | sourceTree = "<group>"; |
2211 | 2262 | }; |
2263 | + D275E9351F29F9F900768F26 /* CNLiveShareSDK */ = { | |
2264 | + isa = PBXGroup; | |
2265 | + children = ( | |
2266 | + D275E9361F29F9F900768F26 /* Core */, | |
2267 | + D275E9471F29F9F900768F26 /* SDK */, | |
2268 | + ); | |
2269 | + path = CNLiveShareSDK; | |
2270 | + sourceTree = "<group>"; | |
2271 | + }; | |
2272 | + D275E9361F29F9F900768F26 /* Core */ = { | |
2273 | + isa = PBXGroup; | |
2274 | + children = ( | |
2275 | + D275E9371F29F9F900768F26 /* CNLiveEventHandlerDef.h */, | |
2276 | + D275E9381F29F9F900768F26 /* CNLiveQQ.h */, | |
2277 | + D275E9391F29F9F900768F26 /* CNLiveQQ.m */, | |
2278 | + D275E93A1F29F9F900768F26 /* CNLiveShare.h */, | |
2279 | + D275E93B1F29F9F900768F26 /* CNLiveShare.m */, | |
2280 | + D275E93C1F29F9F900768F26 /* CNLiveShareModel.h */, | |
2281 | + D275E93D1F29F9F900768F26 /* CNLiveShareModel.m */, | |
2282 | + D275E93E1F29F9F900768F26 /* CNLiveSina.h */, | |
2283 | + D275E93F1F29F9F900768F26 /* CNLiveSina.m */, | |
2284 | + D275E9401F29F9F900768F26 /* CNLiveTypeDef.h */, | |
2285 | + D275E9411F29F9F900768F26 /* CNLiveUserInfoModel.h */, | |
2286 | + D275E9421F29F9F900768F26 /* CNLiveUserInfoModel.m */, | |
2287 | + D275E9431F29F9F900768F26 /* CNLiveWeChat.h */, | |
2288 | + D275E9441F29F9F900768F26 /* CNLiveWeChat.m */, | |
2289 | + D275E9451F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.h */, | |
2290 | + D275E9461F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.m */, | |
2291 | + ); | |
2292 | + path = Core; | |
2293 | + sourceTree = "<group>"; | |
2294 | + }; | |
2295 | + D275E9471F29F9F900768F26 /* SDK */ = { | |
2296 | + isa = PBXGroup; | |
2297 | + children = ( | |
2298 | + D275E9481F29F9F900768F26 /* QQSDK */, | |
2299 | + D275E94B1F29F9F900768F26 /* SinaSDK */, | |
2300 | + D275E9581F29F9F900768F26 /* WeChatSDK */, | |
2301 | + ); | |
2302 | + path = SDK; | |
2303 | + sourceTree = "<group>"; | |
2304 | + }; | |
2305 | + D275E9481F29F9F900768F26 /* QQSDK */ = { | |
2306 | + isa = PBXGroup; | |
2307 | + children = ( | |
2308 | + D275E9491F29F9F900768F26 /* TencentOpenAPI.framework */, | |
2309 | + D275E94A1F29F9F900768F26 /* TencentOpenApi_IOS_Bundle.bundle */, | |
2310 | + ); | |
2311 | + path = QQSDK; | |
2312 | + sourceTree = "<group>"; | |
2313 | + }; | |
2314 | + D275E94B1F29F9F900768F26 /* SinaSDK */ = { | |
2315 | + isa = PBXGroup; | |
2316 | + children = ( | |
2317 | + D275E94C1F29F9F900768F26 /* libWeiboSDK.a */, | |
2318 | + D275E94D1F29F9F900768F26 /* WBHttpRequest+WeiboGame.h */, | |
2319 | + D275E94E1F29F9F900768F26 /* WBHttpRequest+WeiboShare.h */, | |
2320 | + D275E94F1F29F9F900768F26 /* WBHttpRequest+WeiboToken.h */, | |
2321 | + D275E9501F29F9F900768F26 /* WBHttpRequest+WeiboUser.h */, | |
2322 | + D275E9511F29F9F900768F26 /* WBHttpRequest.h */, | |
2323 | + D275E9521F29F9F900768F26 /* WBSDKBasicButton.h */, | |
2324 | + D275E9531F29F9F900768F26 /* WBSDKCommentButton.h */, | |
2325 | + D275E9541F29F9F900768F26 /* WBSDKRelationshipButton.h */, | |
2326 | + D275E9551F29F9F900768F26 /* WeiboSDK.bundle */, | |
2327 | + D275E9561F29F9F900768F26 /* WeiboSDK.h */, | |
2328 | + D275E9571F29F9F900768F26 /* WeiboUser.h */, | |
2329 | + ); | |
2330 | + path = SinaSDK; | |
2331 | + sourceTree = "<group>"; | |
2332 | + }; | |
2333 | + D275E9581F29F9F900768F26 /* WeChatSDK */ = { | |
2334 | + isa = PBXGroup; | |
2335 | + children = ( | |
2336 | + D275E9591F29F9F900768F26 /* libWeChatSDK.a */, | |
2337 | + D275E95A1F29F9F900768F26 /* read_me.txt */, | |
2338 | + D275E95B1F29F9F900768F26 /* WXApi.h */, | |
2339 | + D275E95C1F29F9F900768F26 /* WXApiObject.h */, | |
2340 | + ); | |
2341 | + path = WeChatSDK; | |
2342 | + sourceTree = "<group>"; | |
2343 | + }; | |
2212 | 2344 | D2888D911E6EB897003A77C8 /* View */ = { |
2213 | 2345 | isa = PBXGroup; |
2214 | 2346 | children = ( |
... | ... | @@ -2462,9 +2594,11 @@ |
2462 | 2594 | 8181D5641F13671B00959E3D /* item0204.bundle in Resources */, |
2463 | 2595 | 8181D56E1F13671B00959E3D /* KSYGPUResource.bundle in Resources */, |
2464 | 2596 | 8181D55C1F13671B00959E3D /* Let_It_Go.mp3 in Resources */, |
2597 | + D275E9651F29F9F900768F26 /* TencentOpenApi_IOS_Bundle.bundle in Resources */, | |
2465 | 2598 | D2575C7F1E76A4F300E3A8FC /* NHPlaneViews.xib in Resources */, |
2466 | 2599 | D2393D0F1F0250A100D3EE17 /* read_me.txt in Resources */, |
2467 | 2600 | D2393D1E1F0250A700D3EE17 /* WeiboSDK.bundle in Resources */, |
2601 | + D275E9691F29F9F900768F26 /* read_me.txt in Resources */, | |
2468 | 2602 | D2575C7B1E76A4F300E3A8FC /* NHCarViews.xib in Resources */, |
2469 | 2603 | 8181D56A1F13671B00959E3D /* tears.bundle in Resources */, |
2470 | 2604 | 8181D5691F13671B00959E3D /* PrincessCrown.bundle in Resources */, |
... | ... | @@ -2486,6 +2620,7 @@ |
2486 | 2620 | D2029CB01E6EADE10027CD92 /* MJRefresh.bundle in Resources */, |
2487 | 2621 | 8181D56F1F13671B00959E3D /* Stay.mp3 in Resources */, |
2488 | 2622 | 8181D55F1F13671B00959E3D /* ColorCrown.bundle in Resources */, |
2623 | + D275E9671F29F9F900768F26 /* WeiboSDK.bundle in Resources */, | |
2489 | 2624 | D2575C7C1E76A4F300E3A8FC /* NHFighterView.nib in Resources */, |
2490 | 2625 | 8181D5631F13671B00959E3D /* hartshorn.bundle in Resources */, |
2491 | 2626 | 8181D5621F13671B00959E3D /* HappyRabbi.bundle in Resources */, |
... | ... | @@ -2559,6 +2694,7 @@ |
2559 | 2694 | D2029CBC1E6EADE10027CD92 /* SDWebImageDownloaderOperation.m in Sources */, |
2560 | 2695 | D2029CA51E6EADE10027CD92 /* MJRefreshFooter.m in Sources */, |
2561 | 2696 | D22830FC1E77C2D900627701 /* BottomToolView.m in Sources */, |
2697 | + D275E9611F29F9F900768F26 /* CNLiveUserInfoModel.m in Sources */, | |
2562 | 2698 | 4BD856021EBACD530082061D /* AFURLSessionManager.m in Sources */, |
2563 | 2699 | D2EBC87B1F02108F00F198FB /* LVCUGCLiveListModel.m in Sources */, |
2564 | 2700 | 4BD855FD1EBACD530082061D /* AFNetworkReachabilityManager.m in Sources */, |
... | ... | @@ -2611,6 +2747,7 @@ |
2611 | 2747 | D2EBC88B1F02361600F198FB /* LVCUGCLiveListView.m in Sources */, |
2612 | 2748 | D2029CA61E6EADE10027CD92 /* MJRefreshHeader.m in Sources */, |
2613 | 2749 | D2029CC41E6EADE10027CD92 /* UIImageView+WebCache.m in Sources */, |
2750 | + D275E95E1F29F9F900768F26 /* CNLiveShare.m in Sources */, | |
2614 | 2751 | 4B45CE801EB86A590079AFB7 /* idAndPwdView.m in Sources */, |
2615 | 2752 | 8178D4251F02043500AA78A4 /* LVCLivePlayerController.m in Sources */, |
2616 | 2753 | D236967E1E7F9E4100E4BF71 /* GiftPayButton.m in Sources */, |
... | ... | @@ -2619,6 +2756,7 @@ |
2619 | 2756 | 4B45CE831EB86A590079AFB7 /* LVCMineModel.m in Sources */, |
2620 | 2757 | 4B45CE791EB86A590079AFB7 /* MineAboutUsController.m in Sources */, |
2621 | 2758 | 81A483081E88B6140097A80A /* UIView+ViewController.m in Sources */, |
2759 | + D275E9621F29F9F900768F26 /* CNLiveWeChat.m in Sources */, | |
2622 | 2760 | D2EBC8721F02108000F198FB /* LVCLiveActivityInfoService.m in Sources */, |
2623 | 2761 | D2029CC81E6EADE10027CD92 /* SVProgressAnimatedView.m in Sources */, |
2624 | 2762 | 810B65071E779B1F00133E15 /* ViewController+MASAdditions.m in Sources */, |
... | ... | @@ -2659,6 +2797,7 @@ |
2659 | 2797 | D25530031E79115100DF38A5 /* AnimQueueManager.m in Sources */, |
2660 | 2798 | D2029B861E6EAAA50027CD92 /* main.m in Sources */, |
2661 | 2799 | 8174B11A1F14C3E2001767F3 /* FaceUFiterView.m in Sources */, |
2800 | + D275E9601F29F9F900768F26 /* CNLiveSina.m in Sources */, | |
2662 | 2801 | 4B45CEA71EB86B9F0079AFB7 /* NSObject+UserModel.m in Sources */, |
2663 | 2802 | 4BD856061EBACD530082061D /* UIButton+AFNetworking.m in Sources */, |
2664 | 2803 | D2029C9F1E6EADE10027CD92 /* NSObject+MJKeyValue.m in Sources */, |
... | ... | @@ -2683,6 +2822,7 @@ |
2683 | 2822 | D2393D011F020D5700D3EE17 /* FeedbackViewController.m in Sources */, |
2684 | 2823 | D29D88481E88C53300543A03 /* LVCUGCLivePrepareView.m in Sources */, |
2685 | 2824 | D2029D091E6EAE2E0027CD92 /* Foundation+Log.m in Sources */, |
2825 | + D275E95D1F29F9F900768F26 /* CNLiveQQ.m in Sources */, | |
2686 | 2826 | 4B45CEAB1EB86BFA0079AFB7 /* NSString+ZXExtension.m in Sources */, |
2687 | 2827 | 8156A7BA1F0F9541007EE146 /* AECommonCell.m in Sources */, |
2688 | 2828 | D2029BCA1E6EADD70027CD92 /* BaseModel.m in Sources */, |
... | ... | @@ -2720,6 +2860,7 @@ |
2720 | 2860 | D2EBC8711F02108000F198FB /* LiveListService.m in Sources */, |
2721 | 2861 | 810B64FF1E779B1F00133E15 /* MASConstraint.m in Sources */, |
2722 | 2862 | 8178D4611F02060B00AA78A4 /* LVCChatView.m in Sources */, |
2863 | + D275E9631F29F9F900768F26 /* NSDictionary+CNLiveSafeDictionary.m in Sources */, | |
2723 | 2864 | D25BF87A1E7B8A82007FB138 /* FilterFunctionView.m in Sources */, |
2724 | 2865 | D207BEA11E84C1EC006A0CE8 /* AnimationBaseView.m in Sources */, |
2725 | 2866 | 4B45CE971EB86A760079AFB7 /* UIButton+createButton.m in Sources */, |
... | ... | @@ -2744,6 +2885,7 @@ |
2744 | 2885 | 8178D4711F0239AD00AA78A4 /* LVCPlayerLoadingView.m in Sources */, |
2745 | 2886 | D2EBC8A01F034C5500F198FB /* LVCCommentView.m in Sources */, |
2746 | 2887 | D245715C1E83A62B00AA85D6 /* BounceView.m in Sources */, |
2888 | + D275E95F1F29F9F900768F26 /* CNLiveShareModel.m in Sources */, | |
2747 | 2889 | D2029D021E6EAE2E0027CD92 /* UIImage+ScaleImageSize.m in Sources */, |
2748 | 2890 | D2029BCC1E6EADD70027CD92 /* BaseView.m in Sources */, |
2749 | 2891 | 816A78D11F15BE28009A0839 /* DecalView.m in Sources */, |
... | ... | @@ -2908,6 +3050,7 @@ |
2908 | 3050 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/CNLiveSDK", |
2909 | 3051 | "$(PROJECT_DIR)", |
2910 | 3052 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/QQSDK", |
3053 | + "$(PROJECT_DIR)/LiveVideoCloud/CNLiveShareSDK/SDK/QQSDK", | |
2911 | 3054 | ); |
2912 | 3055 | GCC_PREFIX_HEADER = "$(SRCROOT)/LiveVideoCloud/PrefixHeader.pch"; |
2913 | 3056 | INFOPLIST_FILE = LiveVideoCloud/Info.plist; |
... | ... | @@ -2918,7 +3061,11 @@ |
2918 | 3061 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource", |
2919 | 3062 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/WeChatSDK", |
2920 | 3063 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/SinaSDK", |
3064 | + "$(PROJECT_DIR)/LiveVideoCloud/CNLiveShareSDK/SDK/SinaSDK", | |
3065 | + "$(PROJECT_DIR)/LiveVideoCloud/CNLiveShareSDK/SDK/WeChatSDK", | |
2921 | 3066 | ); |
3067 | + OTHER_LDFLAGS = ""; | |
3068 | + OTHER_LIBTOOLFLAGS = ""; | |
2922 | 3069 | PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shipinzhongguoInhouse; |
2923 | 3070 | PRODUCT_NAME = "$(TARGET_NAME)"; |
2924 | 3071 | PROVISIONING_PROFILE = ""; |
... | ... | @@ -2941,6 +3088,7 @@ |
2941 | 3088 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/CNLiveSDK", |
2942 | 3089 | "$(PROJECT_DIR)", |
2943 | 3090 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/QQSDK", |
3091 | + "$(PROJECT_DIR)/LiveVideoCloud/CNLiveShareSDK/SDK/QQSDK", | |
2944 | 3092 | ); |
2945 | 3093 | GCC_PREFIX_HEADER = "$(SRCROOT)/LiveVideoCloud/PrefixHeader.pch"; |
2946 | 3094 | INFOPLIST_FILE = LiveVideoCloud/Info.plist; |
... | ... | @@ -2951,7 +3099,11 @@ |
2951 | 3099 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/Sections/InteractionSections/Gift/GiftResource", |
2952 | 3100 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/WeChatSDK", |
2953 | 3101 | "$(PROJECT_DIR)/LiveVideoCloud/Classes/SDK/SinaSDK", |
3102 | + "$(PROJECT_DIR)/LiveVideoCloud/CNLiveShareSDK/SDK/SinaSDK", | |
3103 | + "$(PROJECT_DIR)/LiveVideoCloud/CNLiveShareSDK/SDK/WeChatSDK", | |
2954 | 3104 | ); |
3105 | + OTHER_LDFLAGS = ""; | |
3106 | + OTHER_LIBTOOLFLAGS = ""; | |
2955 | 3107 | PRODUCT_BUNDLE_IDENTIFIER = com.cnlive.shipinzhongguoInhouse; |
2956 | 3108 | PRODUCT_NAME = "$(TARGET_NAME)"; |
2957 | 3109 | PROVISIONING_PROFILE = ""; | ... | ... |
LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCBackgroundView.m
LiveVideoCloud/Classes/Sections/UGCSections/View/LVCUGCPlayerLoadingView.m
LiveVideoCloud/Classes/Sections/homeSections/View/LVCCommentView.m
... | ... | @@ -72,7 +72,8 @@ static NSString *commentCellId = @"commentCellId"; |
72 | 72 | [_praiseArrayM addObject:model]; |
73 | 73 | if (result.content) { |
74 | 74 | CGRect contentRect = [result.content boundingRectWithSize:CGSizeMake(KScreenWidth-20, MAXFLOAT) options:NSStringDrawingUsesLineFragmentOrigin | NSStringDrawingUsesFontLeading attributes:@{NSFontAttributeName : [UIFont systemFontOfSize:14]} context:nil]; |
75 | - CGFloat contentHeight = contentRect.size.height; | |
75 | + | |
76 | + CGFloat contentHeight = contentRect.size.height; | |
76 | 77 | [_cellHeightArrayM addObject:[NSString stringWithFormat:@"%f",contentHeight]]; |
77 | 78 | } else { |
78 | 79 | [_cellHeightArrayM addObject:@"0"]; | ... | ... |