Merge branch 'master' of

http://114.215.100.48:3000/ipu/android-share.git

Conflicts:
	wade-mobile-ui/libs/wade-mobile.jar
	最新wade-mobile.jar

display-server/web/biz/css/project.css

@@ -25,6 +25,13 @@
.e_ico-ui-slide:before      { content:"\e613";}
.e_ico-ui-tab:before        { content:"\e614";}
.e_ico-ui-tip:before        { content:"\e615";}
.e_ico-video:before        	{ content:"\e620";}/*视频*/
.e_ico-database:before      { content:"\e621";}/*数据库*/
.e_ico-upload:before        { content:"\e622";}/*上传*/
.e_ico-push:before        	{ content:"\e623";}/*推送*/
.e_ico-mail-list:before     { content:"\e624";}/*通讯录*/
.e_ico-nfc:before        	{ content:"\e625";}/*nfc*/
.e_ico-ui-button,
.e_ico-ui-form,
.e_ico-ui-icon,
@@ -49,7 +56,13 @@
.e_ico-qr,
.e_ico-device,
.e_ico-about,
.e_ico-wade-ob { font-family:"project";}
.e_ico-wade-ob,
.e_ico-video,
.e_ico-database,
.e_ico-upload,
.e_ico-push,
.e_ico-mail-list,
.e_ico-nfc { font-family:"project";}
.m_nav .e_ico-conect { color:#8fc320;}
.m_nav .e_ico-net { color:#c37c20;}
.m_nav .e_ico-position { color:#c33f20;}
@@ -72,8 +85,12 @@
.m_nav .e_ico-code { color:#8fc320;}
.m_nav .e_ico-chat { color:#c37c20;}
.m_nav .e_ico-scene { color:#c33f20;}
.m_nav .e_ico-video { color:#48427B;}
.m_nav .e_ico-database { color:#6B8FC9;}
.m_nav .e_ico-upload { color:#EC3F00;}
.m_nav .e_ico-push { color:#95C731;}
.m_nav .e_ico-mail-list { color:#5B5B03;}
.m_nav .e_ico-nfc { color:#3F94A9;}
.m_welcome { background:#333; width:100%; height:100%; color:#fff; overflow:hidden;}
.m_welcome .slogan { font-family:"project"; text-align:center; margin-top:1.2rem;}

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

@@ -36,27 +36,27 @@
		<div class="text">音频</div>
	</li>
	<li action="Video">
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="pic"><span class="e_ico-video"></span></div>
		<div class="text">视频</div>
	</li>
	<li action="Database">
		<div class="pic"><span class="e_ico-conect"></span></div>
		<div class="pic"><span class="e_ico-database"></span></div>
		<div class="text">数据库</div>
	</li>
	<li action="UploadDownload">
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="pic"><span class="e_ico-upload"></span></div>
		<div class="text">上传下载</div>
	</li>
	<li action="YunbaPush">
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="pic"><span class="e_ico-push"></span></div>
		<div class="text">云巴推送</div>
	</li>
	<li action="Contacts">
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="pic"><span class="e_ico-mail-list"></span></div>
		<div class="text">通讯录</div>
	</li>
	<li action="NFC">
		<div class="pic"><span class="e_ico-storage"></span></div>
		<div class="pic"><span class="e_ico-nfc"></span></div>
		<div class="text">NFC</div>
	</li>
</ul>