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

# Conflicts:
#	app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

app/src/main/java/com/electric/chargingpile/activity/PublishPicTopicActivity.java

@@ -535,7 +535,11 @@ public class PublishPicTopicActivity extends Activity implements OnClickListener
                try {
                    List<Uri> uriList = Matisse.obtainResult(data);
                    int i = 0;
<<<<<<< HEAD
                    for (Uri uri : uriList) {
=======
                    for (Uri uri: uriList) {
>>>>>>> 6efbc9d6e98858790040bd79841a2e24ccf64848
                        i++;
                        Bitmap bitmap = BitmapFactory.decodeStream(getContentResolver().openInputStream(uri));
                        File file = FileUtils.from(PublishPicTopicActivity.this, uri);