浏览代码

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

huangbo 8 年之前
父节点
当前提交
520a34af8d

+ 2 - 2
display-client/assets/mobile-action.xml

156
	<action name="shareFileMore" class="com.ai.ipu.share.func.MobileShareByApp" method="shareFileMore"></action>
156
	<action name="shareFileMore" class="com.ai.ipu.share.func.MobileShareByApp" method="shareFileMore"></action>
157
	
157
	
158
	<!-- Sweet控件 -->
158
	<!-- Sweet控件 -->
159
	<!-- <action name="sweetAlert" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetAlert"/>
159
	<action name="sweetAlert" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetAlert"/>
160
	<action name="sweetConfirm" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetConfirm"/>
160
	<action name="sweetConfirm" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetConfirm"/>
161
	<action name="sweetLoading" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetLoading"/> -->
161
	<action name="sweetLoading" class="com.ai.ipu.alertdialog.func.MobileUIWithSAD" method="sweetLoading"/>
162

162

163
	<!-- 邮件 -->
163
	<!-- 邮件 -->
164
	<action name="shareImageBymail" class="com.ai.ipu.mail.func.MailSendByApp" method="shareImageBymail"></action>	
164
	<action name="shareImageBymail" class="com.ai.ipu.mail.func.MailSendByApp" method="shareImageBymail"></action>	

+ 19 - 1
display-client/src/com/ai/ipu/display/MainActivity.java

5
import android.os.Bundle;
5
import android.os.Bundle;
6
import android.util.DisplayMetrics;
6
import android.util.DisplayMetrics;
7
import android.view.View;
7
import android.view.View;
8
import android.widget.Toast;
8
9
import java.net.SocketTimeoutException;
9
10
10
import com.ai.ipu.ipupathmenu.PathMenu;
11
import com.ai.ipu.ipupathmenu.PathMenu;
11
import com.ai.ipu.ipupathmenu.PathMenu.OnButtonClickListener;
12
import com.ai.ipu.ipupathmenu.PathMenu.OnButtonClickListener;
13
import com.ai.ipu.mobile.app.ApplicationManager;
14
import com.ai.ipu.mobile.app.ApplicationManager;
14
import com.ai.ipu.mobile.app.MobileCheck;
15
import com.ai.ipu.mobile.app.MobileCheck;
15
import com.ai.ipu.mobile.app.MobileOperation;
16
import com.ai.ipu.mobile.app.MobileOperation;
17
import com.ai.ipu.mobile.util.IpuMobileLog;
16
//import com.baidu.mapapi.SDKInitializer;
18
//import com.baidu.mapapi.SDKInitializer;
17
import com.umeng.analytics.MobclickAgent;
19
import com.umeng.analytics.MobclickAgent;
18
import com.wade.mobile.app.AppRecord;
20
import com.wade.mobile.app.AppRecord;
20
import com.wade.mobile.frame.config.ServerConfig;
22
import com.wade.mobile.frame.config.ServerConfig;
21
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
23
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
22
import com.wade.mobile.ui.view.FlipperLayout;
24
import com.wade.mobile.ui.view.FlipperLayout;
25
import com.wade.mobile.util.Constant;
23
import com.wade.mobile.util.Messages;
26
import com.wade.mobile.util.Messages;
24
27
25
public class MainActivity extends TemplateMainActivity {
28
public class MainActivity extends TemplateMainActivity {
220
        }
223
        }
221
	}
224
	}
222
	/***************创建初始化设置快捷菜单END********************/
225
	/***************创建初始化设置快捷菜单END********************/
226
	
227
	@Override
228
	protected void error(Exception e) {
229
		handler.sendEmptyMessage(3);
230
		if(e instanceof java.net.ConnectException){			
231
			getWadeMobileClient().alert("启动失败:网络连接错误", Constant.Function.close, new Object[] {false});
232
			return;
233
		}
234
		if (e instanceof SocketTimeoutException) {
235
			// 这个地方需要关闭应用
236
			getWadeMobileClient().alert(Messages.CONN_SERVER_FAILED, Constant.Function.close, new Object[] {false});
237
			return;
238
		}
239
		IpuMobileLog.e(TAG, e.getMessage(), e);
240
	}
223
}
241
}

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

1
package com.ai.ipu.func;
1
package com.ai.ipu.func;
2
2
3
import com.ai.ipu.dynamic.DynamicPluginExtendManager;
4
import org.json.JSONArray;
3
import org.json.JSONArray;
5
4
6
import android.content.ComponentName;
5
import android.content.ComponentName;

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

59
		<div class="pic"><span class="e_ico-nfc"></span></div>
59
		<div class="pic"><span class="e_ico-nfc"></span></div>
60
		<div class="text">NFC</div>
60
		<div class="text">NFC</div>
61
	</li>
61
	</li>
62
	<li action="Voice">
62
	<!-- <li action="Voice">
63
		<div class="pic"><span class="e_ico-nfc"></span></div>
63
		<div class="pic"><span class="e_ico-nfc"></span></div>
64
		<div class="text">语音识别</div>
64
		<div class="text">语音识别</div> -->
65
	</li>
65
	</li>
66
	<li action="Share">
66
	<li action="Share">
67
		<div class="pic"><span class="e_ico-nfc"></span></div>
67
		<div class="pic"><span class="e_ico-nfc"></span></div>
81
		<div class="text">视频压缩</div>
81
		<div class="text">视频压缩</div>
82
	</li>
82
	</li>
83

83

84
    <li action="AppPlugins">
84
   <!--  <li action="AppPlugins">
85
        <div class="pic"><span class="e_ico-data"></span></div>
85
        <div class="pic"><span class="e_ico-data"></span></div>
86
        <div class="text">AppPlugins</div>
86
        <div class="text">AppPlugins</div>
87
    </li>
87
    </li> -->
88
   <!-- <li action="PathMenu">
88
   <!-- <li action="PathMenu">
89
		<div class="pic"><span class="e_ico-nfc"></span></div>
89
		<div class="pic"><span class="e_ico-nfc"></span></div>
90
		<div class="text">快捷菜单</div>
90
		<div class="text">快捷菜单</div>
91
	</li> --> 
91
	</li> --> 
92
	<li action="Iframe">
92
	<!-- <li action="Iframe">
93
		<div class="pic"><span class="e_ico-position"></span></div>
93
		<div class="pic"><span class="e_ico-position"></span></div>
94
		<div class="text">IframeDemo</div>
94
		<div class="text">IframeDemo</div>
95
	</li>
95
	</li> -->
96
</ul>
96
</ul>

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

4
import org.json.JSONArray;
4
import org.json.JSONArray;
5
5
6
import android.app.Activity;
6
import android.app.Activity;
7
import android.content.Intent;
7
import android.database.Cursor;
8
import android.database.Cursor;
8
import android.net.Uri;
9
import android.net.Uri;
9
import android.util.Log;
10
import android.util.Log;

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

2
2
3
3
4
4
5
import com.ai.ipu.mobile.ui.HintUtil;
5
import com.ai.ipu.videocompressor.CompressListener;
6
import com.ai.ipu.videocompressor.CompressListener;
6
import com.ai.ipu.videocompressor.Compressor;
7
import com.ai.ipu.videocompressor.Compressor;
7
import com.ai.ipu.videocompressor.InitListener;
8
import com.ai.ipu.videocompressor.InitListener;
8
9
10
import android.app.Activity;
9
import android.content.Context;
11
import android.content.Context;
10
import android.util.Log;
12
import android.util.Log;
11
13
25
					@Override
27
					@Override
26
					public void onExecSuccess(String message) {
28
					public void onExecSuccess(String message) {
27
						Log.i("success", message);
29
						Log.i("success", message);
30
						HintUtil.alert((Activity) mContext, "ѹËõ³É¹¦");
28
					}
31
					}
29
32
30
					@Override
33
					@Override

二进制
wade-mobile-common/libs/wade-mobile-func.jar


二进制
wade-mobile-common/libs/wade-mobile.jar.bak


二进制
wade-mobile-func/libs/wade-mobile.jar


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

77
		/*执行自定义的业务逻辑*/
77
		/*执行自定义的业务逻辑*/
78
		param = BizManager.execute(wademobile, bizAction, param);
78
		param = BizManager.execute(wademobile, bizAction, param);
79
		MobileUI mobileUI = wademobile.getPluginManager().getPlugin(MobileUI.class);
79
		MobileUI mobileUI = wademobile.getPluginManager().getPlugin(MobileUI.class);
80
		mobileUI.openTemplate(pageAction, param, true);
80
		mobileUI.openTemplate(pageAction, param, true,true);
81
	}
81
	}
82
}
82
}