Conflicts:
LiveVideoCloud/LiveVideoCloud.xcodeproj/project.pbxproj
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/bottom_shadow.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/bottom_shadow.imageset/bottom_shadow.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/dot.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/dot.imageset/dot@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/fullscreen.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/fullscreen.imageset/fullscreen@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/nonfullscreen.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/nonfullscreen.imageset/nonfullscreen@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/pause.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/pause.imageset/pause@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play.imageset/play@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play_back.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/play_back.imageset/play_back.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/bottom_shadow.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/bottom_shadow.imageset/bottom_shadow.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/dot.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/dot.imageset/dot@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/fullscreen.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/fullscreen.imageset/fullscreen@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/nonfullscreen.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/nonfullscreen.imageset/nonfullscreen@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/pause.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/pause.imageset/pause@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play.imageset/play@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play_back.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/play_back.imageset/play_back.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/top_shadow.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/top_shadow.imageset/top_shadow.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/返回.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/player/返回.imageset/返回@3x.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/top_shadow.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/top_shadow.imageset/top_shadow.png
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/返回.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/Assets.xcassets/返回.imageset/返回@3x.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/bottom_shadow.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/bottom_shadow.imageset/bottom_shadow.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/dot.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/dot.imageset/dot@3x.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/fullscreen.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/fullscreen.imageset/fullscreen@3x.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/nonfullscreen.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/nonfullscreen.imageset/nonfullscreen@3x.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/pause.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/pause.imageset/pause@3x.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/play.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/play.imageset/play@3x.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/play_back.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/play_back.imageset/play_back.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/top_shadow.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/top_shadow.imageset/top_shadow.png
LiveVideoCloud/LiveVideoCloud/animation.xcassets/返回.imageset/Contents.json
LiveVideoCloud/LiveVideoCloud/animation.xcassets/返回.imageset/返回@3x.png
