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

display-client/assets/mobile-action.xml

@@ -156,9 +156,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>	

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

@@ -5,7 +5,8 @@ import android.graphics.Rect;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.View;
import android.widget.Toast;
import java.net.SocketTimeoutException;
import com.ai.ipu.ipupathmenu.PathMenu;
import com.ai.ipu.ipupathmenu.PathMenu.OnButtonClickListener;
@@ -13,6 +14,7 @@ import com.ai.ipu.mobile.app.AppInfoUtil;
import com.ai.ipu.mobile.app.ApplicationManager;
import com.ai.ipu.mobile.app.MobileCheck;
import com.ai.ipu.mobile.app.MobileOperation;
import com.ai.ipu.mobile.util.IpuMobileLog;
//import com.baidu.mapapi.SDKInitializer;
import com.umeng.analytics.MobclickAgent;
import com.wade.mobile.app.AppRecord;
@@ -20,6 +22,7 @@ import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.wade.mobile.ui.view.FlipperLayout;
import com.wade.mobile.util.Constant;
import com.wade.mobile.util.Messages;
public class MainActivity extends TemplateMainActivity {
@@ -220,4 +223,19 @@ public class MainActivity extends TemplateMainActivity {
        }
	}
	/***************创建初始化设置快捷菜单END********************/
	
	@Override
	protected void error(Exception e) {
		handler.sendEmptyMessage(3);
		if(e instanceof java.net.ConnectException){			
			getWadeMobileClient().alert("启动失败：网络连接错误", Constant.Function.close, new Object[] {false});
			return;
		}
		if (e instanceof SocketTimeoutException) {
			// 这个地方需要关闭应用
			getWadeMobileClient().alert(Messages.CONN_SERVER_FAILED, Constant.Function.close, new Object[] {false});
			return;
		}
		IpuMobileLog.e(TAG, e.getMessage(), e);
	}
}

display-client/src/com/ai/ipu/func/MobileOpenApp.java

@@ -1,6 +1,5 @@
package com.ai.ipu.func;
import com.ai.ipu.dynamic.DynamicPluginExtendManager;
import org.json.JSONArray;
import android.content.ComponentName;

display-server/src/main/webapp/template/webapp/PluginIndex.html

@@ -59,9 +59,9 @@
		<div class="pic"><span class="e_ico-nfc"></span></div>
		<div class="text">NFC</div>
	</li>
	<li action="Voice">
	<!-- <li action="Voice">
		<div class="pic"><span class="e_ico-nfc"></span></div>
		<div class="text">语音识别</div>
		<div class="text">语音识别</div> -->
	</li>
	<li action="Share">
		<div class="pic"><span class="e_ico-nfc"></span></div>
@@ -81,16 +81,16 @@
		<div class="text">视频压缩</div>
	</li>
    <li action="AppPlugins">
   <!--  <li action="AppPlugins">
        <div class="pic"><span class="e_ico-data"></span></div>
        <div class="text">AppPlugins</div>
    </li>
    </li> -->
   <!-- <li action="PathMenu">
		<div class="pic"><span class="e_ico-nfc"></span></div>
		<div class="text">快捷菜单</div>
	</li> --> 
	<li action="Iframe">
	<!-- <li action="Iframe">
		<div class="pic"><span class="e_ico-position"></span></div>
		<div class="text">IframeDemo</div>
	</li>
	</li> -->
</ul>

ipu-VideoCompressor/src/com/ai/ipu/videocompressor/func/MobileVideoCompress.java

@@ -4,6 +4,7 @@ package com.ai.ipu.videocompressor.func;
import org.json.JSONArray;
import android.app.Activity;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
import android.util.Log;

ipu-VideoCompressor/src/com/ai/ipu/videocompressor/util/VideoCompressUtil.java

@@ -2,10 +2,12 @@ package com.ai.ipu.videocompressor.util;
import com.ai.ipu.mobile.ui.HintUtil;
import com.ai.ipu.videocompressor.CompressListener;
import com.ai.ipu.videocompressor.Compressor;
import com.ai.ipu.videocompressor.InitListener;
import android.app.Activity;
import android.content.Context;
import android.util.Log;
@@ -25,6 +27,7 @@ public class VideoCompressUtil {
					@Override
					public void onExecSuccess(String message) {
						Log.i("success", message);
						HintUtil.alert((Activity) mContext, "ѹËõ³É¹¦");
					}
					@Override

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

@@ -77,6 +77,6 @@ public class MobileLocalLogic extends Plugin {
		/*执行自定义的业务逻辑*/
		param = BizManager.execute(wademobile, bizAction, param);
		MobileUI mobileUI = wademobile.getPluginManager().getPlugin(MobileUI.class);
		mobileUI.openTemplate(pageAction, param, true);
		mobileUI.openTemplate(pageAction, param, true,true);
	}
}