aa

display-client/.gitignore

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

display-server/bin/.gitignore

@@ -1,10 +1,2 @@
/com/
/database.xml
/log4j.properties
/lua/
/memcache.properties
/private_key
/server-config.xml
/server-data-result.txt
/server-data.xml
/server-page.xml
/org/

display-server/web/.gitignore

@@ -1,2 +1,3 @@
/encrypt
/res.version.properties
/.classpath

display-server/web/template/lua/tag/.gitignore

@@ -0,0 +1,16 @@
/WmDialog.lua
/WmDropmenu.lua
/WmDropmenuItem.lua
/WmNavBar.lua
/WmNavBarItem.lua
/WmProgress.lua
/WmSegment.lua
/WmSlider.lua
/WmSliderItem.lua
/WmSwitch.lua
/WmTab.lua
/WmTabbar.lua
/WmTabbarItem.lua
/WmTabItem.lua
/WmTest.lua
/WmToolTip.lua

display-server/web/template/lua/tag/WmDialog.lua

@@ -2,6 +2,10 @@ local Class = require("util.Class")
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属性不能为空 ")
@@ -34,7 +38,7 @@ function WmDialog:doEndTag()
	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/web/template/lua/tag/WmNavBar.lua

@@ -1,14 +1,14 @@
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/web/template/lua/tag/WmNavBarItem.lua

@@ -2,6 +2,10 @@ local Class = require("util.Class")
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/web/template/lua/tag/WmProgress.lua

@@ -2,6 +2,10 @@ local Class = require("util.Class")
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/web/template/lua/tag/WmSegment.lua

@@ -2,6 +2,10 @@ local Class = require("util.Class")
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, ",")
@@ -13,21 +17,21 @@ function WmSegment:doStartTag(attr)
	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/web/template/lua/tag/WmToolTip.lua

@@ -2,6 +2,11 @@ local Class = require("util.Class")
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 = ""
@@ -28,7 +33,7 @@ function WmToolTip:doStartTag(attr)
	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);});')