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

display-client/.classpath

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

display-client/.gitignore

@@ -1,5 +1,4 @@
/.settings
/bin
/gen
/proguard
/bin
/proguard

display-client/assets/mobile-action.xml

@@ -44,6 +44,7 @@
	<action name="scanQrCode" class="com.wade.mobile.func.MobileCamera" method="scanQrCode"/>
	<action name="createQrCode" class="com.wade.mobile.func.MobileCamera" method="createQrCode"/>
	<!-- MobileInfo -->
	<action name="getTerminalType" class="com.wade.mobile.func.MobileInfo" method="getTerminalType"/>
	<action name="getSysInfo" class="com.wade.mobile.func.MobileInfo" method="getSysInfo"/>
	<action name="getNetInfo" class="com.wade.mobile.func.MobileInfo" method="getNetInfo"/>
	<action name="getDirection" class="com.wade.mobile.func.MobileInfo" method="getDirection"/>

display-client/assets/mobile-config.xml

@@ -38,4 +38,4 @@
	<config name="loadurl_timeout" value="20000"/>
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
	<!-- <config name="is_debug" value="true"/> -->
</configs>
</configs>

display-client/project.properties

@@ -12,6 +12,5 @@
# Project target.
target=android-15
android.library.reference.1=..\\wade-mobile-lib
android.library.reference.2=../wade-mobile-common
proguard.config=proguard-project.txt
android.library.reference.1=../wade-mobile-common
android.library.reference.2=../wade-mobile-lib

display-server/etc/server-page.xml

@@ -35,6 +35,7 @@
	<action name="WmSegment" template="template/webapp/tag/WmSegment.html"></action>
	<action name="WmFlip" template="template/webapp/tag/WmFlip.html"></action>
	<action name="WmRange" template="template/webapp/tag/WmRange.html"></action>
	<action name="WmRefresh" template="template/webapp/tag/WmRefresh.html"></action>
	
	<action name="WmTabSrc" template="template/webapp/tag/WmTabSrc.html"></action>
	<action name="WmTabbarSrc" template="template/webapp/tag/WmTabbarSrc.html"></action>
@@ -49,6 +50,7 @@
	<action name="WmSegmentSrc" template="template/webapp/tag/WmSegmentSrc.html"></action>
	<action name="WmFlipSrc" template="template/webapp/tag/WmFlipSrc.html"></action>
	<action name="WmRangeSrc" template="template/webapp/tag/WmRangeSrc.html"></action>
	<action name="WmRefreshSrc" template="template/webapp/tag/WmRefreshSrc.html"></action>
	
	<!-- UI Demo -->
	<action name="Button" template="template/webapp/ui/Button.html"></action>

display-server/web/biz/js/common/common.js

@@ -6,42 +6,85 @@ define(["jcl","mobile","clientTool"],function(Wade,Mobile,ClientTool) {
		/*调用服务*/
		this.callSvc = function(action,param,callback,isEscape,error){
			param = param ? param : new Wade.DataMap();
            error = error ? error : function(x_code, x_info) {
            error = error ? error : function(x_info, x_code) {
				Mobile.loadingStop();
				alert(action + "请求失败\n错误编码:[" + x_code + "]\n错误信息:" + x_info);
				if(x_code){
					alert("错误编码:[" + x_code + "]\n错误信息:" + x_info);
				}else{
					alert("错误信息:" + x_info);
				}
				if(x_code==-100){
					Mobile.openPage("SessionErr");
					Mobile.openPage("Login");
				}
			};
            
			Common.get(function(sessionID){
				param.put(Constant.SESSION_ID,sessionID);
				if(!param.get(Constant.STAFF_ID)){
					Common.getLocal(function(staffID){
						param.put(Constant.STAFF_ID,staffID);
						callSvc(action,param,callback,isEscape,error);
					},Constant.STAFF_ID);
				}else{
					callSvc(action,param,callback,isEscape,error);
			Common.get(function(data) {
				if (typeof data == "string") {
					data = new Wade.DataMap(data);
				}
				if (data.get(Constant.SESSION_ID)) {
					param.put(Constant.SESSION_ID, data.get(Constant.SESSION_ID));
				}
				if (data.get(Constant.STAFF_ID)) {
					param.put(Constant.STAFF_ID, data.get(Constant.STAFF_ID));
				}
			},Constant.SESSION_ID);
				callSvc(action, param, callback, isEscape, error);
			}, [Constant.SESSION_ID,Constant.STAFF_ID]);
			
			function callSvc(_action,_param,_callback,_isEscape,_error){
				Mobile.dataRequest(_action,_param,function(data){
					var x_resultcode, x_resultinfo;
					if (data.substring(0, 1) == "{") {
						data = new Wade.DataMap(data);
						x_resultcode = data.get(Constant.X_RESULTCODE);
						x_resultinfo = data.get(Constant.X_RESULTINFO);
					} else if (data.substring(0, 1) == "[") {
						data = new Wade.DatasetList(data);
						x_resultcode = data.get(0).get(Constant.X_RESULTCODE);
						x_resultinfo = data.get(0).get(Constant.X_RESULTINFO);
				Mobile.dataRequest(_action,_param,function(resultData){
					if (typeof (resultData) == "string") {
						resultData = new Wade.DataMap(resultData);
					}
					var x_resultcode = resultData.get(Constant.X_RESULTCODE);
					var x_resultinfo = resultData.get(Constant.X_RESULTINFO);
					if(x_resultcode<0){
						_error(x_resultinfo, x_resultcode);//接口异常则回调报错函数
					}else{
						_callback(resultData);
					}
					_callback(data);
				}, _isEscape, _error);
			}
		};
		this.openPage = function(action, param, error) {
			param = param ? param : new Wade.DataMap();
			error = error ? error : function(x_info, x_code) {
				Mobile.loadingStop();
				if(x_code){
					alert("错误编码:[" + x_code + "]\n错误信息:" + x_info);
				}else{
					alert("错误信息:" + x_info);
				}
				if(x_code==-100){
					Mobile.openPage("Login");
				}
			};
			Common.get(function(data) {
				if (typeof data == "string") {
					data = new Wade.DataMap(data);
				}
				if (data.get(Constant.SESSION_ID)) {
					param.put(Constant.SESSION_ID, data.get(Constant.SESSION_ID));
				}
				if (data.get(Constant.STAFF_ID)) {
					param.put(Constant.STAFF_ID, data.get(Constant.STAFF_ID));
				}
				openPage(action, param, error);
			}, [Constant.SESSION_ID,Constant.STAFF_ID]);
			function openPage(_action, _param, _error) {
				Mobile.openPage(_action, _param, function(errMsg) {
					if (typeof (errMsg) == "string") {
						errMsg = new Wade.DataMap(errMsg);
					}
					var x_resultcode = errMsg.get("X_RESULTCODE");
					var x_resultinfo = errMsg.get("X_RESULTINFO");
					_error(x_resultinfo, x_resultcode);
				});
			}
		};
		
		this.closeApp = function(){
			if(confirm("确定要退出应用程序吗?")){

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

@@ -18,6 +18,7 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		/******************数据请求**********************/
		/*调用服务*/
		this.dataRequest = function(action, param, callback, isEscape, err) {
			browserTool.ajax.post(action, param, callback, isEscape, err);
			/*browserTool.ajax.post(action, param, function(resultData){
				resultData = Wade.DataMap(resultData);
				var x_resultcode = resultData.get("X_RESULTCODE");
@@ -27,9 +28,6 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
					callback(resultData);
				};
			}, isEscape, err);*/
			browserTool.ajax.post(action, param, function(resultData){
				callback(resultData);
			}, isEscape, err);
		};
		/******************页面跳转**********************/
		/*页面跳转,url为跳转目标*/

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

@@ -6,15 +6,13 @@ define(["jcl","base64","util","res/js/mobile/expand-mobile.js","biz/js/common/bi
    var terminalType = (function(){
		var sUserAgent = navigator.userAgent.toLowerCase();
		var bIsIpad = sUserAgent.match(/ipad/i) == "ipad";
		var bIsIphoneOs = sUserAgent.match(/iphone os/i) == "iphone os";
		var bIsIphone = sUserAgent.match(/iphone os/i) == "iphone os";
		var bIsAndroid = sUserAgent.match(/android/i) == "android";
		var bIsWinphone = sUserAgent.match(/windows phone /i) == "windows phone " || sUserAgent.match(/windows phone os /i) == "windows phone os ";
		if(bIsAndroid){
			return "a";
		}else if(bIsIpad||bIsIphoneOs){
		}else if(bIsIpad||bIsIphone){
			return "i";
		}else if(bIsWinphone){
			return "w";
		}else{
			return null;
		}
@@ -22,14 +20,11 @@ define(["jcl","base64","util","res/js/mobile/expand-mobile.js","biz/js/common/bi
	
	WadeMobile = (function(){
        return{
        	isAndroid:function(){
        		return terminalType=='a';
        	},isIOS:function(){
        		return terminalType=='i';
        	},isWP:function(){
        		return terminalType=='w';
        	},isApp:function(){//判断是否是APP应用
				return terminalType!=null;
        	isApp:function(){//判断是否是APP应用
				return window["PluginManager"] || terminalType=="i";
        	},getTerminalType:function(callback,err){
        		WadeMobile.callback.storageCallback("getTerminalType",callback);
        		execute("getTerminalType", [], err);
        	},getSysInfo:function(callback,key,err){//TELNUMBER|IMEI|IMSI|SDKVERSION|OSVERSION|PLATFORM|SIMNUMBER
				WadeMobile.callback.storageCallback("getSysInfo",callback);
				execute("getSysInfo", [key],err);
@@ -143,7 +138,6 @@ define(["jcl","base64","util","res/js/mobile/expand-mobile.js","biz/js/common/bi
        }
        var WADE_SCHEME = "wade://";
        var url = WADE_SCHEME+action+"?param="+args+"&callback="+callbackKey;
        //var ifrmName = action;
        //一个动作请求客户端的最大数量，超过会造成请求覆盖
        var limitAction = 10;
        var ifrmName = "WADE_FRAME_"+(callbackId%limitAction);
@@ -347,12 +341,19 @@ define(["jcl","base64","util","res/js/mobile/expand-mobile.js","biz/js/common/bi
	        }
	        s = s + "]";
	        return s;
	    }
	    else {
	    }else {
	        return JSON.stringify(args);
	    }
	};
	
	/*从终端中获取类型*/
	WadeMobile.getTerminalType(function(type){
		console.log("读取真机类型:"+type);
		if(type){
			terminalType = type;
		}
	});
	
	var ExpandMobile = require("res/js/mobile/expand-mobile.js");
	var BizMobile = require("biz/js/common/biz-mobile.js");
	Wade.extend(WadeMobile,ExpandMobile);//属性合并,ExpandMobile累加到WadeMobile中

display-server/web/template/webapp/TagIndex.html

@@ -51,4 +51,8 @@
		<div class="pic"><span class="e_ico-conect"></span></div>
		<div class="text">WmRange</div>
	</li>
	<li action="WmRefresh">
		<div class="pic"><span class="e_ico-conect"></span></div>
		<div class="text">WmRefresh</div>
	</li>
</ul>

display-server/web/template/webapp/TagIndexSrc.html

@@ -51,4 +51,8 @@
		<div class="pic"><span class="e_ico-conect"></span></div>
		<div class="text">WmRangeSrc</div>
	</li>
	<li action="WmRefreshSrc">
		<div class="pic"><span class="e_ico-conect"></span></div>
		<div class="text">WmRefreshSrc</div>
	</li>
</ul>

display-server/web/template/webapp/tag/WmRefresh.html

@@ -11,7 +11,7 @@
<div class="c_navBar">
	<div class="back">
		<span class="e_ico-back"></span>
		<div class="text">WmRefreshSrc</div>
		<div class="text">WmRefresh</div>
	</div>
</div>

ipu-client/assets/mobile-config.xml

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

multiple-client/assets/mobile-config.xml

@@ -3,7 +3,7 @@
    <!-- 请求主机名或请求地址。包括服务器的ip地址和端口 -->
	<!-- <config name="request_host" value="http://192.168.1.102:8080"/> -->
	<!-- 必须。10.0.2.2为Android模拟器的保留ip地址。访问到本机电脑时使用 -->
	<config name="request_host" value="http://10.0.2.2:8080"/>
	<config name="request_host" value="http://192.168.57.1:8080"/>
	<!-- 必须。容器应用名或请求根路径 -->
	<config name="request_path" value="/mult"/>
	<!-- 必须。数据接口的servlet路径 -->

multiple-client/project.properties

@@ -12,5 +12,5 @@
# Project target.
target=android-15
android.library.reference.1=../../android/wade-mobile-com
android.library.reference.1=../wade-mobile-common
android.library.reference.2=../wade-mobile-lib

multiple-server/.gitignore

@@ -2,3 +2,4 @@
/.settings
/mult.war
/bin/*
/bin/

wade-mobile-common/.gitignore

@@ -1,4 +1,4 @@
/.settings
/bin
/gen
/.classpath
/

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

@@ -16,7 +16,6 @@ import android.telephony.TelephonyManager;
import com.ailk.common.data.IData;
import com.ailk.common.data.impl.DataMap;
import com.wade.mobile.app.MobileUtil;
import com.wade.mobile.frame.IWadeMobile;
import com.wade.mobile.frame.plugin.Plugin;
import com.wade.mobile.util.DirectionUtil;
@@ -31,6 +30,11 @@ public class MobileInfo extends Plugin{
		super(wademobile);
		directionUtil=DirectionUtil.getInstance(context);
	}
	
	public void getTerminalType(JSONArray params) throws Exception{
		callback("a");//终端类型为android
	}
	
	/**
	 * 获取本应用的一些特殊位置信息
	 * @param params

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

@@ -187,12 +187,6 @@ public class MobileNetWork extends Plugin {
		String result = dataRequest(dataAction, isNull(data) ? null : new DataMap(data));
		
		IData resultData = new DataMap(result);
		if(resultData.getInt("X_RESULTCODE")<0){
			error(resultData.toString());
			return;
		}
		if (isEscape) {
			result = EscapeUnescape.escape(result);
		}

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

@@ -3,8 +3,6 @@ package com.wade.mobile.func;
import java.net.URLDecoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Date;
import java.util.Map;
@@ -17,7 +15,6 @@ import android.app.DatePickerDialog;
import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.view.Gravity;
import android.view.KeyEvent;
import android.webkit.WebView;

wade-mobile-lib/.gitignore

@@ -1,4 +1,4 @@
/.settings
/bin
/gen
/.classpath
/