[提交内容]：display-server nfc 插件

display-client/AndroidManifest.xml

@@ -2,7 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.ai.mobile.display"
    android:versionCode="1"
    android:versionName="1.3" >
    android:versionName="1.0" >
    <uses-sdk
        android:minSdkVersion="8"
@@ -105,10 +105,6 @@
            android:name="com.wade.mobile.common.audio.activity.AudioPlayerActivity"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <activity
            android:name="com.wade.mobile.common.simplemedia.activity.SARecorder"
            android:theme="@style/AudioDialogTheme" >
        </activity>
        <!-- 标记地图 -->
        <activity android:name="com.wade.mobile.common.map.activity.MarkMapActivity">
        </activity>

display-server/web/biz/js/plugin/NFC.js

@@ -0,0 +1,7 @@
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
	$("#read").tap(function() {
		WadeMobile.readByNfc(function(result) {
			alert(result)
		});
	});
});

display-server/web/biz/js/plugin/database.js

@@ -142,11 +142,13 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
	$("#update").tap(function() {
		var param = new Wade.DataMap();
		param.put("STU_NAME", "Dave");
		var condSQL = "STU_NO = :VSTU_NO";
		
		var conds = new Wade.DataMap();
		conds.put("STU_NO", "2015004");
		
		Mobile.update(dbName, tableName, param, conds, function(result){
		Mobile.update(dbName, tableName, param, condSQL, conds, function(result){
			alert(result);
		});
	});
@@ -165,10 +167,12 @@ require(["domReady!","mobile", "util"], function(doc,Mobile) {
	
	//删除数据
	$("#delete").tap(function() {
		var condSQL = "STU_NO = :VSTU_NO";
		
		var param = new Wade.DataMap();
		param.put("STU_NO", "2015004");
		
		Mobile.delete(dbName, tableName, param, function(result){
		Mobile.delete(dbName, tableName, condSQL, param, function(result){
			alert(result);
		});
	});

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

@@ -205,13 +205,13 @@ define(["require"],function(require) {
				}
				storageCallback("insert",callback);
				execute("insert",[dbName,table,datas.toString()],err);
			},delete:function(dbName,table,datas,callback,err){
				if(datas==undefined){
					datas = new Wade.DataMap();
			},delete:function(dbName,table,condSQL,conds,callback,err){
				if(conds==undefined){
					conds = new Wade.DataMap();
				}
				storageCallback("delete",callback);
				execute("delete",[dbName,table,datas.toString()],err);
			},update:function(dbName,table,datas,conds,callback,err){
				execute("delete",[dbName,table,condSQL,conds.toString()],err);
			},update:function(dbName,table,datas,condSQL,conds,callback,err){
				if(datas==undefined){
					datas = new Wade.DataMap();
				}
@@ -219,7 +219,7 @@ define(["require"],function(require) {
					conds = new Wade.DataMap();
				}
				storageCallback("update",callback);
				execute("update",[dbName,table,datas.toString(),conds.toString()],err);
				execute("update",[dbName,table,datas.toString(),condSQL,conds.toString()],err);
			},select:function(dbName,table,columns,conds,callback,err){
				if(columns==undefined){
					columns = new Array();

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

@@ -145,6 +145,10 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
            //alert("准备调用"+action+" 参数:"+args);
            console.log("action:"+action+" param:"+args);
        }
        //数据库特殊处理
        if("execSQL" == action || "insert" == action || "delete" == action || "update" == action || action.match("select")){
        	args = dealSpecSymbol(action, args);
        }
        var WADE_SCHEME = "wade://";
        var url = WADE_SCHEME+action+"?param="+args+"&callback="+callbackKey;
        //一个动作请求客户端的最大数量，超过会造成请求覆盖
@@ -354,6 +358,19 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
	        return JSON.stringify(args);
	    }
	};
	/**
	 * 数据库操作特殊符号处理
	 */
	function dealSpecSymbol(action, args){
		args = args.split(',');//字符串转换为数组对象
		var index = (action.match("select") || action == "update") ? 3 : 2;
		var condStr = args[index];
		condStr = condStr.replace(/=/g, ":3D").replace(/\?/g ,":3F").replace(/,/g, ":9A");
		
		args[index] = condStr;
		
		return args;
	};
	
	var ExpandMobile = require("res/js/mobile/expand-mobile.js");
	var BizMobile = require("biz/js/common/biz-mobile.js");

display-server/web/template/webapp/plugin/NFC.html

@@ -0,0 +1,39 @@
<!DOCTYPE HTML>
<html class="s_bs">
<head>
	<meta charset="utf-8" />
	<meta name="viewport" content="target-densitydpi=device-dpi, width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
	<title>NFC</title>
	{%>template/common/Head.html%}
	<script type="text/javascript" src="biz/js/plugin/NFC.js"></script>
	<link href="biz/css/project.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div class="c_navBar">
	<div class="left">
		<div class="back">
			<span class="e_ico-back"></span>
			<span class="text">NFC</span>
		</div>
	</div>
</div>
<div class="m_content m_content-nofooter" id="content" >
	<div class="c_title">读取NFC信息</div>
	<div class="c_list">
		<ul>
			<li>
				<div class="content">
					<div class="main">
						<div class="title">NFC</div>
						<div class="info"></div>
					</div>
					<div class="fn fn-2" id="read">读取</div>
				</div>
			</li>
		</ul>
	</div>
</div>
</body>
</html>

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

@@ -201,9 +201,7 @@ public class MobileNetWork extends Plugin {
	private String requestBizData(String dataAction, IData param) throws Exception {
		Map<String,String> postData = transPostData(dataAction, param);
		String encode = MobileConfig.getInstance().getEncode();
		String dataUrl = HttpTool.toQueryString(postData);
		dataUrl = HttpTool.urlEncode(dataUrl, encode);
		String dataUrl = HttpTool.toQueryStringWithEncode(postData);
		String result = HttpTool.httpRequest(MobileConfig.getInstance().getRequestUrl(),
				dataUrl, Constant.HTTP_POST);
		if (ServerDataConfig.isEncrypt(dataAction)) {
@@ -220,12 +218,10 @@ public class MobileNetWork extends Plugin {
			MobileSecurity.init(context);
			/* 参数加密处理 */
			String key = MobileSecurity.getDesKey();
			key = key.replace("+", "-");//将+号全部转换成-号
			postData.put(Constant.Server.KEY, key);
			
			if(dataParam!=null){
				String encryptData = MobileSecurity.requestEncrypt(dataParam.toString());
				encryptData = encryptData.replace("+", "-");
				postData.put(Constant.Server.DATA, encryptData);
			}
		} else {