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

display-client/AndroidManifest.xml

@@ -5,8 +5,8 @@
    android:versionName="1.3" >
    <uses-sdk
        android:minSdkVersion="10"
        android:targetSdkVersion="15" /><!-- minSdkVersion modify to 10 by wyj for nfc  -->
        android:minSdkVersion="8"
        android:targetSdkVersion="15" />
    <uses-permission android:name="android.permission.CAMERA" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />

display-client/assets/mobile-action.xml

@@ -19,7 +19,7 @@
	<action name="downloadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="downloadWithServlet"></action>
	<action name="uploadWithServlet" class="com.wade.mobile.func.MobileNetWork" method="uploadWithServlet"></action>
	<!-- NFC -->
	<action name="initDfc" class="com.wade.mobile.func.MobileDevice" method="initDfc"></action>
	<action name="initNfc" class="com.wade.mobile.func.MobileDevice" method="initNfc"></action>
	
	<!-- MobileUI -->
	<action name="tip" class="com.wade.mobile.func.MobileUI" method="tip"/>

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

@@ -14,7 +14,7 @@ require(["domReady!","mobile","jcl","tap"],function(doc, Mobile, $) {
		cmds1.put("cmd5","805C000204");
		var cmds = new $.DataMap();
		cmds.put("cmds1",cmds1);
		Mobile.initDfc(cmds);
		Mobile.initNfc(cmds);
	});
	
	// 读取NFC的信息的回调

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

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

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

@@ -219,8 +219,8 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
			alert("等待实现");
		}
		// 初始化NFC
		this.initDfc = function(data,err){
			alert("等待实现");
		this.initNfc = function(data,err){
			alert("浏览器不支持NFC功能");
		}
	}
	

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

@@ -182,8 +182,8 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
			WadeMobile.openNative(data.toString(),err);
		}
		// 初始化NFC
		this.initDfc = function(data,err){
			WadeMobile.initDfc(data.toString(),err);
		this.initNfc = function(data,err){
			WadeMobile.initNfc(data.toString(),err);
		}
		
	};

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

@@ -4,13 +4,16 @@ import org.json.JSONArray;
import org.json.JSONObject;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import com.wade.mobile.app.MobileAppInfo;
import com.wade.mobile.common.nfc.activity.NfcActivity;
import com.wade.mobile.common.nfc.util.NfcConstant;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.ui.helper.HintHelper;
import com.wade.mobile.util.EscapeUnescape;
public class MobileDevice extends Plugin {
@@ -27,7 +30,12 @@ public class MobileDevice extends Plugin {
	 * @param param
	 * @throws Exception
	 */
	public void initDfc(JSONArray param) throws Exception {
	public void initNfc(JSONArray param) throws Exception {
		if (Build.VERSION.SDK_INT < MobileAppInfo.Android_2_3_3) {
			HintHelper.alert(context, "版本过低,不能使用NFC");
			return;
		}
		
		NfcConstant.handler = handler;
		String cmdsStr = param.getString(0);