PathMenu代码优化，相机部分功能优化

display-client/build/build-full.properties

@@ -0,0 +1,33 @@
#######编译环境相关配置#######
#JDK路径
jdk_home=/home/jenkins/software/jdk1.8.0_102
jdk_version=1.6
#Android SDK路径
android_sdk_home=/home/jenkins/software/android-sdk-linux
android_apk_tools=${android_sdk_home}/tools
android_tools=${android_sdk_home}/build-tools/24.0.2
#######应用信息相关配置#######
#工程路径
project_home=..
#App名字
app_name=display-client
#编译的target
android-target=android-22
#Android版本
android_version=4.4
#######签名文件相关配置#######
key_store=${project_home}/display.keystore
key_store_password=display
key_alias=display
key_alias_password=display
#######依赖工程相关配置#######
library_1=${project_home}/../wade-mobile-common
library_2=${project_home}/../wade-mobile-lib
#######其他配置#######
#log路径
log_file=build.log
#输出目录
output_path=.

display-client/build/build-full.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project name="apkTargets" default="apkpackaging"  basedir=".">
	<!-- 指定配置文件 -->  
    <property file="build.properties" /> 
    <property file="build-full.properties" /> 
    <record name="${log_file}" loglevel="info" append="no" action="start" />
	<!-- 识别编译环境 -->
	<condition property="exe" value=".exe" else=""><os family="windows" /></condition>

display-client/build/build.properties

@@ -24,8 +24,6 @@ key_alias=display
key_alias_password=display
#######依赖工程相关配置#######
library_1=${project_home}/../wade-mobile-common
library_2=${project_home}/../wade-mobile-lib
libraries=${project_home}/../wade-mobile-lib,${project_home}/../wade-mobile-common
#######其他配置#######
#log路径

display-client/src/com/ai/ipu/display/MainActivity.java

@@ -1,13 +1,13 @@
package com.ai.ipu.display;
import java.net.SocketTimeoutException;
import android.annotation.SuppressLint;
import android.graphics.Rect;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.View;
import java.net.SocketTimeoutException;
import com.ai.ipu.ipupathmenu.PathMenu;
import com.ai.ipu.ipupathmenu.PathMenu.OnButtonClickListener;
import com.ai.ipu.mobile.app.AppInfoUtil;
@@ -21,6 +21,7 @@ import com.umeng.analytics.MobclickAgent;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.func.MobileUI;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.wade.mobile.ui.view.FlipperLayout;
import com.wade.mobile.util.Constant;
@@ -123,7 +124,7 @@ public class MainActivity extends TemplateMainActivity {
	private View createMenu() {
		pathMenu = new PathMenu(getWindow(), this, drawables, menuDrawable, true);
        pathMenu.setCircle(0.5f);
		pathMenu.setPosition(PathMenu.POSITION_TOP_CENTER);
		pathMenu.setPosition(PathMenu.Position.BOTTOM_CENTER);
		setPathMenuItemOnClickListener();
		return pathMenu;
	}
@@ -136,75 +137,37 @@ public class MainActivity extends TemplateMainActivity {
			
			@Override
			public void onButtonClick(View v, int id) {
					openPageByPath(id);
					try {
						openPageByPath(id);
					} catch (Exception e) {
						// TODO Auto-generated catch block
						error(e);
					}
			}
		});
	}
	
	private void openPageByPath(int id){
	private void openPageByPath(int id) throws Exception{
		MobileUI mobileUI = getPluginManager().getPlugin(MobileUI.class);
		switch (id) {
		case 0://插件：基础界面
//			Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
			try {
				getWadeMobileClient().execute(
						"openPage",
						new Object[] {"Basic", "null", false});
			} catch (Exception e) {
				e.printStackTrace();
			}
			break;
			mobileUI.openPage("Basic", null);
		case 1://插件：相机
			try {
//				Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
				getWadeMobileClient().execute(
						"openPage",
						new Object[] {"Photo", "null", false});
			} catch (Exception e) {
				e.printStackTrace();
			}
			mobileUI.openPage("Basic", null);
			break;
		case 2://标签插件：
			try {
//				Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
				getWadeMobileClient().execute(
						"openPage",
						new Object[] {"Hammer", "null", false});
			} catch (Exception e) {
				e.printStackTrace();
			}
			mobileUI.openPage("Basic", null);
			break;
		case 3://UI插件
			try {
//				Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
				getWadeMobileClient().execute(
						"openPage",
						new Object[] {"WmDialog", "null", false});
			} catch (Exception e) {
				e.printStackTrace();
			}
			mobileUI.openPage("Basic", null);
			break;
		case 4:
			try {
//				Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
				getWadeMobileClient().execute(
						"loadPage",
						new Object[] {"Gesture", "null", false});
			} catch (Exception e) {
				e.printStackTrace();
			}
			mobileUI.openPage("Basic", null);
			break;
		case 5:
			try {
//				Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
				getWadeMobileClient().execute(
						"loadTemplate",
						new Object[] {"UI", "null", false});
			} catch (Exception e) {
				e.printStackTrace();
			}
			mobileUI.openPage("Basic", null);
			break;
		default:
//			Toast.makeText(MainActivity.this, "第"+ id + "个快捷按钮被点击", 2000).show();
			break;
		}
	}

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

@@ -31,11 +31,25 @@ import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.util.DirectionUtil;
/**
 * @author Administrator
 * @author huangbo
 * @date 2017年1月20日 下午5:12:00
 * @desc 图片和照相机功能集合
 */
public class MobileCamera extends Plugin {
	private final int BASE64_TYPE = 0;// Base64编码的字符串
	private final int PATH_TYPE = 1;// 文件路径
	public enum TYPE {
		BASE64_AND_PATH(0), //Base64编码和文件路径
		PATH(1), //文件路径
		BASE64(2);	//Base64编码
		private int type;
		private TYPE(int type) {
			this.type = type;
		}
		public int getType() {
			return this.type;
		}
	}
	
	
	private int quality = 80; // 压缩率,如果是0,表示不压缩
	private SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd-hhmmss");
@@ -64,12 +78,7 @@ public class MobileCamera extends Plugin {
		Intent intent = new Intent(Intent.ACTION_PICK,
				android.provider.MediaStore.Images.Media.EXTERNAL_CONTENT_URI);
		int requestType;
		if (type == BASE64_TYPE) {
			requestType = BASE64_TYPE;
		} else {
			requestType = PATH_TYPE;
		}
		int requestType = type;
		startActivityForResult(intent, requestType);
	}
@@ -95,12 +104,7 @@ public class MobileCamera extends Plugin {
		Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
		intent.putExtra(android.provider.MediaStore.EXTRA_OUTPUT, Uri.fromFile(photoFile));
		
		int requestType;
		if (type == BASE64_TYPE) {
			requestType = BASE64_TYPE;
		} else {
			requestType = PATH_TYPE;
		}
		int requestType = type;
		startActivityForResult(intent, requestType);
	}
	
@@ -180,16 +184,24 @@ public class MobileCamera extends Plugin {
			if (resultCode == Activity.RESULT_OK) {
				Bitmap bitmap = null; 
				try {
					bitmap = getBitmapByImage(photoFullPath);
					bitmap = getBitmapByImage(photoFullPath); //核实照片文件是否已经生成???????
				} catch (Exception e) {
					HintUtil.alert(context, e.getMessage());
					return;
				}
				
				bitmap = MobileGraphics.compressImage(bitmap, 50, quality);	//压缩到50k
				MobileGraphics.savePicToLocal(bitmap, photoFullPath); //保存文件
				if (requestCode == BASE64_TYPE) {
				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();
@@ -197,8 +209,6 @@ public class MobileCamera extends Plugin {
					result.put("thumbnail", out); //缩略图
					result.put("path", photoFullPath); //路径
					callback(result.toString());
				}else{
					callback(photoFullPath);
				}
				bitmap.recycle();
				photoFullPath = null;
@@ -216,21 +226,33 @@ public class MobileCamera extends Plugin {
					return;
				}
				if (requestCode == BASE64_TYPE) {
					Bitmap bitmap = null; 
					try {
						bitmap = getBitmapByImage(picturePath);
					} catch (Exception e) {
						HintUtil.alert(context, e.getMessage());
						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处理
					String out = MobileGraphics.bitmapToString(base64Bitmap);//base64缩略图
					base64Bitmap.recycle();
					callback(out);
				} else if (requestCode == PATH_TYPE) {// 返回文件名
					callback(picturePath);
				}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();
			}
		}
	}

wade-mobile-ui/src/com/wade/mobile/ui/anim/AnimationTool.java

@@ -1,5 +1,7 @@
package com.wade.mobile.ui.anim;
import android.R.anim;
import android.content.Context;
import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
import android.view.animation.AnimationSet;
@@ -52,6 +54,7 @@ public class AnimationTool {
	 * @param float pivotX 			动画相对于物件的X坐标的开始位置
	 * @param float pivotY			动画相对于物件的Y坐标的开始位置 
	 * 0.0表示收缩到没有,1.0表示正常无伸缩,值小于1.0表示收缩,值大于1.0表示放大
	 * 设置RELATIVE_TO_SELF表明所有参数是相对于对象自己
	 */
	public static ScaleAnimation createScale(float toX, float toY, float pivotX, float pivotY, long durationMillis) {
		ScaleAnimation animation = new ScaleAnimation(1.0f, toX, 1.0f, toY, Animation.RELATIVE_TO_SELF, pivotX, Animation.RELATIVE_TO_SELF, pivotY);
@@ -167,4 +170,11 @@ public class AnimationTool {
		animation.setFillAfter(false);
		return animation;
	}
	
	/**
	 * Interpolator指定动画插入器 
	 * accelerate_decelerate_interpolator  加速-减速 动画 
     * accelerate_interpolator        加速-动画
     * decelerate_interpolator        减速- 动画
	 */
}

wade-mobile-ui/src/com/wade/mobile/ui/comp/menu/PathMenu.java

@@ -28,8 +28,6 @@ public class PathMenu extends RelativeLayout{
	private int alpha = 127;									//透明度 0-255
	private double circle = Math.PI;							//扇形菜单占据一圈的比例,0~1 		
	/*
	private final int maxTimeSpent = 1000; 						//最长动画耗时
	private final int minTimeSpent = 400;                       //最短动画耗时
	private int intervalTimeSpent;                             	//菜单按钮之间的时间间隔
	*/
	private Button[] buttons;									//Path菜单按钮引用