Commit 30b2e67ac15a0685de4180b3df153f550f2d3774
Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ExternalSharing
Conflicts: build.gradle config.gradle
Showing
2 changed files
with
3 additions
and
3 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareMomentActivity.java
| @@ -394,7 +394,7 @@ public class ShareMomentActivity extends AppCompatActivity { | @@ -394,7 +394,7 @@ public class ShareMomentActivity extends AppCompatActivity { | ||
| 394 | } else if (("jpg".equals(fileType) || "png".equals(fileType)) && !(imageUri + "").contains("com.tencent.mtt")) { //媒体文件类型混乱问题处理 //pic 1 video 3 | 394 | } else if (("jpg".equals(fileType) || "png".equals(fileType)) && !(imageUri + "").contains("com.tencent.mtt")) { //媒体文件类型混乱问题处理 //pic 1 video 3 |
| 395 | File file = new File(pathreal); | 395 | File file = new File(pathreal); |
| 396 | ArrayList<Media> medialist = new ArrayList<>(); | 396 | ArrayList<Media> medialist = new ArrayList<>(); |
| 397 | - Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "", ""); | 397 | + Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "", imageUri.toString()); |
| 398 | medialist.add(media); | 398 | medialist.add(media); |
| 399 | jumpReleaseActivity(context, medialist, 3, "", "nocircle"); | 399 | jumpReleaseActivity(context, medialist, 3, "", "nocircle"); |
| 400 | killTime(); | 400 | killTime(); |
| @@ -818,7 +818,7 @@ public class ShareMomentActivity extends AppCompatActivity { | @@ -818,7 +818,7 @@ public class ShareMomentActivity extends AppCompatActivity { | ||
| 818 | medialist.add(media); | 818 | medialist.add(media); |
| 819 | } else { | 819 | } else { |
| 820 | File file = new File(replace); | 820 | File file = new File(replace); |
| 821 | - Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), i, "", ""); | 821 | + Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), i, "", uri.toString()); |
| 822 | medialist.add(media); | 822 | medialist.add(media); |
| 823 | } | 823 | } |
| 824 | } | 824 | } |
config.gradle