supervision-android.git

			@@ -1,7 +1,6 @@
			package cn.flightfeather.thirdapp.util.photo;

			import android.app.Activity;
			import android.content.Context;
			import android.content.Intent;
			import android.graphics.Bitmap;
			import android.graphics.BitmapFactory;
			@@ -27,7 +26,7 @@

			import cn.flightfeather.thirdapp.CommonApplication;
			import cn.flightfeather.thirdapp.activity.PhotoViewerActivity;
			import cn.flightfeather.thirdapp.bean.Mediafile;
			import cn.flightfeather.thirdapp.bean.entity.Mediafile;
			import cn.flightfeather.thirdapp.httpservice.UploadService;
			import cn.flightfeather.thirdapp.module.common.CameraActivity;
			import cn.flightfeather.thirdapp.task.CompressPhotoTask;
			@@ -65,21 +64,21 @@
			* 绑定ImageView和图片，本地加载或联网加载显示(针对固定数量的ImageView)
			* @param mediaFiles
			* @param imageViews
			* @param context
			* @param activity
			* @return 实际加载的图片个数
			*/
			public static int loadImage(List<Mediafile> mediaFiles, List<ImageView> imageViews, Context context){
			public static int loadImage(List<Mediafile> mediaFiles, List<ImageView> imageViews, Activity activity){
			if (mediaFiles!=null){
			int count = mediaFiles.size() >= imageViews.size() ? imageViews.size() : mediaFiles.size();
			int count = Math.min(mediaFiles.size(), imageViews.size());

			for (int i = 0; i < count; i++) {
			Mediafile mediaFileTmp = mediaFiles.get(i);
			File file = FileUtil.getFileFromMediaFile(mediaFileTmp);
			if (file.exists()) {
			SetImageTask task1 = new SetImageTask(file, imageViews.get(i), (Activity) context);
			SetImageTask task1 = new SetImageTask(file, imageViews.get(i), (Activity) activity);
			task1.execute();
			} else {
			DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFileTmp, imageViews.get(i), context);
			DownloadAndSetImageTask task = new DownloadAndSetImageTask(mediaFileTmp, imageViews.get(i), activity);
			task.execute();
			}
			}