【提交内容】：删除display中multiple的内容！！！！！

display-client/AndroidManifest.xml

@@ -61,6 +61,7 @@
                <category android:name="android.intent.category.LAUNCHER" />
            </intent-filter>
        </activity>
        
        <!-- 注册推送服务 -->
        <service android:name="com.ai.mobile.im.PushService" android:process=":WmPush" />
        

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

@@ -30,7 +30,8 @@ public class MainActivity extends TemplateMainActivity {
	
//	@Override
//	protected void initActivity() throws Exception {
//		MobileScreenLock plugin = getPluginManager().getPlugin(MobileScreenLock.class);
//		plugin.screeUnlock(null);
//		MobileScreenLock plugin = getPluginManager().getPlugin(
//				MobileScreenLock.class);
//		plugin.screeUnlock("0", "Index");
//	}
}

display-server/web/biz/js/scene/Login.js

@@ -23,7 +23,7 @@ require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile)
	})
	
	$("#J_pwd").tap(function() {
		WadeMobile.openKeyboard("onkeydownpassWord");
		Mobile.openKeyboard("onkeydownpassWord");
	});
	
	window.onkeydownpassWord = function(msg){
@@ -43,7 +43,7 @@ require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile)
		
		// 将前台输入的参数传至后台校验
		Common.callSvc("SceneBean.login",loginData,function(data){
			WadeMobile.setScreeLock("SceneBean.login",loginData,"Index");
			Mobile.setScreeLock("SceneBean.login",loginData,"Index");
			
			console.log("结果[用户登陆]：" + data);
			

display-server/web/res/js/mobile/expand-mobile.js

@@ -293,8 +293,8 @@ define(["require"],function(require) {
				execute("openKeyboard",[value],err);
			},setScreeLock:function(dataAction,param,indexPage,err){
				execute("setScreeLock",[dataAction,param,indexPage],err);
			},screeUnlock:function(err){
				execute("screeUnlock",[],err);
			},screeUnlock:function(screenUnlockType, forgetPageAction, err){
				execute("screeUnlock",[screenUnlockType, forgetPageAction],err);
			}
		};
	})();

display-server/web/res/js/mobile/mobile-browser.js

@@ -203,6 +203,18 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		this.selectFirst = function(dbName,table,columns,conds,callback,err){
			alert("等待实现");
		};
		// 设置手势锁
		this.setScreeLock = function(dataAction,param,indexPage,err) {
			alert("等待实现");
		}
		// 解锁
		this.screeUnlock = function(screenUnlockType, forgetPageAction, err){
			alert("等待实现");
		}
		// 打开小键盘
		this.openKeyboard = function(value,err){
			alert("等待实现");
		}
	}
	
	return Mobile;

display-server/web/res/js/mobile/mobile-client.js

@@ -166,6 +166,18 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
		this.selectFirst = function(dbName,sql,bindArgs,callback,err){
			WadeMobile.selectFirst(dbName,sql,bindArgs,callback,err);
		};
		// 设置手势锁
		this.setScreeLock = function(dataAction,param,indexPage,err) {
			WadeMobile.setScreeLock(dataAction,param.toString(),indexPage,err);
		}
		// 解锁
		this.screeUnlock = function(screenUnlockType, forgetPageAction, err){
			WadeMobile.screeUnlock(screenUnlockType, forgetPageAction, err);
		}
		// 打开小键盘
		this.openKeyboard = function(value,err){
			WadeMobile.openKeyboard(value,err);
		}
	};
	
	return Mobile;

wade-mobile-func/.classpath

@@ -1,11 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/wade-mobile-com"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry combineaccessrules="false" kind="src" path="/wade-mobile"/>
	<classpathentry combineaccessrules="false" kind="src" path="/wade-mobile-com"/>
	<classpathentry combineaccessrules="false" kind="src" path="/wade-mobile-data"/>
	<classpathentry combineaccessrules="false" kind="src" path="/wade-mobile-im"/>
	<classpathentry combineaccessrules="false" kind="src" path="/wade-mobile-ui"/>
	<classpathentry kind="lib" path="libs/android.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-common/libs/wade-mobile-data.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-common/libs/wade-mobile-im.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-common/libs/wade-mobile-ui.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/achartengine-1.1.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/actionbarsherlock.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/Android_Location_V1.1.1.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/Android_Map_V2.2.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/Android_Services_V2.2.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/android-lite-http.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/android-support-v4.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/android-support-v7-appcompat.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/android-support-v7-gridlayout.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/android-support-v7-mediarouter.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/gson-2.2.4.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/pinyin4j-2.5.0.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/scan-code.jar"/>
	<classpathentry kind="lib" path="/wade-mobile-lib/libs/unirest-java-1.3.2-SNAPSHOT-withDependency-ShadedForAndroid.jar"/>
	<classpathentry kind="output" path="bin"/>
</classpath>

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

@@ -6,9 +6,11 @@ import android.content.Intent;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.common.MobileThread;
import com.wade.mobile.common.screenlock.ScreenUnlockActivity;
import com.wade.mobile.common.screenlock.SetScreenLockActivity;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.frame.plugin.Plugin;
public class MobileScreenLock extends Plugin {
@@ -16,6 +18,8 @@ public class MobileScreenLock extends Plugin {
	private static final int LOCK = 1;
	private static final int UN_LOCK = 2;
	private static final String SCREEN_UNLOCK_LOGIN = "0";
	public MobileScreenLock(IWadeMobile wademobile) {
		super(wademobile);
	}
@@ -32,7 +36,23 @@ public class MobileScreenLock extends Plugin {
	}
	public void screeUnlock(JSONArray param) throws Exception {
		String screenUnlockType = param.getString(0);
		if (null == screenUnlockType || "".equals(screenUnlockType)) {
			screenUnlockType = SCREEN_UNLOCK_LOGIN;
		}
		String forgetPageAction = param.getString(1);
		if (null == forgetPageAction || "".equals(forgetPageAction)) {
			forgetPageAction = ServerConfig.getInstance().getValue("indexPage");
		}
		screeUnlock(screenUnlockType, forgetPageAction);
	}
	public void screeUnlock(String screenUnlockType, String forgetPageAction) {
		Intent intent = new Intent(context, ScreenUnlockActivity.class);
		intent.putExtra("screenUnlockType", screenUnlockType);
		intent.putExtra("forgetPageAction", forgetPageAction);
		startActivityForResult(intent, UN_LOCK);
	}
@@ -52,19 +72,45 @@ public class MobileScreenLock extends Plugin {
		} else if (requestCode == UN_LOCK) {
			if (resultCode == ScreenUnlockActivity.SCREEN_UNLOCK) {
				try {
					String dataAction = intent.getStringExtra("dataAction");
					String dataParam = intent.getStringExtra("dataParam");
					String indexPage = intent.getStringExtra("indexPage");
					String screenUnlockType = intent
							.getStringExtra("screenUnlockType");
					if (SCREEN_UNLOCK_LOGIN.equals(screenUnlockType)) {
						final String dataAction = intent
								.getStringExtra("dataAction");
						final String indexPage = intent
								.getStringExtra("indexPage");
						String dataParam = intent.getStringExtra("dataParam");
						final IData param = new DataMap(dataParam);
						param.put("isAutoLogin", true);
					// 自动登陆，，，但是测试的时候好像有点问题呐！！！！！
					IData param = new DataMap(dataParam);
					MobileNetWork mobileNetWork = wademobile.getPluginManager()
							.getPlugin(MobileNetWork.class);
					mobileNetWork.dataRequest(dataAction, param);
						new MobileThread("unLock") {
							@Override
							protected void execute() throws Exception {
								MobileNetWork mobileNetWork = wademobile
										.getPluginManager().getPlugin(
												MobileNetWork.class);
								mobileNetWork.dataRequest(dataAction, param);
								MobileUI plugin = wademobile.getPluginManager()
										.getPlugin(MobileUI.class);
								plugin.openPage(indexPage, null);
							}
						}.start();
					}
				} catch (Exception e) {
					e.printStackTrace();
				}
			} else if (resultCode == ScreenUnlockActivity.SCREEN_UNLOCK_FORGET) {
				try {
					String forgetPageAction = intent
							.getStringExtra("forgetPageAction");
					MobileUI plugin = wademobile.getPluginManager().getPlugin(
							MobileUI.class);
					plugin.openPage(indexPage, null);
					plugin.openPage(forgetPageAction, null);
				} catch (Exception e) {
					e.printStackTrace();
				}