【提交内容】：main/sub分开

display-client/AndroidManifest.xml

@@ -124,6 +124,13 @@
        <activity android:name="com.wade.mobile.common.keyboard.keyboardActivity"
            android:theme="@android:style/Theme.Translucent">
        </activity>
        <!-- 手势锁 -->
        <activity android:name="com.wade.mobile.common.screenlock.ScreenUnlockActivity" 
            android:theme="@android:style/Theme.NoTitleBar">
        </activity> 
        <activity android:name="com.wade.mobile.common.screenlock.SetScreenLockActivity" 
            android:theme="@android:style/Theme.NoTitleBar">
        </activity>
        
         <!-- YunBa Start -->

display-client/assets/mobile-action.xml

@@ -119,4 +119,8 @@
	
	<!-- keyboard -->
	<action name="openKeyboard" class="com.wade.mobile.func.MobileKeyboard" method="openKeyboard"></action>
	
	<action name="setScreeLock" class="com.wade.mobile.func.MobileScreenLock" method="setScreeLock"></action>
	<action name="screeUnlock" class="com.wade.mobile.func.MobileScreenLock" method="screeUnlock"></action>
	
</actions>

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

@@ -32,6 +32,12 @@ public class MainActivity extends TemplateMainActivity {
			super.onCreate(savedInstanceState);
		}
	}
	
//	@Override
//	protected void initActivity() throws Exception {
//		MobileScreenLock plugin = getPluginManager().getPlugin(MobileScreenLock.class);
//		plugin.screeUnlock(null);
//	}
	@Override
	public void onBackPressed() {

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

@@ -43,6 +43,8 @@ require(["wmTabbar","common","mobile","util"], function(WmTabbar,Common,Mobile)
		
		// 将前台输入的参数传至后台校验
		Common.callSvc("SceneBean.login",loginData,function(data){
			WadeMobile.setScreeLock("SceneBean.login",loginData,"Index");
			
			console.log("结果[用户登陆]：" + data);
			
			if(typeof(resultData) == "string" ){

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

@@ -291,6 +291,10 @@ define(["require"],function(require) {
				execute("openBrowser",[url],err);
			},openKeyboard:function(value,err){
				execute("openKeyboard",[value],err);
			},setScreeLock:function(dataAction,param,indexPage,err){
				execute("setScreeLock",[dataAction,param,indexPage],err);
			},screeUnlock:function(err){
				execute("screeUnlock",[],err);
			}
		};
	})();

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

@@ -5,12 +5,9 @@ import java.util.Map;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageInfo;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.Toast;

multiple-client/src/com/ai/mobile/multiple/SubAppActivity.java

@@ -3,7 +3,6 @@ package com.ai.mobile.multiple;
import java.util.HashMap;
import java.util.Map;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.view.View;
@@ -12,7 +11,7 @@ import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.app.MobileOperation;
import com.wade.mobile.app.MobileUtil;
import com.wade.mobile.frame.activity.TemplateMainActivity;
import com.wade.mobile.frame.activity.TemplateSubActivity;
import com.wade.mobile.frame.config.ServerConfig;
import com.wade.mobile.frame.multiple.MultipleManager;
import com.wade.mobile.frame.template.TemplateWebView;
@@ -21,7 +20,7 @@ import com.wade.mobile.func.MobileUI;
import com.wade.mobile.ui.comp.dialog.ConfirmBlockDialog;
import com.wade.mobile.ui.view.FlipperLayout;
public class SubAppActivity extends TemplateMainActivity{
public class SubAppActivity extends TemplateSubActivity{
	private static Map<String,Boolean> firstStatus = new HashMap<String,Boolean>();//判断子应用第一次开启状态
	
	@Override
@@ -62,7 +61,6 @@ public class SubAppActivity extends TemplateMainActivity{
	@Override
	protected void initActivity() throws Exception {
		// TODO Auto-generated method stub
		firstStatus.put(MultipleManager.getCurrAppId(), false);
		IData param = new DataMap();
		MobileStorage mobileStorage = getPluginManager().getPlugin(MobileStorage.class);
		param.put("SESSION_ID", mobileStorage.getMemoryCache("SESSION_ID", ""));
@@ -72,24 +70,25 @@ public class SubAppActivity extends TemplateMainActivity{
		indexPage = indexPage == null ? ServerConfig.getInstance().getValue("indexPage") : indexPage;
		MobileUI mobileUI = getPluginManager().getPlugin(MobileUI.class);
		mobileUI.openPage(indexPage, param);
		firstStatus.put(MultipleManager.getCurrAppId(), false);
	}
	
	/**
	 * 第二次进入则不做资源更新和客户端更新
	 */
	protected boolean isUpdate() {
	protected boolean isInit() {
		// TODO Auto-generated method stub
		return firstStatus.get(MultipleManager.getCurrAppId()) == null;
	}
	
	/**
	 * 不做客户端更新
	 */
	@Override
	protected boolean isUpdateClient(String clientVersion) throws NameNotFoundException {
		// TODO Auto-generated method stub
		return false;
	}
//	/**
//	 * 不做客户端更新
//	 */
//	@Override
//	protected boolean isUpdateClient(String clientVersion) throws NameNotFoundException {
//		// TODO Auto-generated method stub
//		return false;
//	}
	
	/**
	 * 第二次进入则不使用欢迎页的延时配置

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

@@ -0,0 +1,74 @@
package com.wade.mobile.func;
import org.json.JSONArray;
import android.content.Intent;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
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.plugin.Plugin;
public class MobileScreenLock extends Plugin {
	private static final int LOCK = 1;
	private static final int UN_LOCK = 2;
	public MobileScreenLock(IWadeMobile wademobile) {
		super(wademobile);
	}
	public void setScreeLock(JSONArray param) throws Exception {
		String dataAction = param.getString(0);
		String dataParam = param.getString(1);
		String indexPage = param.getString(2);
		Intent intent = new Intent(context, SetScreenLockActivity.class);
		intent.putExtra("dataAction", dataAction);
		intent.putExtra("dataParam", dataParam);
		intent.putExtra("indexPage", indexPage);
		startActivityForResult(intent, LOCK);
	}
	public void screeUnlock(JSONArray param) throws Exception {
		Intent intent = new Intent(context, ScreenUnlockActivity.class);
		startActivityForResult(intent, UN_LOCK);
	}
	public void onActivityResult(int requestCode, int resultCode, Intent intent) {
		if (requestCode == LOCK) {
			if (resultCode == SetScreenLockActivity.SCREEN_LOCK) {
				try {
					MobileUI plugin = wademobile.getPluginManager().getPlugin(
							MobileUI.class);
					String indexPage = intent.getStringExtra("indexPage");
					plugin.openPage(indexPage, null);
				} catch (Exception e) {
					e.printStackTrace();
				}
			}
		} 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");
					// 自动登陆，，，但是测试的时候好像有点问题呐！！！！！
					IData param = new DataMap(dataParam);
					MobileNetWork mobileNetWork = wademobile.getPluginManager()
							.getPlugin(MobileNetWork.class);
					mobileNetWork.dataRequest(dataAction, param);
					MobileUI plugin = wademobile.getPluginManager().getPlugin(
							MobileUI.class);
					plugin.openPage(indexPage, null);
				} catch (Exception e) {
					e.printStackTrace();
				}
			}
		}
	}
}