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

display-client/assets/mobile-config.xml

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configs>
    <!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<config name="request_host" value="http://www.aiipu.com"/>
	<config name="request_host" value="http://www.aiipu.com:8083"/>
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<!-- <config name="request_host" value="http://10.0.2.2:8080"/> -->
	<!-- 必须。容器应用名或请求根路径 -->

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

@@ -2,25 +2,16 @@ 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 com.ai.ipu.mobile.app.AppInfoUtil;
import com.ai.ipu.mobile.app.AppRecord;
import com.ai.ipu.mobile.app.ApplicationManager;
import com.ai.ipu.mobile.app.AutoUpdate;
import com.ai.ipu.mobile.app.MobileCheck;
import com.ai.ipu.mobile.app.MobileOperation;
import com.ai.ipu.mobile.frame.activity.TemplateMainActivity;
import com.ai.ipu.mobile.frame.config.MobileConfig;
import com.ai.ipu.mobile.frame.config.ServerConfig;
import com.ai.ipu.mobile.plugin.MobileUI;
import com.ai.ipu.mobile.res.assets.AssetsUtil;
import com.ai.ipu.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.ai.ipu.mobile.ui.comp.dialog.IUpdateDialog;
import com.ai.ipu.mobile.ui.comp.menu.PathMenu;
import com.ai.ipu.mobile.ui.comp.menu.PathMenu.OnButtonClickListener;
import com.ai.ipu.mobile.ui.view.FlipperLayout;
@@ -30,6 +21,12 @@ import com.ai.ipu.mobile.util.IpuMobileLog;
import com.ai.ipu.mobile.util.Messages;
import com.umeng.analytics.MobclickAgent;
import android.annotation.SuppressLint;
import android.graphics.Rect;
import android.os.Bundle;
import android.util.DisplayMetrics;
import android.view.View;
public class MainActivity extends TemplateMainActivity {
	private PathMenu pathMenu;
	int screenWidth;                    		//窗口的宽度   
@@ -66,13 +63,25 @@ public class MainActivity extends TemplateMainActivity {
		} else {
			super.onCreate(savedInstanceState);
		}
//		SDKInitializer.initialize(ApplicationManager.getApplication());//初始化百度地图SDK
//		SDKInitializer.initialize(ApplicationManager.getApplication());//初始化百度地图SDK 
		
		/*添加快捷菜单到主界面*/
		mainLayout.addView(createMenu());
		initShareFile();
		
//		handler.sendEmptyMessageDelayed(1, 5000); 
	}
	
	//测试程序崩溃使用
//	Handler handler = new Handler(){
//		public void handleMessage(android.os.Message msg) {
//			if(msg.what == 1){				
//				Log.d("crashInfo", "crashInfo");
//				throw new RuntimeException("自定义崩溃crash...");
//			}
//		};
//	};
	
	@Override
	protected LoadingDialogStyle getLoadingDialogStyle() {
		// TODO Auto-generated method stub
@@ -242,4 +251,5 @@ public class MainActivity extends TemplateMainActivity {
//		DownloadMgr downloadMgr = new DownloadMgr(this, downloadUrl, apkPath, true);
//		downloadMgr.showUpateDialog(this);
//	}
	
}

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

@@ -21,18 +21,18 @@ public class OpenOtherApp extends Plugin {
			Intent intent = new Intent();
			intent.setClassName("com.ai.ipu.display", "com.ai.ipu.display.MainActivity");
			intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
			intent.putExtra("pageAction", pageAction);
			intent.putExtra("PAGE_ACTION", pageAction);
			
			if(params.length() > 1) {
				JSONArray array = params.getJSONArray(1);
				String pageParams = array.getString(0);
				if (pageParams != null && pageParams.length() > 0) {
					intent.putExtra("pageParams", pageParams);
					intent.putExtra("PAGE_PARAMS", pageParams);
				}
				
				String contextParams = array.getString(1);
				if (contextParams != null && contextParams.length() > 0) {
					intent.putExtra("contextParams", contextParams);
					intent.putExtra("PAGE_CONTEXT", contextParams);
				}
			}
			

display-server/src/main/resources/dev/database.xml

@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<database limit="100000">
	<display
		type="dbcp"
		driver="com.mysql.jdbc.Driver"
		url="jdbc:mysql://localhost:3306/display?useUnicode=true"
        user="ipu"
        passwd="ipumysql"
		initialSize="5"
		maxActive="20"
		maxIdle="5"
		maxWait="1000"
		/>
</database>

display-server/src/main/resources/test/database.xml

@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<database limit="100000">
	<display
		type="dbcp"
		driver="com.mysql.jdbc.Driver"
		url="jdbc:mysql://121.42.183.206:3307/display?useUnicode=true"
        user="ipu"
        passwd="ipumysql"
		initialSize="5"
		maxActive="20"
		maxIdle="5"
		maxWait="1000"
		/>
</database>

display-server/src/main/webapp/res/js/mobile/wade-mobile.js

@@ -75,6 +75,10 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
				execute("loadPage", [action,data],err);
			},loadTemplate:function(action,context,err){
				execute("loadTemplate", [action,context],err);
			},openBrowser:function(url,err){
				execute("openBrowser",[url],err);
			},openIpuBrowser:function(url,hasTitle,err){
				execute("openIpuBrowser",[url,hasTitle],err);
			},back:function(tag,err){
				execute("back",[tag],err);
			},backWithCallback:function(data,tag,err){