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

display-client/assets/mobile-action.xml

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<actions>
    <!-- MobileBasic -->
	<action name="call" class="com.ai.ipu.func.MobileBasic" method="call"/>
	<action name="beep" class="com.ai.ipu.func.MobileBasic" method="beep"/>
	<action name="sms" class="com.ai.ipu.func.MobileBasic" method = "sms"/>
	<action name="shock" class="com.ai.ipu.func.MobileBasic" method="shock"/>
	<action name="call" class="com.wade.mobile.func.MobileBasic" method="call"/>
	<action name="beep" class="com.wade.mobile.func.MobileBasic" method="beep"/>
	<action name="sms" class="com.wade.mobile.func.MobileBasic" method = "sms"/>
	<action name="shock" class="com.wade.mobile.func.MobileBasic" method="shock"/>
	<!-- MobileApp -->
	<action name="close" class="com.wade.mobile.func.MobileApp" method="close"/>
	<action name="logCat" class="com.wade.mobile.func.MobileApp" method="logCat"/>
@@ -161,9 +161,9 @@
	<action name="shareFileMore" class="com.ai.ipu.share.func.MobileShareByApp" method="shareFileMore"></action>
	
	<!-- Sweet控件 -->
	<action name="sweetAlert" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetAlert"/>
<!-- 	<action name="sweetAlert" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetAlert"/>
	<action name="sweetConfirm" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetConfirm"/>
	<action name="sweetLoading" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetLoading"/>
	<action name="sweetLoading" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetLoading"/> -->
	<!-- 邮件 -->
	<action name="shareImageBymail" class="com.ai.ipu.mail.func.MailSendByApp" method="shareImageBymail"></action>	

ipupathmenu-lib/.gitignore

@@ -1,2 +0,0 @@
/bin/
/gen/

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

@@ -0,0 +1,152 @@
package com.wade.mobile.func;
import java.util.ArrayList;
import org.json.JSONArray;
import android.app.PendingIntent;
import android.content.Context;
import android.content.Intent;
import android.media.Ringtone;
import android.media.RingtoneManager;
import android.net.Uri;
import android.os.Vibrator;
import android.telephony.SmsManager;
import android.widget.Toast;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.Messages;
public class MobileBasic extends Plugin {
	public MobileBasic(IWadeMobile wademobile) {
		super(wademobile);
	}
	public void call(JSONArray param) throws Exception {
		if(param.length()<2){
			throw new Exception(Messages.EXCEPTION_PARAM);
		}
		String sn = param.getString(0);
		boolean flag  = param.getBoolean(1);
		call(sn, flag);
	}
	
	/**
	 * 呼出电话
	 * @param sn
	 */
	public void call(String sn,boolean autoCall) {
		if(autoCall){
			/**权限:android.permission.CALL_PHONE*/
			Intent intent = new Intent(Intent.ACTION_CALL,Uri.parse("tel:"+ sn));
			this.context.startActivity(intent);
		}else{
			/**Intent.ACTION_CALL|Intent.ACTION_DIAL*/
			Intent intent = new Intent(Intent.ACTION_DIAL,Uri.parse("tel:"+ sn));
			this.context.startActivity(intent);
		}
	}
	
	public void sms(JSONArray param) throws Exception {
		if(param.length()<3){
			throw new Exception(Messages.EXCEPTION_PARAM);
		}
		String sn = param.getString(0);
		String message = param.getString(1);
		boolean flag  = param.getBoolean(2);
		sms(sn,message, flag);
	}
	
	/**
	 * 短信
	 */
	public void sms(String sn,String message,boolean flag) {
		if(flag){
			/**权限:android.permission.SEND_SMS*/
			Intent intent = new Intent(Intent.ACTION_SENDTO);
			SmsManager smsManager = SmsManager.getDefault();   
	        PendingIntent pi = PendingIntent.getActivity(this.context, 0, intent, 0);   
	        //短信内容长度超过70则分多条发送
	        if (message.length() > 70){
	            ArrayList<String> msgs = smsManager.divideMessage(message);   
	            for (String msg : msgs){   
	                smsManager.sendTextMessage(sn, null, msg, pi, null);   
	            }
	        }else{   
	            smsManager.sendTextMessage(sn, null, message, pi, null);   
	        }
	        if(message.length()>30){
	        	message = message.substring(0,30)+"……"+Constant.LINE_SEPARATOR+Messages.SMS_SUCCESS;
	        }else{
	        	message = message+Constant.LINE_SEPARATOR+Messages.SMS_SUCCESS;
	        }
	        Toast.makeText(this.context, message, Toast.LENGTH_SHORT).show();
		}else{
			Intent intent = new Intent(Intent.ACTION_VIEW);
			intent.setData(Uri.parse("sms:"+ sn));
			intent.putExtra("address", sn);
			intent.putExtra("sms_body", message); 
			intent.setType("vnd.android-dir/mms-sms");
			this.context.startActivity(intent);
		}
	}
	
	public void beep(JSONArray param) throws Exception {
		if(param.length()<1){
			throw new Exception(Messages.EXCEPTION_PARAM);
		}
		long count = param.getLong(0);
		beep(count);
	}
	
	/**
	 * 响铃
	 */
	public void beep(long count) {
		Uri ringtone = RingtoneManager
				.getDefaultUri(RingtoneManager.TYPE_NOTIFICATION);
		Ringtone notification = RingtoneManager.getRingtone(this.context,
				ringtone);
		// If phone is not set to silent mode
		if (notification != null) {
			for (long i = 0; i < count; i++) {
				notification.play();
				long timeout = 5000;
				while (notification.isPlaying() && (timeout > 0)) {
					timeout = timeout - 100;
					try {
						Thread.sleep(100);
					} catch (InterruptedException e) {
					}
				}
			}
		}
	}
	
	public void shock(JSONArray param) throws Exception {
		if(param.length()<1){
			throw new Exception(Messages.EXCEPTION_PARAM);
		}
		long time = param.getLong(0);
		shock(time);
	}
	
	/**
	 * 震动
	 */
	public void shock(long time) {
		// Start the vibration, 0 defaults to half a second.
		if (time < 500) {
			time = 500;
		} else if (time > 10000) {
			time = 10000;
		}
		Vibrator vibrator = (Vibrator) this.context.getSystemService(Context.VIBRATOR_SERVICE);
		vibrator.vibrate(time);
	}
}

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

@@ -86,7 +86,7 @@ public class PathMenu extends RelativeLayout{
				menuBtnY = menuBtn.getBottom();
				break;
			case MotionEvent.ACTION_MOVE:
				if(500 <= System.currentTimeMillis() - touchStartTime){ //当执行触摸时间大于0.5秒时，才执行移动；避免因屏幕敏感导致点击变成滑动事件
				if(300 <= System.currentTimeMillis() - touchStartTime){ //当执行触摸时间大于0.3秒时，才执行移动；避免因屏幕敏感导致点击变成滑动事件
					if(isCanDrag){
						int x_move = (int) event.getRawX();
						int y_move = (int) event.getRawY();