Merge branch 'dev_huanleduanju_0814' of...

Merge branch 'dev_huanleduanju_0814' of http://gitlab.mints-id.com/android/android_vedio into dev_huanleduanju_0814

video/app/src/main/java/com/duben/happyplaylet/ui/activitys/MainActivity.kt

@@ -56,7 +56,7 @@ class MainActivity : BaseActivity(), View.OnClickListener {
 
     override fun initViewsAndEvents() {
         // 过渡动画
-        window.requestFeature(Window.FEATURE_CONTENT_TRANSITIONS)
+//        window.requestFeature(Window.FEATURE_CONTENT_TRANSITIONS)
 
         DPHolderManager.initDpSdk(MintsApplication.getContext());
 

video/library_tagflow/.gitignore

+/build
+mapping.txt
+seeds.txt
+unused.txt
+priguardMapping.txt
+/facai
+/smartclean
\ No newline at end of file