Merge branch 'master' of http://10.1.235.20:3000/ipu/android-share

wade-mobile-func/src/com/wade/mobile/func/MobileCamera.java

@@ -22,10 +22,10 @@ import com.ai.ipu.mobile.ui.image.MobileGraphics;
import com.ai.ipu.mobile.util.IpuMobileUtility;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.google.zxing.WriterException;
import com.wade.mobile.app.IpuAppInfo;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.util.BitmapUtils;
import com.wade.mobile.util.DirectionUtil;
/**
@@ -178,38 +178,44 @@ public class MobileCamera extends Plugin {
				callback(scanResult);
			}
		} else if (func.equals(Function.getPhoto)) {
			// 照相功能
			// 照相功能modify by wyj 按照分辨率压缩
			if (resultCode == Activity.RESULT_OK) {
				Bitmap bitmap = null; 
				try {
					bitmap = getBitmapByImage(photoFullPath); //核实照片文件是否已经生成???????
				} catch (Exception e) {
					HintUtil.alert(context, e.getMessage());
					return;
				}
//				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;
				
				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;
				String picBase64 = BitmapUtils.compressBitmap(photoFullPath, photoFullPath, 640);
				IData result = new DataMap();
				result.put("base64", picBase64);
				result.put("path", photoFullPath);
				callback(result.toString());
			}
		} else if (func.equals(Function.getPicture)) {// 从媒体库中获取
			if (resultCode == Activity.RESULT_OK) {

wade-mobile-func/src/com/wade/mobile/util/BitmapUtils.java

@@ -0,0 +1,118 @@
package com.wade.mobile.util;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.IOException;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import com.ai.ipu.basic.string.Base64;
/**
 * 压缩图片处理工具类
 * 
 * @author wangyujuan
 *
 */
public final class BitmapUtils {
	/**
	 * 压缩图片
	 * 
	 * @param sourcePath
	 *            原图路径
	 * @param targetPath
	 *            目标图片路径
	 * @param maxSize
	 *            最大分辨率
	 */
	public static String compressBitmap(String sourcePath, String targetPath,
			int maxSize) {
		// 如果将其设为true的话，在decode时将会返回null,通过此设置可以去查询一个bitmap的属性
		BitmapFactory.Options options = new BitmapFactory.Options();
		options.inJustDecodeBounds = true;
		BitmapFactory.decodeFile(sourcePath, options);
		final float originalWidth = options.outWidth;
		final float originalHeight = options.outHeight;
		float convertedWidth;
		if (originalWidth > originalHeight) {
			convertedWidth = maxSize;
		} else {
			convertedWidth = maxSize / originalHeight * originalWidth;
		}
		final float ratio = originalWidth / convertedWidth;
		options.inSampleSize = (int) ratio;
		options.inJustDecodeBounds = false;
		Bitmap bitmap = BitmapFactory.decodeFile(sourcePath, options);
		ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
		bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
		FileOutputStream fileOutputStream = null;
		try {
			fileOutputStream = new FileOutputStream(new File(targetPath));
			byte[] imageByte = byteArrayOutputStream.toByteArray();
			fileOutputStream.write(imageByte);
			fileOutputStream.flush();
			return Base64.encode(imageByte);
		} catch (FileNotFoundException e) {
			e.printStackTrace();
		} catch (IOException e) {
			e.printStackTrace();
		} finally {
			if (null != fileOutputStream) {
				try {
					fileOutputStream.close();
				} catch (IOException e) {
					e.printStackTrace();
				}
			}
			bitmap.recycle();
		}
		return null;
	}
	// /**
	// * 获取图片Base64字符串
	// *
	// * @param filePath
	// * 图片路径
	// */
	// public static String bitmapToString(String filePath) {
	// BitmapFactory.Options options = new BitmapFactory.Options();
	//
	// options.inJustDecodeBounds = false;
	// Bitmap bitmap = BitmapFactory.decodeFile(filePath, options);
	//
	// ByteArrayOutputStream byteArrayOutputStream = new
	// ByteArrayOutputStream();
	// bitmap.compress(Bitmap.CompressFormat.JPEG, 100, byteArrayOutputStream);
	// FileOutputStream fileOutputStream = null;
	// try {
	// byte[] imageByte = byteArrayOutputStream.toByteArray();
	// return Base64.encode(imageByte);
	// } finally {
	// if (null != fileOutputStream) {
	// try {
	// fileOutputStream.close();
	// } catch (IOException e) {
	// e.printStackTrace();
	// }
	//
	// }
	// bitmap.recycle();
	// }
	// }
}