Commit be88f8c1c6f9543a6d72d0acd84067306416f6e1
1 parent
f5615e37
1:视频预览兼容
Showing
4 changed files
with
5 additions
and
6 deletions
config.gradle
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
| @@ -193,8 +193,7 @@ public class MediaPickerFragmentView implements MvpView { | @@ -193,8 +193,7 @@ public class MediaPickerFragmentView implements MvpView { | ||
| 193 | } | 193 | } |
| 194 | 194 | ||
| 195 | public void initMediaData(MediaActivity mediaActivity, ArrayList<Folder> medias) { | 195 | public void initMediaData(MediaActivity mediaActivity, ArrayList<Folder> medias) { |
| 196 | - if (medias == null) { | ||
| 197 | - showMessage("数据异常"); | 196 | + if (medias == null || medias.size() == 0 ||medias.get(0)==null||medias.get(0).getMedias()==null||medias.get(0).getMedias().size()==0|| medias.get(0).getMedias().get(0) == null) { |
| 198 | return; | 197 | return; |
| 199 | } | 198 | } |
| 200 | mediaActivity.allMedias.addAll(medias.get(0).getMedias()); | 199 | mediaActivity.allMedias.addAll(medias.get(0).getMedias()); |
lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java
| @@ -69,7 +69,7 @@ public class RecordView implements MvpView { | @@ -69,7 +69,7 @@ public class RecordView implements MvpView { | ||
| 69 | hasPermissions = mActivity.getPresenter().checkPermissions(mActivity, mActivity.permissionsRecordNoAudio, mActivity.PERMISISSION_CODE_ASK, true); | 69 | hasPermissions = mActivity.getPresenter().checkPermissions(mActivity, mActivity.permissionsRecordNoAudio, mActivity.PERMISISSION_CODE_ASK, true); |
| 70 | } | 70 | } |
| 71 | if (hasPermissions) { | 71 | if (hasPermissions) { |
| 72 | - mActivity.getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordFragment.newInstance()).addToBackStack("").commit(); | 72 | + mActivity.getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordFragment.newInstance()).addToBackStack("").commitAllowingStateLoss(); |
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | } | 75 | } |
lib_media/src/main/java/com/cnlive/media/ui/activity/RecordActivity.java
| @@ -128,7 +128,7 @@ public class RecordActivity extends MvpBindingActivity<RecordView, RecordPresent | @@ -128,7 +128,7 @@ public class RecordActivity extends MvpBindingActivity<RecordView, RecordPresent | ||
| 128 | @Override | 128 | @Override |
| 129 | public void run() { | 129 | public void run() { |
| 130 | preBitmap = plbitMap; | 130 | preBitmap = plbitMap; |
| 131 | - getSupportFragmentManager().beginTransaction().add(R.id.pre_frame, RecordPreviewFragment.newInstance(0, "")).addToBackStack("").commit(); | 131 | + getSupportFragmentManager().beginTransaction().add(R.id.pre_frame, RecordPreviewFragment.newInstance(0, "")).addToBackStack("").commitAllowingStateLoss(); |
| 132 | } | 132 | } |
| 133 | }); | 133 | }); |
| 134 | 134 | ||
| @@ -138,7 +138,7 @@ public class RecordActivity extends MvpBindingActivity<RecordView, RecordPresent | @@ -138,7 +138,7 @@ public class RecordActivity extends MvpBindingActivity<RecordView, RecordPresent | ||
| 138 | runOnUiThread(new Runnable() { | 138 | runOnUiThread(new Runnable() { |
| 139 | @Override | 139 | @Override |
| 140 | public void run() { | 140 | public void run() { |
| 141 | - getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordPreviewFragment.newInstance(1, path)).addToBackStack("").commit(); | 141 | + getSupportFragmentManager().beginTransaction().replace(R.id.pre_frame, RecordPreviewFragment.newInstance(1, path)).addToBackStack("").commitAllowingStateLoss(); |
| 142 | } | 142 | } |
| 143 | }); | 143 | }); |
| 144 | 144 |