Merge branch 'develop' into feature/jeremy

RainbowPlanet/RainbowPlanet/Modules/PublishModule/AliyunVideo/AlivcShortVideo/ShortVideoFile/VideoEdit/Controller/AliyunEditViewController.m

@@ -366,7 +366,8 @@ AliyunIExporterCallback, AliyunIPlayerCallback>
     
     //从发布合成界面返回重新开始编辑并播放
     [self.editor startEdit];
-    [self play];
+    [self play];    
+    _exportFinished = false;
     
     // 音乐按钮动效设置
     [self changeMusicButtonStatus];