huyuguo 4 年 前
コミット
df6eeeb220
共有1 個のファイルを変更した0 個の追加4 個の削除を含む
  1. 0 4
      app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

+ 0 - 4
app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

535
                try {
535
                try {
536
                    List<Uri> uriList = Matisse.obtainResult(data);
536
                    List<Uri> uriList = Matisse.obtainResult(data);
537
                    int i = 0;
537
                    int i = 0;
538
<<<<<<< HEAD
539
                    for (Uri uri : uriList) {
538
                    for (Uri uri : uriList) {
540
=======
541
                    for (Uri uri: uriList) {
542
>>>>>>> 6efbc9d6e98858790040bd79841a2e24ccf64848
543
                        i++;
539
                        i++;
544
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
540
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
545
                        File file = FileUtils.from(PublishPicTopicActivity.this, uri);
541
                        File file = FileUtils.from(PublishPicTopicActivity.this, uri);