Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ExternalSharing

Conflicts: build.gradle config.gradle

Merge branch 'master' of bj.gitlab.cnlive.com:cnlive-team/ExternalSharing
Conflicts: build.gradle config.gradle
朱显松
2 parents 673276fa 08f70d8c
Showing 2 changed files with 3 additions and 3 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareMomentActivity.java
config.gradle
@@ -394,7 +394,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                     } else if (("jpg".equals(fileType) || "png".equals(fileType)) && !(imageUri + "").contains("com.tencent.mtt")) {   //媒体文件类型混乱问题处理 //pic 1  video 3
                         File file = new File(pathreal);
                         ArrayList<Media> medialist = new ArrayList<>();
-                        Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "", "");
+                        Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), 0, "", imageUri.toString());
                         medialist.add(media);
                         jumpReleaseActivity(context, medialist, 3, "", "nocircle");
                         killTime();
@@ -818,7 +818,7 @@ public class ShareMomentActivity extends AppCompatActivity {
                             medialist.add(media);
                         } else {
                             File file = new File(replace);
-                            Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), i, "", "");
+                            Media media = new Media(file.getPath(), file.getName(), 1, 1, file.length(), i, "", uri.toString());
                             medialist.add(media);
                         }
                     }
@@ -21,7 +21,7 @@ ext {
             //编译方式
             debug  : false,
             //版本号
-            version: "1.0.3",
+            version: "1.0.3.1",
             //Lib库前缀
             packeg : "com.cnlive.outside_share",
             //Lib库名称