CNLive Android Team / NewMediaPicker · Commits

Commit be88f8c1c6f9543a6d72d0acd84067306416f6e1

Authored by 吴奎庆
1 parent f5615e37

1:视频预览兼容

Inline Side-by-side
Showing 4 changed files with 5 additions and 6 deletions
config.gradle
  View file @be88f8c
... ... @@ -21,7 +21,7 @@ ext {
21 21 //编译方式
22 22 debug : false,
23 23 //版本号
24   - version: "1.0.3.5",
  24 + version: "1.0.3.8",
25 25 //Lib库前缀
26 26 packeg : "com.cnlive.media",
27 27 //Lib库名称
... ...
lib_media/src/main/java/com/cnlive/media/frame/view/MediaPickerFragmentView.java
  View file @be88f8c
... ... @@ -193,8 +193,7 @@ public class MediaPickerFragmentView implements MvpView {
193 193 }
194 194  
195 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 197 return;
199 198 }
200 199 mediaActivity.allMedias.addAll(medias.get(0).getMedias());
... ...
lib_media/src/main/java/com/cnlive/media/frame/view/RecordView.java
  View file @be88f8c
... ... @@ -69,7 +69,7 @@ public class RecordView implements MvpView {
69 69 hasPermissions = mActivity.getPresenter().checkPermissions(mActivity, mActivity.permissionsRecordNoAudio, mActivity.PERMISISSION_CODE_ASK, true);
70 70 }
71 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
  View file @be88f8c
... ... @@ -128,7 +128,7 @@ public class RecordActivity extends MvpBindingActivity&lt;RecordView, RecordPresent
128 128 @Override
129 129 public void run() {
130 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&lt;RecordView, RecordPresent
138 138 runOnUiThread(new Runnable() {
139 139 @Override
140 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  
... ...