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

display-client/project.properties

# Project target.
target=android-15
android.library.reference.1=../../../git/android-share/wade-mobile-lib
android.library.reference.2=../../../git/android/wade-mobile-com
android.library.reference.1=../wade-mobile-common
android.library.reference.2=../wade-mobile-lib
proguard.config=proguard-project.txt

display-server/etc/lua/tag/WmDialog.lua

local Tag = require("engine.Tag")
local WmDialog = Class(Tag)
function WmDialog:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmDialog:doStartTag(attr)
	if not (attr.id and attr.title) then
		monitor:error("WmDialog组件 id、title属性不能为空 ")
	self.htmlbuff:append('')
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmDialog"],function(WmDialog) {')
	self.htmlbuff:append('require(["wmDialog","wmWebUI"],function(WmDialog,WmWebUI) {')
	self.htmlbuff:append('var dialog_'..attr.id..' = new WmDialog("'..attr.id..'");')
	if attr.contentId then
		self.htmlbuff:append(' dialog_'..attr.id..'.setContent("'..attr.contentId..'","html");')

display-server/etc/lua/tag/WmNavBar.lua

local Class = require("util.Class")
local Tag = require("engine.Tag")
local WmNavBar = Class(Tag)
--[[
function WmNavBar:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
  monitor:debug("------------------------")
 -- monitor:debug("htmlbuff length:"..#self.htmlbuff)
  self.bottoms = {}
end
--]]
function WmNavBar:doStartTag(attr)
	self.id = attr.id
	self.bottoms = {}

display-server/etc/lua/tag/WmNavBarItem.lua

local Tag = require("engine.Tag")
local WmNavBarItem = Class(Tag)
function WmNavBarItem:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmNavBarItem:doStartTag(attr)
	if attr.type == "back" then
		self.htmlbuff:append('<div class="left"><div class="back"><span class="e_ico-back"></span>')

display-server/etc/lua/tag/WmProgress.lua

local Tag = require("engine.Tag")
local WmProgress = Class(Tag)
function WmProgress:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmProgress:doStartTag(attr)
	if not (attr.id and attr.progress) then

display-server/etc/lua/tag/WmSegment.lua

local Tag = require("engine.Tag")
local WmSegment = Class(Tag)
function WmSegment:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmSegment:doStartTag(attr)
	local texts = self.Split(attr.texts, ",")
	local values = self.Split(attr.values, ",")
	self.htmlbuff:append('<input type="hidden" id="'..attr.name..'" name="'..attr.name..'" value="" />')
	
	
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmSegment"],function(WmSegment) {')
	self.htmlbuff:append('var segment_'..attr.id..' = new WmSegment("'..attr.id..'","'..attr.name..'",false);')
	self.htmlbuff:append('<script type="text/javascript">\n')
	self.htmlbuff:append('require(["wmSegment"],function(WmSegment) {\n')
	self.htmlbuff:append('var segment_'..attr.id..' = new WmSegment("'..attr.id..'","'..attr.name..'",false);\n')
	if attr.selected then
		self.htmlbuff:append('segment_'..attr.id..'.activeItem("'..attr.selected..'");')
		self.htmlbuff:append('segment_'..attr.id..'.activeItem("'..attr.selected..'");\n')
	else
		self.htmlbuff:append('segment_'..attr.id..'.activeItemIndex(0);')
		self.htmlbuff:append('segment_'..attr.id..'.activeItemIndex(0);\n')
	end 
	if attr.action then
		self.htmlbuff:append('segment_'..attr.id..'.setAction(function(){ return '..attr.action..'.apply(window,arguments);})')
		self.htmlbuff:append('segment_'..attr.id..'.setAction(function(){ return '..attr.action..'.apply(window,arguments);})\n')
	else
		self.htmlbuff:append('segment_'..attr.id..'.setAction()')
		self.htmlbuff:append('segment_'..attr.id..'.setAction();\n')
	end 
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",segment_'..attr.id..');')
	self.htmlbuff:append('})')
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",segment_'..attr.id..');\n')
	self.htmlbuff:append('})\n')
	self.htmlbuff:append('</script>')
end

display-server/etc/lua/tag/WmToolTip.lua

local Tag = require("engine.Tag")
local WmToolTip = Class(Tag)
function WmToolTip:createNew(obj,htmlbuff)
  self.htmlbuff=htmlbuff
end
function WmToolTip:doStartTag(attr)
	self.id = attr.id
	local align = ""
	end
	self.htmlbuff:append('</div></div>')
	self.htmlbuff:append('<script type="text/javascript">')
	self.htmlbuff:append('require(["wmToolTip"],function(WmToolTip) {')
	self.htmlbuff:append('require(["wmToolTip","wmWebUI"],function(WmToolTip,WmWebUI) {')
	self.htmlbuff:append('var tooltip_'..self.id..' = new WmToolTip("'..self.id..'");')
	if attr.action then
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction(function(){ return '..attr.action..'.apply(window,arguments);});')

display-server/web/biz/js/tag/WmDropmenu.js

	$("#setLabel").on("tap",function(){
		var dropmenu=WmWebUI.select("dropmenu01");
		var str=prompt("请输入菜单名。示例：我的活动");
		if(str == ""){
			str = "默认名称";
		if(str == null || str == ""){
			//don't do anything
			return;
		}
		dropmenu.setLabel(str);
	});
		items[0].html(str);
		alert("添加成功");
	});
	new IScroll("#content",{tap:true,scrollbars: true});
	new IScroll("#content",{tap:true,scrollbars: true,useTransform:false});
});

display-server/web/res/js/ui/wm-dropmenu.js

/* Attention: 
 * if use "iscroll5" component for 'wm-dropmenu'-element's ancestor,
 * pleas don't set transform property，transform property will make "position-fixed" like "position-absolute";
 * example:
 * 		new IScroll("#content",{tap:true,scrollbars: true,useTransform:false});  
 */
define(["jcl","iScroll","wmWebUI"],function($,iScrol,WmWebUI){
	function DropmenuItem(obj,parent){
		this.entity=obj;

display-server/web/res/js/ui/wm-segment.js

	WmSegment.prototype.bindAction = function(ele){
		var action = this.action;
		var hiddenId = this.hiddenId;
		var tapEvent = function(e){
			var ele = e.target;
		var tapEvent = function(ele){
			var re;
			if(typeof action =="function"){
				re = action($(ele).attr("segValue"),$(ele).text());
			}
		};
		if(ele){
			$(ele).tap(tapEvent);
			$(ele).tap(tapEvent,ele);
		}else{
			$(this.segment.find('span.e_segmentLi')).tap(tapEvent);
			this.segment.find('span.e_segmentLi').each(function(index,el){
				$(el).tap(tapEvent,el);
			});
		}
	};

display-server/web/res/js/ui/wm-webui.js

	/* 根据标签id查询标签对象 */
	wmWebUI.select = function(id) {
		var tag = $("#" + id);
		if (tag.length == 0 && wmWebUI.tags[id])
		if (tag.length > 0 && wmWebUI.tags[id])
			return wmWebUI.tags[id];
	}

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

<html class="s_bs">
<head>
	<meta charset="utf-8" />
	<meta name="viewport" content="target-densitydpi=device-dpi, width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
	<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1" />
	<title>web UI 组件</title>
	{%>template/common/head.html%}
</head>