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

display-client/assets/mobile-action.xml

@@ -157,7 +157,14 @@
	<!-- BaiduMap -->
	<action name="baiduLocation" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="bdLocation" ></action>
	<action name="baiduMap" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="bdLocationMap" ></action>
	<action name="baiduMapPoiSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="poiSearch" ></action>
	<action name="baiduMapLbsSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="lbsSearch" ></action>
	<action name="baiduMapLocation" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="baiduMapLocation"></action>
	<action name="baiduMapPosition" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method = "baiduMapPosition"></action>
	<action name="clickBaiduMap" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="clickBaiduMap"></action>
	<action name="addPolygon" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="addPolygon"></action>
	<action name="poiCitySearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="poiCitySearch"></action>
	<action name="poiNearbySearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="poiNearbySearch"></action>
	<action name="poiBoundsSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="poiBoundsSearch"></action>
	<action name="lbsLocalSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="lbsLocalSearch"></action>
	<action name="lbsNearbySearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="lbsNearbySearch"></action>
	<action name="lbsBoundsSearch" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="lbsBoundsSearch"></action>
</actions>

display-client/assets/mobile-config.xml

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

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

@@ -6,6 +6,7 @@ import com.ai.ipu.mobile.app.AppInfoUtil;
import com.ai.ipu.mobile.app.ApplicationManager;
import com.ai.ipu.mobile.app.MobileCheck;
import com.ai.ipu.mobile.app.MobileOperation;
import com.baidu.mapapi.SDKInitializer;
import com.umeng.analytics.MobclickAgent;
import com.wade.mobile.app.AppRecord;
import com.wade.mobile.frame.activity.TemplateMainActivity;
@@ -34,6 +35,7 @@ public class MainActivity extends TemplateMainActivity {
		} else {
			super.onCreate(savedInstanceState);
		}
		SDKInitializer.initialize(ApplicationManager.getApplication());//初始化百度地图SDK
	}
	
	@Override

display-server/etc/server-config.xml

@@ -1,10 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<configs>
	<config name="name" value="DisplayServer"/>
	<!-- 配置为true之后。服务端修改后，需要将资源版本号也修改。再重新build，最后发布 -->
	<!-- 发布之前修改为true,会提升一些性能 -->
	<config name="productMode" value="false"/>
	<!-- 服务端资源版本号 -->
	<config name="resourceVersion" value="2.0"/>
	<!-- 客户端版本号 -->
	<config name="clientVersion" value="2.2"/>
	<!-- 客户端是否强制更新 -->

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

@@ -2,18 +2,140 @@ require(["domReady!","wadeMobile","util"],function(doc,WadeMobile){
	var iscroll=new iScroll("content");
	//定位
	$("#baiduLocation").tap(function(){
		WadeMobile.baiduLocation();
		})
	//百度地图
	$("#baiduMap").tap(function(){
		WadeMobile.baiduMap();
		WadeMobile.baiduLocation(function(info){
			$("#locationDesc").html(info);
			iscroll.refresh();
		});
	})
	//地图定位
	$("#baiduMapLoc").tap(function(){
		WadeMobile.baiduMapLocation();
	})
	//单点定位标注
	$("#baiduMapPointSin").tap(function(){
		var param = new Wade.DataMap();
		param.put("Latitude",28.1953);
		param.put("Longitude",112.9886);
		WadeMobile.baiduMapPosition(param);
	})
	//多点定位标注
	$("#baiduMapPointMul").tap(function() {
		var list = new Wade.DatasetList();
		var data1=new Wade.DataMap();
		data1.put("Latitude", 39.963175);
		data1.put("Longitude", 116.400244);
		list.add(data1);
		
		var data2=new Wade.DataMap();
		data2.put("Latitude", 39.942821);
		data2.put("Longitude", 116.369199);
		list.add(data2);
	
		var data3=new Wade.DataMap();
		data3.put("Latitude", 39.939723);
		data3.put("Longitude", 116.425541);
		list.add(data3);
		
		var data4=new Wade.DataMap();
		data4.put("Latitude", 39.906965);
		data4.put("Longitude", 116.401394);
		list.add(data4);
		
		WadeMobile.baiduMapPosition(list);
	})
	//点击钻取
	$("#clickBaiduMap").tap(function(){
		WadeMobile.clickBaiduMap(function(info) {
			var data = new Wade.DataMap(info);
			var lat = data.get("lat");
			var lon = data.get("lon");
			var poiName = data.get("poiName");
			if(poiName == undefined){
				poiName = "";
			}
			var str = "纬度：" + lat + ";经度：" + lon + ";" + poiName;
			iscroll.refresh();
			alert(str);
		});
	})
	//添加覆盖物
	$("#baiduMapAddpolygon").tap(function() {
		var list = new Wade.DatasetList();
		
		var data1 = new Wade.DataMap();
		data1.put("Latitude", 39.93923);
		data1.put("Longitude", 116.357428);
		list.add(data1);
		
		var data2=new Wade.DataMap();
		data2.put("Latitude", 39.91923);
		data2.put("Longitude", 116.327428);
		list.add(data2);
	
		var data3=new Wade.DataMap();
		data3.put("Latitude", 39.89923);
		data3.put("Longitude", 116.347428);
		list.add(data3);
		
		var data4=new Wade.DataMap();
		data4.put("Latitude", 39.89923);
		data4.put("Longitude", 116.367428);
		list.add(data4);
		
		var data5 = new Wade.DataMap();
		data5.put("Latitude", 39.91923);
		data5.put("Longitude", 116.387428);
		list.add(data5);
		WadeMobile.addPolygon(list);
	})
	//poi检索
	$("#baiduMapPoiSearch").tap(function(){
		WadeMobile.baiduMapPoiSearch();
//	$("#baiduMapPoiSearch").tap(function(){
//		WadeMobile.baiduMapPoiSearch();
//	})
	$("#bdPoiCitySearch").tap(function() {
		var city = "长沙";
		var keyword = "联通";
		WadeMobile.poiCitySearch(city,keyword);
	})
	$("#bdPoiNearbySearch").tap(function() {
		var latlonMap = new Wade.DataMap();
		latlonMap.put("Latitude",28.1953);
		latlonMap.put("Longitude",112.9886);
		var radius = 500;
		var keyword = "联通";
		WadeMobile.poiNearbySearch(latlonMap,radius,keyword);
	})
	$("#bdPoiBoundsSearch").tap(function() {
		var swData = new Wade.DataMap();
		swData.put("Latitude",39.92235);
		swData.put("Longitude",116.380338);
		var neData = new Wade.DataMap();
		neData.put("Latitude",39.947246);
		neData.put("Longitude",116.414977);
		var keyword = "联通";
		WadeMobile.poiBoundsSearch(swData,neData,keyword);
	})
	//lbs检索
	$("#baiduMapLbsSearch").tap(function(){
		WadeMobile.baiduMapLbsSearch();
	$("#bdLbsLocalSearch").tap(function() {
		var ak = "B266f735e43ab207ec152deff44fec8b";
		var geoTableId = 31869;
		var region = "北京市";
		var q = "天安门";
		WadeMobile.lbsLocalSearch(ak,geoTableId,q,region);
	})
	$("#bdLbsNearbySearch").tap(function() {
		var ak = "D9ace96891048231e8777291cda45ca0";
		var geoTableId = 32038;
		var locdata = "116.403689,39.914957";
		var radius = 30000;
		var q = "";
		WadeMobile.lbsNearbySearch(ak,geoTableId,q,locdata,radius);
	})
	$("#bdLbsBoundsSearch").tap(function() {
		var ak = "B266f735e43ab207ec152deff44fec8b";
		var geoTableId = 31869;
		var bounds = "116.401663,39.913961;116.406529,39.917396";
		var q = "天安门";
		WadeMobile.lbsBoundsSearch(ak,geoTableId,q,bounds);
	})
});

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

@@ -5,10 +5,8 @@ require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
		WadeMobile.loadingStart("正在定位");
		WadeMobile.location(function(info){
			WadeMobile.loadingStop();
			var data=new Wade.DataMap(info);
			$("#locationDesc").html(data.get("LocationDesc"));
			iscroll.refresh();
			alert(data);
		},function(error){
			WadeMobile.loadingStop();
			WadeMobile.tip(error);

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

@@ -319,20 +319,36 @@ define(["require"],function(require) {
				execute("shareFileQQFriend",[content]);
			},shareFileWeChatFriend:function(content){
				execute("shareFileWeChatFriend",[content]);
			},baiduLocation:function(){
				execute("baiduLocation",[]);
			},baiduMap:function(){
				execute("baiduMap",[]);
			},baiduMapPoiSearch:function(){
				execute("baiduMapPoiSearch",[]);
			},baiduMapLbsSearch:function(err){
				execute("baiduMapLbsSearch",[]);
			},baiduLocation:function(callback,err){
				storageCallback("baiduLocation",callback);
				execute("baiduLocation",[],err);
			},baiduMapLocation:function(callback,err){
				execute("baiduMapLocation",[],err);
			},baiduMapPosition:function(pointParam,err){
				execute("baiduMapPosition",[pointParam.toString()],err);
			},addPolygon:function(markParams,err){
				execute("addPolygon",[markParams.toString()],err);
			},clickBaiduMap:function(callback,err){
				storageCallback("clickBaiduMap",callback);
				execute("clickBaiduMap",[],err);
			},alert:function(param){
				execute("alert",[param]);
			},confirm:function(param){
				execute("confirm",[param]);
			},loading:function(param){
				execute("loading",[param]);
			},poiCitySearch:function(city,keyword,err){
				execute("poiCitySearch",[city,keyword],err);
			},poiNearbySearch:function(latlon,radius,keyword,err){
				execute("poiNearbySearch",[latlon.toString(),radius,keyword],err);
			},poiBoundsSearch:function(swParam,neParam,keyword,err){
				execute("poiBoundsSearch",[swParam.toString(),neParam.toString(),keyword],err);
			},lbsLocalSearch:function(ak,geoTableId,q,region,err){
				execute("lbsLocalSearch",[ak,geoTableId,q,region],err);
			},lbsNearbySearch:function(ak,geoTableId,q,loc,radius,err){
				execute("lbsNearbySearch",[ak,geoTableId,q,loc,radius],err);
			},lbsBoundsSearch:function(ak,geoTableId,q,bounds,err){
				execute("lbsBoundsSearch",[ak,geoTableId,q,bounds],err);
			}
			//},openAlertDialog:function(param){
			//	execute("openAlertDialog",[param]);//提示对话框

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

@@ -37,7 +37,11 @@
						<div class="title" >百度地图</div>
						<div class="info" >功能</div>
					</div>
					<div class="fn fn-2" id="baiduMap">打开地图</div>
					<div class="fn fn-2" id="baiduMapLoc">地图定位</div>
					<div class="fn fn-2" id="baiduMapPointSin">定位单点</div>
					<div class="fn fn-2" id="baiduMapPointMul">定位多点</div>
					<div class="fn fn-2" id="clickBaiduMap">钻取</div>
					<div class="fn fn-2" id="baiduMapAddpolygon">添加覆盖物</div>
				</div>
			</li>
			<li>
@@ -46,7 +50,9 @@
						<div class="title">Poi检索</div>
						<div class="info">在地图上进行poi检索</div>
					</div>
					<div class="fn fn-2" id="baiduMapPoiSearch">地图检索</div>
					<div class="fn fn-2" id="bdPoiCitySearch">城市检索</div>
					<div class="fn fn-2" id="bdPoiNearbySearch">周边检索</div>
					<div class="fn fn-2" id="bdPoiBoundsSearch">区域检索</div>
				</div>
			</li>
			<li>
@@ -55,7 +61,9 @@
						<div class="title">Lbs检索</div>
						<div class="info">在地图上进行lbs检索</div>
					</div>
					<div class="fn fn-2" id="baiduMapLbsSearch">地图检索</div>
					<div class="fn fn-2" id="bdLbsLocalSearch">本地检索</div>
					<div class="fn fn-2" id="bdLbsNearbySearch">周边检索</div>
					<div class="fn fn-2" id="bdLbsBoundsSearch">区域检索</div> 
				</div>
			</li>
			</ul>

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

@@ -156,11 +156,17 @@ public class MobileUI extends Plugin {
			public void run() {
				try {
					
					// added by wyj,replaceAll("null", "\"\""))解决在安卓客户端文本框显示null的问题
					// modify by wyj，replaceAll("\"null\"", "\"\"")解决当结果集中包含"null"字符串时，出现了""""的情况
					Map<?, ?> dataTmp = data;
					if(data!=null) {
						dataTmp = new DataMap(data.toString().replaceAll("\"null\"", "\"\"").replaceAll("null", "\"\""));
					// added by wyj解决在安卓客户端文本框显示null的问题
					if (data != null) {
						IData tmp = new DataMap(data.toString());
						for (String key : tmp.keySet()) {
							if (null == dataTmp.get(key) || "null".equals(dataTmp.get(key))) {
								tmp.put(key, "");
							}
						}
						
						dataTmp = tmp;
					}
					
					TemplateWebView webview = initFlipperPage(pageAction, isAnimation);