Commit 897607180c78f508101bf000403fad8d54df46d3
1 parent
ad3e076c
升级
Showing
4 changed files
with
11 additions
and
9 deletions
OutSide_Share/src/main/java/com/cnlive/outside_share/activity/ShareIMActivity.java
| @@ -301,7 +301,7 @@ public class ShareIMActivity extends AppCompatActivity { | @@ -301,7 +301,7 @@ public class ShareIMActivity extends AppCompatActivity { | ||
| 301 | } | 301 | } |
| 302 | } else { | 302 | } else { |
| 303 | if ((textUri + "").contains("file://")) { | 303 | if ((textUri + "").contains("file://")) { |
| 304 | - Uri mediaUri = MediaStore.Files.getContentUri("external"); | 304 | + /* Uri mediaUri = MediaStore.Files.getContentUri("external"); |
| 305 | String[] projection = {MediaStore.Files.FileColumns._ID, | 305 | String[] projection = {MediaStore.Files.FileColumns._ID, |
| 306 | MediaStore.Files.FileColumns.MIME_TYPE, | 306 | MediaStore.Files.FileColumns.MIME_TYPE, |
| 307 | MediaStore.Files.FileColumns.DATA, | 307 | MediaStore.Files.FileColumns.DATA, |
| @@ -313,20 +313,20 @@ public class ShareIMActivity extends AppCompatActivity { | @@ -313,20 +313,20 @@ public class ShareIMActivity extends AppCompatActivity { | ||
| 313 | null, | 313 | null, |
| 314 | null, | 314 | null, |
| 315 | null); | 315 | null); |
| 316 | - Uri uri = null; | ||
| 317 | - if (cursor != null && cursor.moveToFirst()) { | 316 | + Uri uri = null;*/ |
| 317 | + /*if (cursor != null && cursor.moveToFirst()) { | ||
| 318 | uri = ContentUris.withAppendedId(mediaUri, | 318 | uri = ContentUris.withAppendedId(mediaUri, |
| 319 | - cursor.getLong(cursor.getColumnIndex(MediaStore.Files.FileColumns._ID))); | 319 | + cursor.getLong(cursor.getColumnIndex(MediaStore.Files.FileColumns._ID)));*/ |
| 320 | String fileName = textUri.toString().substring(textUri.toString().lastIndexOf("/"), textUri.toString().lastIndexOf(".")); | 320 | String fileName = textUri.toString().substring(textUri.toString().lastIndexOf("/"), textUri.toString().lastIndexOf(".")); |
| 321 | String fileType = textUri.toString().substring(textUri.toString().lastIndexOf("."), textUri.toString().length()); | 321 | String fileType = textUri.toString().substring(textUri.toString().lastIndexOf("."), textUri.toString().length()); |
| 322 | - String path = AndroidQUtil.copyAndroidQFile(ShareIMActivity.this, uri.toString(), StringUtils.decode(fileName) + fileType); | 322 | + String path = AndroidQUtil.copyAndroidQFile(ShareIMActivity.this, textUri.toString(), StringUtils.decode(fileName) + fileType); |
| 323 | // String path = getPath(context, uri); | 323 | // String path = getPath(context, uri); |
| 324 | startSelectForwardActivity(context, path, TYPE_SHARE_FILE, IN_TYPE_EXT_SHARE); | 324 | startSelectForwardActivity(context, path, TYPE_SHARE_FILE, IN_TYPE_EXT_SHARE); |
| 325 | killTime(); | 325 | killTime(); |
| 326 | - } else { | 326 | + /* } else { |
| 327 | AlertUtil.showDeftToast(context, "媒体库中暂未找到相关资源,请从手机相册中分享"); | 327 | AlertUtil.showDeftToast(context, "媒体库中暂未找到相关资源,请从手机相册中分享"); |
| 328 | } | 328 | } |
| 329 | - if (cursor != null) cursor.close(); | 329 | + if (cursor != null) cursor.close();*/ |
| 330 | /* } | 330 | /* } |
| 331 | }, 5000);*/ | 331 | }, 5000);*/ |
| 332 | } else if (AndroidQUtil.isAndroidQ() && !(textUri + "").contains("file://")) { | 332 | } else if (AndroidQUtil.isAndroidQ() && !(textUri + "").contains("file://")) { |
app/src/main/java/com/cnlive/out_shared/MainActivity.java
| @@ -20,5 +20,7 @@ public class MainActivity extends AppCompatActivity { | @@ -20,5 +20,7 @@ public class MainActivity extends AppCompatActivity { | ||
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | public void onClick(View view) { | 22 | public void onClick(View view) { |
| 23 | + Intent intent = new Intent(MainActivity.this, momentActivity.class); | ||
| 24 | + startActivity(intent); | ||
| 23 | } | 25 | } |
| 24 | } | 26 | } |
app/src/main/java/com/cnlive/out_shared/momentActivity.java
| @@ -34,7 +34,7 @@ public class momentActivity extends AppCompatActivity { | @@ -34,7 +34,7 @@ public class momentActivity extends AppCompatActivity { | ||
| 34 | Uri uri = itemAt.getUri(); | 34 | Uri uri = itemAt.getUri(); |
| 35 | strings.add(uri.toString()); | 35 | strings.add(uri.toString()); |
| 36 | } | 36 | } |
| 37 | - ARouter.getInstance().build("/out/ShareMomentActivity") | 37 | + ARouter.getInstance().build("/out/ShareIMActivity") |
| 38 | .withString("type", type) | 38 | .withString("type", type) |
| 39 | .withString("action", action) | 39 | .withString("action", action) |
| 40 | .withBundle("bundle", extras) | 40 | .withBundle("bundle", extras) |
config.gradle