Browse Source

Merge branch 'master' of http://59.110.68.162:3000/dudu/cdzApp

# Conflicts:
#	app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java
huyuguo 4 years ago
parent
commit
a9109d36d1

+ 4 - 0
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
538
                    for (Uri uri : uriList) {
539
                    for (Uri uri : uriList) {
540
=======
541
                    for (Uri uri: uriList) {
542
>>>>>>> 6efbc9d6e98858790040bd79841a2e24ccf64848
539
                        i++;
543
                        i++;
540
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
544
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
541
                        File file = FileUtils.from(PublishPicTopicActivity.this, uri);
545
                        File file = FileUtils.from(PublishPicTopicActivity.this, uri);