-
Conflicts: CNLivePlayerSDKTest/CNLivePlayerSDK.framework/CNLivePlayerSDK CNLivePlayerSDKTest/CNLivePlayerSDK.framework/Info.plist CNLivePlayerSDKTest/CNLivePlayerSDKTest.xcodeproj/project.pbxproj CNLivePlayerSDKTest/CNLivePlayerSDKTest/Player/CNLiveViewController.m CNLivePlayerSDKTest/CNLivePlayerSDKTest/Streamer/StreamerDetailViewController.m
-
1、推流结束状态传入后台 2、点播播放302跳转