修改getPhoto和getPicture插件压缩方法

ipu-plugin-basic/src/main/java/com/ai/ipu/mobile/plugin/MobileCamera.java

@@ -34,7 +34,6 @@ import com.ai.ipu.mobile.frame.plugin.Plugin;
import com.ai.ipu.mobile.ui.HintUtil;
import com.ai.ipu.mobile.ui.image.MobileGraphics;
import com.ai.ipu.mobile.util.DirectionUtil;
import com.ai.ipu.mobile.util.IpuMobileLog;
import com.ai.ipu.mobile.util.IpuMobileUtility;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
@@ -46,6 +45,7 @@ import com.ailk.common.data.impl.DataMap;
 */
public class MobileCamera extends Plugin {
	private static final int DEFAULT_COLOR = 0xffdcdcdc;
	private static final int MAX_PIXELS = 1920 * 1080;
	public enum TYPE {
		BASE64_AND_PATH(2), //Base64编码和文件路径
@@ -65,6 +65,8 @@ public class MobileCamera extends Plugin {
	private SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd-hhmmss");
	private String photoFullPath;
	private int minWidth;
	private int minFileSize;
	private Function func;
	private enum Function {
@@ -85,6 +87,8 @@ public class MobileCamera extends Plugin {
	public void getPicture(JSONArray param) throws JSONException {
		this.func = Function.getPicture;
		int type = param.getInt(0);
		minFileSize = param.optInt(1, 400 * 1024);
		minWidth = param.optInt(2, 300);
		/* 使用相册打开 */
		Intent intent = new Intent(Intent.ACTION_PICK,
				android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
@@ -100,6 +104,8 @@ public class MobileCamera extends Plugin {
	public void getPhoto(JSONArray param) throws Exception {
		this.func = Function.getPhoto;
		int type = param.getInt(0);
		minFileSize = param.optInt(1);
        minWidth = param.optInt(2);
		String appName = IpuAppInfo.getAppPath();
		String photoName = appName + "-" + format.format(new Date()) + ".jpg";// 生成照片名称
@@ -182,7 +188,7 @@ public class MobileCamera extends Plugin {
//		}
//	}
	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
	public void onActivityResult(final int requestCode, int resultCode, final Intent intent) {
		// Activity.RESULT_CANCELED|Activity.RESULT_OK
		if (func == Function.scanQrCode) {
			if (resultCode == Activity.RESULT_OK) {
@@ -193,77 +199,94 @@ public class MobileCamera extends Plugin {
		} else if (func.equals(Function.getPhoto)) {
			// 照相功能
			if (resultCode == Activity.RESULT_OK) {
				Bitmap bitmap = null; 
				try {
					bitmap = getBitmapByImage(photoFullPath); //核实照片文件是否已经生成???????
				} catch (Exception e) {
					HintUtil.alert(context, e.getMessage());
					return;
				}
				
				if (requestCode == TYPE.PATH.getType()) {
					//MobileGraphics.savePicToLocal(bitmap, photoFullPath); //保存压缩文件
					callback(photoFullPath);
				}else if(requestCode == TYPE.BASE64.getType()){
					bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
					Bitmap base64Bitmap = MobileGraphics.compressImage(bitmap, 10, 30);	//quality=30?
					String out = MobileGraphics.bitmapToString(base64Bitmap); //base64缩略图
					base64Bitmap.recycle();
					callback(out);
				}else{
					//MobileGraphics.savePicToLocal(bitmap, photoFullPath); //保存压缩文件
					bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
					Bitmap base64Bitmap = MobileGraphics.compressImage(bitmap, 10, 30);	//quality=30?
					String out = MobileGraphics.bitmapToString(base64Bitmap); //base64处理
					base64Bitmap.recycle();
					IData result = new DataMap();
					result.put("thumbnail", out); //缩略图
					result.put("path", photoFullPath); //路径
					callback(result.toString());
				}
				bitmap.recycle();
				photoFullPath = null;
				new Thread(new Runnable() {
					@Override
					public void run() {
						Bitmap bitmap = null;
						try {
							bitmap = getBitmapByImage(photoFullPath); //核实照片文件是否已经生成???????
						} catch (Exception e) {
							HintUtil.alert(context, e.getMessage());
							return;
						}
						if (requestCode == TYPE.PATH.getType()) {
							//MobileGraphics.savePicToLocal(bitmap, photoFullPath); //保存压缩文件
							if (minFileSize > 0) {
								photoFullPath = MobileGraphics.compressImgToLength(bitmap, minFileSize, minWidth, requestCode, photoFullPath);
							}
							callback(photoFullPath);
						}else if(requestCode == TYPE.BASE64.getType()){
							String out = MobileGraphics.compressImgToLength(bitmap, minFileSize, minWidth, requestCode, null);
							callback(out);
						}else{
							//MobileGraphics.savePicToLocal(bitmap, photoFullPath); //保存压缩文件
							bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
							Bitmap base64Bitmap = MobileGraphics.compressImage(bitmap, 10, 30);	//quality=30?
							String out = MobileGraphics.bitmapToString(base64Bitmap); //base64处理
							base64Bitmap.recycle();
							IData result = new DataMap();
							result.put("thumbnail", out); //缩略图
							result.put("path", photoFullPath); //路径
							callback(result.toString());
						}
						bitmap.recycle();
						photoFullPath = null;
					}
				}).start();
			}
		} else if (func.equals(Function.getPicture)) {// 从媒体库中获取
			if (resultCode == Activity.RESULT_OK) {
				Uri uri = intent.getData();
				String picturePath = null;
				if (uri.toString().startsWith("file:")) {
					picturePath = uri.getPath();
				} else if (uri.toString().startsWith("content:")) {
					picturePath = getPath(uri);
				} else {
					HintUtil.alert(context,"请选择相册或者文件浏览器");
					return;
				}
				Bitmap bitmap = null; 
				try {
					bitmap = getBitmapByImage(picturePath);
				} catch (Exception e) {
					HintUtil.alert(context, e.getMessage());
					return;
				}
				
				if (requestCode == TYPE.PATH.getType()) {
					callback(picturePath);
				}else if(requestCode == TYPE.BASE64.getType()){
					bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
					Bitmap base64Bitmap = MobileGraphics.compressImage(bitmap, 10, 30);
					String out = MobileGraphics.bitmapToString(base64Bitmap);//base64缩略图
					base64Bitmap.recycle();
					callback(out);
				}else{
					bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
					Bitmap base64Bitmap = MobileGraphics.compressImage(bitmap, 10, 30);	//quality=30?
					String out = MobileGraphics.bitmapToString(base64Bitmap); //base64处理
					base64Bitmap.recycle();
					IData result = new DataMap();
					result.put("thumbnail", out); //缩略图
					result.put("path", picturePath); //路径
					callback(result.toString());
				}
				bitmap.recycle();
				new Thread(new Runnable() {
					@Override
					public void run() {
						Uri uri = intent.getData();
						String picturePath = null;
						if (uri.toString().startsWith("file:")) {
							picturePath = uri.getPath();
						} else if (uri.toString().startsWith("content:")) {
							picturePath = getPath(uri);
						} else {
							HintUtil.alert(context,"请选择相册或者文件浏览器");
							return;
						}
						Bitmap bitmap = null;
						try {
							bitmap = getBitmapByImage(picturePath);
						} catch (Exception e) {
							HintUtil.alert(context, e.getMessage());
							return;
						}
						if (requestCode == TYPE.PATH.getType()) {
							String resultPath = picturePath;
							if (minFileSize > 0) {
								String fileName = format.format(new Date()) + ".jpg";
								String dir = DirectionUtil.getInstance(context).getImageDirection(true);
								File dirFile = new File(dir);
								if (!dirFile.exists()) dirFile.mkdirs();
								resultPath = FileUtil.connectFilePath(dir,
										fileName);
								resultPath = MobileGraphics.compressImgToLength(bitmap, minFileSize, minWidth, requestCode, resultPath);
							}
							callback(resultPath);
						}else if(requestCode == TYPE.BASE64.getType()){
							String out = MobileGraphics.compressImgToLength(bitmap, minFileSize, minWidth, requestCode, null);
							callback(out);
						}else{
							bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
							Bitmap base64Bitmap = MobileGraphics.compressImage(bitmap, 10, 30);	//quality=30?
							String out = MobileGraphics.bitmapToString(base64Bitmap); //base64处理
							base64Bitmap.recycle();
							IData result = new DataMap();
							result.put("thumbnail", out); //缩略图
							result.put("path", picturePath); //路径
							callback(result.toString());
						}
						bitmap.recycle();
					}
				}).start();
			}
		}
	}
@@ -278,7 +301,7 @@ public class MobileCamera extends Plugin {
	public Bitmap getBitmapByImage(String imagePath){
		BitmapFactory.Options opts = getBitmapOptions();
		BitmapFactory.decodeFile(imagePath, opts);
		opts.inSampleSize = MobileGraphics.computeSampleSize(opts, -1, 800 * 480);
		opts.inSampleSize = MobileGraphics.computeSampleSize(opts, -1, MAX_PIXELS);
		opts.inJustDecodeBounds = false;// 还原
		Bitmap bitmap = null;
		try {