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

display-client/assets/mobile-action.xml

@@ -154,7 +154,11 @@
	<action name="shareFileQQFriend" class="com.ai.ipu.share.func.MobileShareByApp" method="shareFileQQFriend"></action>
	<action name="shareTextWeChatFriend" class="com.ai.ipu.share.func.MobileShareByApp" method="shareTextWeChatFriend"></action>
	<action name="shareFileWeChatFriend" class="com.ai.ipu.share.func.MobileShareByApp" method="shareFileWeChatFriend"></action>
	<action name="shareTextMore" class="com.ai.ipu.share.func.MobileShareByApp" method="shareTextMore"></action>
	<action name="shareFileMore" class="com.ai.ipu.share.func.MobileShareByApp" method="shareFileMore"></action>
	<!-- 邮件 -->
	<action name="shareImageBymail" class="com.ai.ipu.mail.func.MailSendByApp" method="shareImageBymail"></action>	
	<!-- BaiduMap -->
	<action name="baiduLocation" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="bdLocation" ></action>
	<action name="baiduMapLocation" class="com.ai.ipu.baidumap.func.MobileBaiduMap" method="baiduMapLocation"></action>
@@ -163,6 +167,10 @@
	<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="videoCompressor" class="com.ai.ipu.videocompressor.func.MobileVideoCompress" method="videoCompressor"></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>

display-client/assets/mobile-config.xml

@@ -23,22 +23,9 @@
	<!-- 推送平台服务端口 -->
	<config name="push_port" value="7070"/>
	
	<!-- 非必须，默认2。缓存模式 --><!-- APP_CACHE_MODE -1:LOAD_DEFAULT,0:LOAD_NORMAL,1:LOAD_CACHE_ELSE_NETWORK,2:LOAD_NO_CACHE,3:LOAD_CACHE_ONLY -->
	<config name="cache_mode" value="2"/>
	<!-- *********非模板引擎时使用的配置********* -->
	<!-- 非必须，默认false。页面过渡是否显示loading对话框 -->
	<config name="is_loading_dialog" value="false"/>
	<!-- 非必须。页面过渡的loading图片 -->
	<config name="loading_bg_image" value=""/>
	<!-- 非必须,默认false。页面加载超时是否弹出重试对话框 -->
	<config name="is_overtime_retry" value="false"/>
	<!-- 非必须,默认20000。页面加载的超时时间 -->
	<config name="loadurl_timeout" value="20000"/>
	<!-- 非必须，默认false。打开调试模式，不再比对资源版本，客户端每次下载所有资源-->
	<config name="is_debug" value="false"/>
	<config name="remote_url" value="http://10.0.2.2:8080/g/html/myindex.html" />
	
	<!-- 插件管理平台 -->
	<config name="plugin_manager_host" value="http://123.57.35.51/plugin-manager"/>
    <config name="plugin_manager_path" value=""/>
</configs>
</configs>

display-server-maven/build/build.properties

@@ -0,0 +1,19 @@
project_name=display
project_home=..
common_lib=../../wade-mobile-library/common
build=${project_home}/build
config=${project_home}/src/main/resources
source=${project_home}/src/main/java
classes=${project_home}/src/main/webapp/WEB-INF/classes
lib=${project_home}/src/main/webapp/WEB-INF/lib
web=${project_home}/src/main/webapp
template=${web}/template
encrypt=${web}/encrypt
version_class=com.ailk.mobile.tool.VersionTool
encrypt_class=com.ailk.mobile.tool.FileEncryptTool
version_filter=upload|setup|.gitignore|.DS_Store
is_debug=false
encode=UTF-8
jdk_version=1.6

display-server-maven/build/build.xml

@@ -0,0 +1,121 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--<!DOCTYPE project [<!ENTITY buildfile SYSTEM "file:../../wadelib/build/build_wadelib.xml">]>-->
<!-- $Id: build.xml,v 1.4 2013/10/22 07:49:08 huangbo Exp $ -->
<project name="${project_name}" default="all" basedir=".">
    <!-- 指定参数文件 -->
	<property file="build.properties"/>
	<!-- 设置classpath -->
	<path id="class.path">
	    <pathelement path="${env.CLASSPATH}"/>
	    <pathelement path="${classes}"/>        
	    <fileset dir="${common_lib}">
	        <include name="*.jar"/>
	    </fileset>
	</path>	
	
	<target name="all" depends="clean,copy,compile,encrypt,version,war"/>
	<!-- 清楚classes和encrypt目录 -->
	<target name="clean" description="cleanup the bin directory!">
		<delete includeemptydirs="true" verbose="false" failonerror="false">
		    <!-- 删除目录下的文件和子目录,但不包括本身 -->
			<fileset dir="${classes}" includes="**/*" defaultexcludes="false"/>
			<fileset dir="${encrypt}" includes="**/*" defaultexcludes="false"/>
		</delete>
	</target>
	
	<target name="copy">
	    <!-- 复制配置目录到classes下 -->
		<copy todir="${classes}">
			<fileset dir="${config}">
				<include name="**/**/*"/>
	        </fileset>
	    </copy>
	    <!-- 复制需要下载的配置文件 -->
		<copy todir="${template}" overwrite="true">
			<fileset dir="${config}">
				<include name="server-page.xml"/>
				<include name="server-config.xml"/>
				<include name="server-data.xml"/>
	        </fileset>
	    </copy>
	    <!-- 复制需要下载的lua脚本 -->
	    <copy todir="${template}" overwrite="true">
			<fileset dir="${config}">
				<include name="lua/**/*.lua"/>
	        </fileset>
	    </copy>
	    <!-- 复制公共第三方jar包 -->
		<copy todir="${lib}" overwrite="true">
			<fileset dir="${common_lib}">
				<include name="*.jar"/>
				<exclude name="*.so" />
				<exclude name="*.dll" />
				<exclude name="**/**/*.lua" />
				<exclude name="*servlet-api2.5.jar"/><!-- 引起tomcat的容器报错 -->
			</fileset>
		</copy>
	</target>
	<!-- 编译java生成classes -->
	<target name="compile">
		<mkdir dir="${classes}"/>
		<echo message="begin to compile source without dependency"></echo>
		<javac encoding="${encode}" debug="on" fork="yes" source="${jdk_version}" target="${jdk_version}" 
			memoryInitialSize="128m" memoryMaximumSize="512m" srcdir="${source}" destdir="${classes}">
			<include name="**/*.java"/>
			<classpath refid="class.path"/> 
		</javac>
	</target>
	<target name="war">
		<echo message="begin to ${project_name} war"></echo>
		<!-- 清除临时目录web -->
		<mkdir dir="${build}/web"/>
		<delete includeemptydirs="true">
			<fileset dir="${build}/web" includes="**/*" defaultexcludes="false"/>
		</delete>
		<!-- 搬迁web目录下的所有资源 -->
		<copy overwrite="true" todir="${build}/web/">
			<fileset dir="${web}">
				<exclude name="**/CVS/**/*.*"/>
				<exclude name="**/.svn/**/*.*"/>
				<exclude name="**/.gitignore"/>
				<exclude name="**/*#*.*" />
			</fileset>
		</copy>
		<!-- 将临时目录web下的资源打成war包 -->
		<jar jarfile="${project_home}/${project_name}.war">
			<zipfileset dir="${build}/web/" prefix="">
				<include name="**/**/*"/>
			</zipfileset>
		</jar>
		
		<delete includeemptydirs="true">
			<fileset dir="${build}/web" defaultexcludes="false"/>
		</delete>
	</target>
	<target name="encrypt" description="create encrypt file" depends="compile">
	    <echo message="create encrypt file"></echo>
		<java classname="${encrypt_class}" fork="true">
			<classpath refid="class.path"/>
			<arg value="${encrypt_filter}"/>
			<arg value="${is_debug}"/>
		</java>
		<delete includeemptydirs="true">
			<fileset dir="${template}">
				<include name="server-page.xml"/>
				<include name="server-data.xml"/>
				<include name="server-config.xml"/>
	        </fileset>
		</delete>
	</target>
	
	<target name="version" description="create version file" depends="compile">
	    <echo message="create version file"></echo>
		<java classname="${version_class}" fork="true">
			<classpath refid="class.path"/>
			<arg value="${version_filter}"/>
			<arg value="${is_debug}"/>
		</java>
	</target>
</project>

display-server-maven/pom.xml

@@ -45,9 +45,41 @@
			<scope>system</scope>
			<systemPath>${basedir}/libs/wade-database.jar</systemPath>
		</dependency>
		<dependency>
			<groupId>local</groupId>
			<artifactId>wade-cache</artifactId>
			<version>1.0</version>
			<scope>system</scope>
			<systemPath>${basedir}/libs/wade-cache.jar</systemPath>
		</dependency>
		<dependency>
			<groupId>local</groupId>
			<artifactId>java_memcached-release</artifactId>
			<version>2.5.3</version>
			<scope>system</scope>
			<systemPath>${basedir}/libs/java_memcached-release_2.5.3.jar</systemPath>
		</dependency>
		<dependency>
			<groupId>local</groupId>
			<artifactId>wade-apache</artifactId>
			<version>1.0</version>
			<scope>system</scope>
			<systemPath>${basedir}/libs/wade-apache.jar</systemPath>
		</dependency>
		<!-- 添加第三方jar包 -->
		<!-- https://mvnrepository.com/artifact/jaxen/jaxen -->
		<dependency>
			<groupId>jaxen</groupId>
			<artifactId>jaxen</artifactId>
			<version>1.1.1</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/dom4j/dom4j -->
		<dependency>
			<groupId>dom4j</groupId>
			<artifactId>dom4j</artifactId>
			<version>1.6.1</version>
		</dependency>
		<dependency>
			<groupId>junit</groupId>
			<artifactId>junit</artifactId>
@@ -76,6 +108,19 @@
			<artifactId>commons-codec</artifactId>
			<version>1.3</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/org.beetl/beetl-core -->
		<dependency>
			<groupId>org.beetl</groupId>
			<artifactId>beetl-core</artifactId>
			<version>2.2.3</version>
		</dependency>
		<!-- https://mvnrepository.com/artifact/org.apache.velocity/velocity -->
		<dependency>
			<groupId>org.apache.velocity</groupId>
			<artifactId>velocity</artifactId>
			<version>1.7</version>
		</dependency>
	</dependencies>
@@ -292,12 +337,26 @@
				<version>3.0.0</version>
				<configuration>
					<!-- <packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes> -->
					<packagingExcludes>
						WEB-INF/lib/servlet-api-2.5.jar
					</packagingExcludes>
					<packagingExcludes> WEB-INF/lib/servlet-api-2.5.jar </packagingExcludes>
					<webResources>
						<resource>
							<directory>${basedir}/libs</directory>
							<includes>
								<include>*.jar</include>
							</includes>
							<targetPath>WEB-INF/lib</targetPath>
						</resource>
					</webResources>
				</configuration>
			</plugin>
			<!-- jetty 热部署 -->
			<!-- <plugin> <groupId>org.mortbay.jetty</groupId> <artifactId>maven-jetty-plugin</artifactId> 
				<version>6.1.22</version> <configuration> <scanIntervalSeconds>10</scanIntervalSeconds> 
				<useTestClasspath>true</useTestClasspath> <webAppConfig> <contextPath>/display</contextPath> 
				</webAppConfig> <connectors> <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> 
				<port>8082</port> </connector> </connectors> </configuration> </plugin> -->
		</plugins>
	</build>
</project>

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

@@ -1,10 +1,11 @@
require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
	// 未注册插件
	$("#testUnRegister").tap(function(){
        WadeMobile.testUnRegister("");
    });
	// 普通插件
    $("#openSweetAlert").tap(function(){
    	var param = new Wade.DataMap();
    	param.put("title","加载服务端插件");
@@ -15,9 +16,26 @@ require(["domReady!","wadeMobile","util"], function(doc,WadeMobile) {
        WadeMobile.sweetAlert(param);
    });
    // 插件，包含Activity
    $("#openPathMenu").tap(function(){
    	var param = Wade.DataMap();
    	param.put("composer_close",0x7f020005);
		param.put("composer_music",0x7f020007);
		param.put("composer_place",0x7f020008);
		param.put("composer_sleep",0x7f020009);
		param.put("composer_thought",0x7f02000a);
		param.put("composer_with",0x7f02000b);
	 	WadeMobile.openPathMenu(param);
    });
    
    
    
    $("#openBaiduPlugin").tap(function(){
    	WadeMobile.bd_connect('我是','Xuelong');
    });
    $("#openActivity").tap(function(){
        WadeMobile.openActivityFromPlugin();
    });
    
});

display-server/web/biz/js/plugin/ui/ui-customAlertDialog.js

@@ -8,7 +8,7 @@
    		param.put("countDownInterval",800);
    		param.put("hasNext",true);
    		param.put("nextEvent","nextEvent");
    		WadeMobile.loading(param);
    		WadeMobile.sweetLoading(param);
    	});
    	
    	$("#basic_test").tap(function(){
@@ -17,7 +17,7 @@
    		param.put("alertType",0);
    		param.put("imageID",0);
    		param.put("cancelable",true);
    		WadeMobile.alert(param);
    		WadeMobile.sweetAlert(param);
    	});
    	$("#under_text_test").tap(function(){
    		param.put("title","一行文字标题");
@@ -25,7 +25,7 @@
    		param.put("alertType",0);
    		param.put("imageID",0);
    		param.put("cancelable",true);
    		WadeMobile.alert(param);
    		WadeMobile.sweetAlert(param);
    	});
    	$("#error_text_test").tap(function(){
    		param.put("title","错误！");
@@ -33,7 +33,7 @@
    		param.put("alertType",1);
    		param.put("cancelable",true);
    		param.put("imageID",0);
    		WadeMobile.alert(param);
    		WadeMobile.sweetAlert(param);
    	});
    	$("#success_text_test").tap(function(){
    		param.put("title","成功！");
@@ -41,7 +41,7 @@
    		param.put("alertType",2);
    		param.put("imageID",0);
    		param.put("cancelable",true);
    		WadeMobile.alert(param);
    		WadeMobile.sweetAlert(param);
    	});
    		
    	$("#warning_confirm_test").tap(function(){
@@ -54,7 +54,7 @@
    		param.put("confirmEvent","confirmEvent");
    		param.put("cancelEvent",null);
    		param.put("isCancel",false);
    		WadeMobile.confirm(param);
    		WadeMobile.sweetConfirm(param);
    	});
    	$("#warning_cancel_test").tap(function(){
    		param.put("title","确认？");
@@ -65,7 +65,7 @@
    		param.put("confirmEvent","confirmEvent");
    		param.put("cancelEvent","cancelEvent");
    		param.put("isCancel",true);
    		WadeMobile.confirm(param);
    		WadeMobile.sweetConfirm(param);
    	});
    	$("#custom_img_test").tap(function(){
    		param.put("title","图片");
@@ -73,7 +73,7 @@
    		param.put("cancelable",true);
    		param.put("alertType",4);
    		param.put("imageID",0x7f020002);
    		WadeMobile.alert(param);
    		WadeMobile.sweetAlert(param);
    	});
    	
    });

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

@@ -104,7 +104,7 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
					param.put("alertType",1);
					param.put("cancelable",true);
					param.put("imageID",0);
					WadeMobile.alert(param);
					WadeMobile.sweetAlert(param);
	        	},confirmEvent:function(){
					var param = Wade.DataMap();
	        		param.put("title","确认成功！");
@@ -112,7 +112,7 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
					param.put("alertType",2);
					param.put("cancelable",true);
					param.put("imageID",0);
					WadeMobile.alert(param);
					WadeMobile.sweetAlert(param);
				},nextEvent:function(){
					var param = Wade.DataMap();
	        		param.put("title","加载成功！");
@@ -120,7 +120,7 @@ define(["jcl","base64","res/js/mobile/expand-mobile.js","biz/js/common/biz-mobil
					param.put("alertType",2);
					param.put("cancelable",true);
					param.put("imageID",0);
					WadeMobile.alert(param);
					WadeMobile.sweetAlert(param);
				}
			};
		})();

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

@@ -41,6 +41,14 @@
					</div>
				</div>
			</li>
			<li ontap=";" id="openPathMenu">
				<div class="content">
					<div class="ico">
						<div class="e_ico-position"></div>
						<div class="text">快捷菜单</div>
					</div>
				</div>
			</li>
			<li ontap=";" id="openBaiduPlugin">
				<div class="content">
					<div class="ico">
@@ -51,6 +59,20 @@
			</li>
		</ul>
	</div>
	
	<!-- <div class="c_title">打开插件</div>
	<div class="c_list">
		<ul>
			<li ontap=";" id="openActivity">
				<div class="content">
					<div class="ico">
						<div class="e_ico-conect"></div>
						<div class="text">打开插件</div>
					</div>
				</div>
			</li>
		</ul>
	</div> -->
</div>
</body>

ipu-pathmenu/.classpath

@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<classpathentry kind="src" path="src"/>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<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="output" path="bin/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
	<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 kind="output" path="bin/classes"/>
</classpath>

ipu-pathmenu/project.properties

@@ -11,5 +11,7 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-21
target=android-15
android.library=true
android.library.reference.1=..\\wade-mobile-lib
android.library.reference.2=../wade-mobile-common

wade-mobile-common/.classpath

@@ -2,7 +2,7 @@
<classpath>
	<classpathentry kind="src" path="gen"/>
	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
	<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 exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
	<classpathentry kind="output" path="bin/classes"/>
</classpath>

wade-mobile-common/project.properties

@@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
# Project target.
target=android-21
target=android-15
android.library=true