/tr> 70
				self.htmlbuff:append('<li>'..items[i]..'</li>')
71
			end
72
		end 
73
		self.htmlbuff:append('</ul></div></div></div>')
74
	end
75
	
76
	self.parent:addBottom(attr)
77
	
78
end
79

80
function WmNavBarItem:doEndTag()
81

82
end
83

84
return WmNavBarItem

+ 0 - 55
display-server/web/template/lua/tag/WmProgress.lua

@ -1,55 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmProgress = Class(Tag)
4

5
function WmProgress:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9
function WmProgress:doStartTag(attr)
10

11
	if not (attr.id and attr.progress) then
12
		monitor:error("WmProgress组件 id、progress属性不能为空 ")
13
		return nil
14
	end
15
		
16
	self.htmlbuff:append('<div class="e_progress" id="'..attr.id..'">')
17
	if attr.pastTip then
18
		self.htmlbuff:append([[
19
			<div class="e_progressUse">
20
				<div class="e_progressUseValue"></div>
21
				<div class="e_progressUseTip">]]..attr.pastTip..[[</div>
22
			</div>
23
		]])
24
	end
25
	self.htmlbuff:append('<div class="e_progressBar"><span></span></div>')
26
	if attr.totalTip then
27
		self.htmlbuff:append('<div class="e_progressTotal">'..attr.totalTip..'</div>')
28
	end
29
	if attr.spaceTip then
30
		self.htmlbuff:append([[
31
			<div class="e_progressSurplus">
32
				<div class="e_progressSurplusTip">]]..attr.spaceTip..[[</div>
33
				<div class="e_progressSurplusValue"></div>
34
			</div>
35
		]])
36
	end
37
	self.htmlbuff:append('</div>\n')
38

39
	self.htmlbuff:append('<script type="text/javascript">')
40
	self.htmlbuff:append('require(["wmProgress"],function(WmProgress) {')
41
	self.htmlbuff:append('var progress_'..attr.id..' = new WmProgress("'..attr.id..'");')
42
	self.htmlbuff:append('progress_'..attr.id..'.setProgress("'..attr.progress..'");')
43
	if attr.level then
44
		self.htmlbuff:append('progress_'..attr.id..'.setLevel("'..attr.level..'");')
45
	end
46
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",progress_'..attr.id..');')
47
	self.htmlbuff:append('})')
48
	self.htmlbuff:append('</script>')
49
end
50

51
function WmProgress:doEndTag()
52

53
end
54

55
return WmProgress

+ 0 - 65
display-server/web/template/lua/tag/WmRefresh.lua

@ -1,65 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmRefresh = Class(Tag)
4

5
function WmRefresh:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9
function WmRefresh:doStartTag(attr)
10
	if not (attr.id) then
11
		monitor:error("WmRefresh组件 id属性不能为空 ")
12
		return nil
13
	end
14
	
15
	self.attr = attr
16
	self.htmlbuff:append('<div class="c-refresh-container" id="'..attr.id..'">')
17
	self.htmlbuff:append('<div id="c-refresh-wrapper" style="height:200px;">')
18
	self.htmlbuff:append('<div id="c-refresh-scroller">')
19
	self.htmlbuff:append('<div id="pullDown">')
20
	self.htmlbuff:append('<span class="pullDownIcon"></span><span class="pullDownLabel">下拉刷新...</span>')
21
	self.htmlbuff:append('</div>')
22
	self.htmlbuff:append('<div class="c_list">')
23
	--this is the content area
24
	
25
	
26
end
27

28
function WmRefresh:doEndTag()
29
	local attr = self.attr
30
	
31
	self.htmlbuff:append('</div>')
32
	
33
	self.htmlbuff:append('<div id="pullUp">')
34
	self.htmlbuff:append('<span class="pullUpIcon"></span><span class="pullUpLabel">上拉加载更多...</span>')
35
	self.htmlbuff:append('</div> </div> </div> </div>')
36
	
37
	self.htmlbuff:append('<script type="text/javascript">')
38
	self.htmlbuff:append('require([ "wmRefresh","wmWebUI" ], function(WmRefresh,WmWebUI) {')
39
	self.htmlbuff:append('var refresh_'..attr.id..' = new WmRefresh("'..attr.id..'");')
40
	
41
	if attr.pullDownAction then
42
		self.htmlbuff:append('refresh_'..attr.id..'.setPullDownAction('..attr.pullDownAction..');')
43
	end
44
	
45
	if attr.pullUpAction then
46
		self.htmlbuff:append('refresh_'..attr.id..'.setPullUpAction('..attr.pullUpAction..');')
47
	end
48
	
49
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",refresh_'..attr.id..');')
50
	self.htmlbuff:append('})')
51
	self.htmlbuff:append('</script>')
52
end
53

54
function string.split(str, delimiter)	
55
	if str==nil or str=='' or delimiter==nil then		
56
		return nil	
57
	end	    
58
	local result = {}    
59
	for match in (str..delimiter):gmatch("(.-)"..delimiter) do        
60
		table.insert(result, match)    
61
	end    
62
	return result
63
end
64

65
return WmRefresh

+ 0 - 59
display-server/web/template/lua/tag/WmSegment.lua

@ -1,59 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmSegment = Class(Tag)
4

5
function WmSegment:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9
function WmSegment:doStartTag(attr)
10
	local texts = self.Split(attr.texts, ",")
11
	local values = self.Split(attr.values, ",")
12
	self.htmlbuff:append('<span class="e_segment" id="'..attr.id..'"><span class="e_segmentWrapper">')
13
	for i=1,#texts do
14
		self.htmlbuff:append('<span class="e_segmentLi" segValue="'..values[i]..'">'..texts[i]..'</span>')
15
	end 
16
	self.htmlbuff:append('</span></span>\n')
17
	self.htmlbuff:append('<input type="hidden" id="'..attr.name..'" name="'..attr.name..'" value="" />')
18
	
19
	
20
	self.htmlbuff:append('<script type="text/javascript">\n')
21
	self.htmlbuff:append('require(["wmSegment"],function(WmSegment) {\n')
22
	self.htmlbuff:append('var segment_'..attr.id..' = new WmSegment("'..attr.id..'","'..attr.name..'",false);\n')
23
	if attr.selected then
24
		self.htmlbuff:append('segment_'..attr.id..'.activeItem("'..attr.selected..'");\n')
25
	else
26
		self.htmlbuff:append('segment_'..attr.id..'.activeItemIndex(0);\n')
27
	end 
28
	if attr.action then
29
		self.htmlbuff:append('segment_'..attr.id..'.setAction(function(){ return '..attr.action..'.apply(window,arguments);})\n')
30
	else
31
		self.htmlbuff:append('segment_'..attr.id..'.setAction();\n')
32
	end 
33
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",segment_'..attr.id..');\n')
34
	self.htmlbuff:append('})\n')
35
	self.htmlbuff:append('</script>')
36
end
37

38
function WmSegment:doEndTag()
39

40
end
41

42
function WmSegment.Split(szFullString, szSeparator)
43
	local nFindStartIndex = 1
44
	local nSplitIndex = 1
45
	local nSplitArray = {}
46
	while true do
47
		local nFindLastIndex = string.find(szFullString, szSeparator, nFindStartIndex)
48
		if not nFindLastIndex then
49
			nSplitArray[nSplitIndex] = string.sub(szFullString, nFindStartIndex, string.len(szFullString))
50
			break
51
		end
52
		nSplitArray[nSplitIndex] = string.sub(szFullString, nFindStartIndex, nFindLastIndex - 1)
53
		nFindStartIndex = nFindLastIndex + string.len(szSeparator)
54
		nSplitIndex = nSplitIndex + 1
55
	end
56
	return nSplitArray
57
end
58

59
return WmSegment

+ 0 - 107
display-server/web/template/lua/tag/WmSlider.lua

@ -1,107 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmSlider = Class(Tag)
4

5
--htmlbuff
6
function WmSlider:createNew(obj,htmlbuff)
7
  self.htmlbuff=htmlbuff
8
  self.bottoms = {}
9
end
10

11
--attr所有属性
12
function WmSlider:doStartTag(attr)
13
  self.attr=attr
14
  self.htmlbuff:append([[
15
<div class="c_slide c_slide-col-4 l_mt" id="]])
16
  self.htmlbuff:append(attr.id)
17
  self.htmlbuff:append([[">
18
    <div class="frame">
19
      <div class="wrapper">
20
        <ul>]])
21
end
22

23
function WmSlider:doEndTag()
24
  self.htmlbuff:append([[
25
        </ul>
26
      </div>
27
    </div>
28
    <div class="page">
29
    ]])
30
  for k,v in pairs(self.bottoms) do
31
    if k==1 then
32
      self.htmlbuff:append([[
33
      <div class="on"></div>
34
      ]]);
35
    else
36
      self.htmlbuff:append([[
37
      <div></div>
38
      ]]);
39
    end
40
  end
41
  self.htmlbuff:append([[
42
    </div>
43
    </div>
44
  ]])
45
  
46
  
47
  self.htmlbuff:append([[
48
  <script>   
49
    require(["wmSlider","util"],function(WmSlider) {
50
        var wmSlider=new WmSlider("]])
51
  self.htmlbuff:append(self.attr.id);
52
  self.htmlbuff:append([[");
53
        wmSlider.create();]])
54
  if self.attr.duration then
55
    self.htmlbuff:append([[    
56
        wmSlider.setDuration(]])
57
    self.htmlbuff:append(self.attr.duration)
58
    self.htmlbuff:append([[);
59
        wmSlider.play();
60
    ]])
61
  end;
62
  self.htmlbuff:append([[
63
    WmWebUI.store("]])
64
  self.htmlbuff:append(self.attr.id)
65
  self.htmlbuff:append([[",wmSlider);
66
 });
67
    </script>
68
  ]])
69
end
70

71
--[[
72
require(["wmSlider","util"],function(WmSlider) {
73
  var wmSlider=new WmSlider("TestSlider01");
74
  wmSlider.create();
75
  $("#prev").click(function(){
76
    wmSlider.prev();
77
  });
78
  $("#next").click(function(){
79
    wmSlider.next();
80
  });
81
  $("#goFrame").click(function(){
82
    wmSlider.active($("#goFrame").val());
83
  });
84
  wmSlider.setDuration(2000);
85
  wmSlider.play();
86
  var items=wmSlider.getItems();
87
  items[0].setAlt('ABC');
88
  for(var i=0;i<items.length;i++){
89
    console.log(items[i].getUrl());
90
    console.log(items[i].getAlt());
91
    var j=i;
92
    var f=function(){
93
      console.log("index:"+arguments.callee.i); 
94
    };
95
    f.i=i;
96
    items[i].setAction(f);
97
  }
98
  console.log(items[0].setUrl('ABC'))
99
  console.log(items[0].getUrl());
100
});
101
]]
102

103
function WmSlider:addBottom(bottom)
104
  table.insert(self.bottoms, bottom)
105
end
106

107
return WmSlider

+ 0 - 22
display-server/web/template/lua/tag/WmSliderItem.lua

@ -1,22 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmSliderItem = Class(Tag)
4

5
function WmSliderItem:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9
function WmSliderItem:doStartTag(attr)
10
  self.htmlbuff:append([[
11
    <li><img src="]])
12
  self.htmlbuff:append(attr.url)
13
  self.htmlbuff:append([[" alt="]])
14
  self.htmlbuff:append(attr.alt)
15
  self.htmlbuff:append([["></li> ]]);
16
  self.parent:addBottom(attr)
17
end
18

19
function WmSliderItem:doEndTag()
20
end
21

22
return WmSliderItem

+ 0 - 103
display-server/web/template/lua/tag/WmSwitch.lua

@ -1,103 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmSwitch = Class(Tag)
4

5
--htmlbuff
6
function WmSwitch:createNew(obj,htmlbuff)
7
  self.htmlbuff = htmlbuff
8
end
9

10
local function split(s, delim)
11
    if type(delim) ~= "string" or string.len(delim) <= 0 then
12
        return
13
    end
14

15
    local start = 1
16
    local t = {}
17
    while true do
18
    local pos = string.find (s, delim, start, true) -- plain find
19
        if not pos then
20
          break
21
        end
22

23
        table.insert (t, string.sub (s, start, pos - 1))
24
        start = pos + string.len (delim)
25
    end
26
    table.insert (t, string.sub (s, start))
27

28
    return t
29
end
30

31
--attr 所有属性
32
function WmSwitch:doStartTag(attr)
33
  --属性初始化
34
  attr.value = attr.value or "true"
35
  attr.label = attr.label or "on|off"
36
  local stateStyle = ""
37
  if attr.value=="false" then
38
    stateStyle="transform:translateX(-100%)"
39
  end
40
  self.htmlbuff:append([[
41
    <div class="value">
42
        <span class="e_switch e_switch-on" id="]])
43
  self.htmlbuff:append(attr.id)
44
  self.htmlbuff:append('">','\n')
45
  
46
  local labelTable=split(attr.label,"|")
47
  self.htmlbuff:append('<span class="e_switchOn">')
48
  self.htmlbuff:append(labelTable[1])
49
  self.htmlbuff:append('</span>','\n')
50
  
51
  self.htmlbuff:append('<span class="e_switchOff">')
52
  self.htmlbuff:append(labelTable[2])
53
  self.htmlbuff:append('</span>','\n')
54
  
55
  self.htmlbuff:append('<span class="e_switchBar" style="')
56
  self.htmlbuff:append(stateStyle)
57
  self.htmlbuff:append('"></span>','\n')
58
  
59
  self.htmlbuff:append('<input type="hidden" value="')
60
  self.htmlbuff:append(attr.value)
61
  self.htmlbuff:append([["/>
62
        </span>
63
     </div>
64
  ]]);
65
  
66
  self.htmlbuff:append([[
67
  <script>
68
  require(["wmSwitch"],function(WmSwitch) {
69
  	var wmSwitch = new WmSwitch("]])
70
  self.htmlbuff:append(attr.id)
71
  self.htmlbuff:append('");','\n')
72
  self.htmlbuff:append('wmSwitch.create();','\n');
73

74
  if attr.onAction then
75
	self.htmlbuff:append('	wmSwitch.setOnAction(function(){','\n')
76
	self.htmlbuff:append(attr.onAction,'\n')
77
	self.htmlbuff:append('});','\n');
78
  end
79
  if attr.offAction then
80
   	self.htmlbuff:append('	wmSwitch.setOffAction(function(){','\n')
81
	self.htmlbuff:append(attr.offAction,'\n')
82
	self.htmlbuff:append('});','\n');
83
  end
84
  if attr.changeAction then
85
   	self.htmlbuff:append('	wmSwitch.setChangeAction(function(){','\n')
86
	self.htmlbuff:append(attr.changeAction,'\n')
87
	self.htmlbuff:append('});','\n');
88
  end
89
  if attr.disabled then
90
   	self.htmlbuff:append('	wmSwitch.setDisabled(')
91
	self.htmlbuff:append(attr.disabled)
92
	self.htmlbuff:append(');','\n');
93
  end
94
  self.htmlbuff:append([[
95
  });
96
  </script>
97
  ]])
98
end
99

100
function WmSwitch:doEndTag()
101

102
end
103
return WmSwitch

+ 0 - 66
display-server/web/template/lua/tag/WmTab.lua

@ -1,66 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmTab = Class(Tag)
4

5
function WmTab:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
  self.childrenAttr = {}
8
  self.index = 0; 
9
end
10

11
function WmTab:doStartTag(attr)
12
  if attr.id then
13
    self.id = attr.id
14
  else
15
    self.id = "tab"..os.time()
16
  end
17
  self.htmlbuff:append('<div id="',self.id,'" class="c_tab">','\n')
18
  self.htmlbuff:append('<div class="title"><ul>','\n')
19
  self.pos = self.htmlbuff:currPos()
20
  self.startPos = self.htmlbuff:length()+1
21
  self.htmlbuff:append([[
22
    </ul>
23
    </div>
24
    <div class="pages">
25
  ]])
26
end
27

28
function WmTab:doEndTag()
29
  self.htmlbuff:append([[
30
    </div>
31
    </div>
32
    <script type="text/javascript">
33
    require(["wmTab","wmWebUI"],function(WmTab,WmWebUI) {
34
  ]])
35
  self.htmlbuff:append('	var wmTab = new WmTab("',self.id,'");','\n')
36
  local StringBuilder = require("util.StringBuilder")
37
  self.htmlbuff:append('	wmTab.create();','\n')
38
  
39
  local buff = StringBuilder:new()
40
  for key, value in ipairs(self.childrenAttr) do
41
    if value.active=="true" then
42
      buff:append('<li class="on">',value.title,'</li>','\n')
43
      self.htmlbuff:append('wmTab.active(',value._index,');','\n');
44
    else
45
      buff:append('<li>',value.title,'</li>','\n')
46
    end
47
    
48
    if value.action then
49
      self.htmlbuff:append('wmTab.addListener(',value._index,',function(){',value.action,';});','\n');
50
    end
51
  end
52

53
  self.htmlbuff:append([[
54
  	});
55
  </script>
56
  ]])
57
  self.htmlbuff:insertTo(self.pos,buff:toString())
58
end
59

60
function WmTab:addChildrenAttr(childrenAttr)
61
  childrenAttr._index = self.index
62
  self.index = self.index + 1
63
  table.insert(self.childrenAttr, childrenAttr)
64
end
65

66
return WmTab

+ 0 - 18
display-server/web/template/lua/tag/WmTabItem.lua

@ -1,18 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmTabItem = Class(Tag)
4

5
function WmTabItem:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9
function WmTabItem:doStartTag(attr)
10
  self.htmlbuff:append('<div class="page">')
11
  self.parent:addChildrenAttr(attr)
12
end
13

14
function WmTabItem:doEndTag()
15
  self.htmlbuff:append('</div>')
16
end
17

18
return WmTabItem

+ 0 - 84
display-server/web/template/lua/tag/WmTabbar.lua

@ -1,84 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmTabbar = Class(Tag)
4

5
function WmTabbar:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
  self.childrenAttr = {}
8
  self.index = 0; 
9
end
10

11
function WmTabbar:doStartTag(attr)
12
  if attr.id then
13
    self.id = attr.id
14
  else
15
    self.id = "tabbar"..os.time()
16
  end
17
  if attr.active then
18
    self.active = tonumber(attr.active)
19
  end
20

21
  self.htmlbuff:append('<div id="',self.id,'">','\n')
22
  self.htmlbuff:append([[
23
  <div class="m_nav">
24
  <div class="wrapper">
25
  ]])
26
end
27

28
function WmTabbar:doEndTag()
29
  self.htmlbuff:append([[
30
  </div>
31
  </div>
32
  <div class="m_footer">
33
  <ul>
34
  ]])
35
  for key, value in ipairs(self.childrenAttr) do
36
    if value.active=="true" then
37
      self.htmlbuff:append('<li class="on"','\n')
38
    else
39
      self.htmlbuff:append('<li','\n')
40
    end
41
    if value.id then
42
      self.htmlbuff:append(' id="',value.id,'">','\n')
43
    else
44
      self.htmlbuff:append('>','\n')
45
    end
46
    
47
    self.htmlbuff:append('<span class="',value.icon,'"></span>','\n')
48
    self.htmlbuff:append('<div class="text">',value.label,'</div>','\n')
49
    self.htmlbuff:append('</li>','\n')
50
  end
51
  self.htmlbuff:append([[
52
  </ul>
53
  </div>
54
  </div>
55
  ]])
56
  
57
  self.htmlbuff:append([[
58
  <script type="text/javascript">
59
    require(["wmTabbar"],function(WmTabbar) {
60
  ]])
61
  self.htmlbuff:append('  var wmTabbar = new WmTabbar("',self.id,'");','\n')
62
  self.htmlbuff:append('  wmTabbar.create();','\n')
63
  for key, value in ipairs(self.childrenAttr) do
64
    if value.action then
65
      self.htmlbuff:append('wmTabbar.getTabbarItem(',value._index,').setAction(function(){',value.action,';});','\n');
66
    end
67
  end
68
  self.htmlbuff:append([[
69
  });
70
   </script>
71
  ]])
72
end
73

74
function WmTabbar:addBottom(bottom)
75
  table.insert(self.bottoms, bottom)
76
end
77

78
function WmTabbar:addChildrenAttr(childrenAttr)
79
  childrenAttr._index = self.index
80
  self.index = self.index + 1
81
  table.insert(self.childrenAttr, childrenAttr)
82
end
83

84
return WmTabbar

+ 0 - 18
display-server/web/template/lua/tag/WmTabbarItem.lua

@ -1,18 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmTabbarItem = Class(Tag)
4

5
function WmTabbarItem:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9
function WmTabbarItem:doStartTag(attr)
10
  self.htmlbuff:append('<div class="nav">')
11
  self.parent:addChildrenAttr(attr) --子节点属性传递给父节点
12
end
13

14
function WmTabbarItem:doEndTag()
15
  self.htmlbuff:append('</div>')
16
end
17

18
return WmTabbarItem

+ 0 - 59
display-server/web/template/lua/tag/WmTest.lua

@ -1,59 +0,0 @@
1
monitor:debug("------------------------")
2
monitor:debug(tostring("10"+1))
3
monitor:debug(10 ..1)
4
monitor:debug(tostring(#"123456"));-- # 长度操作符
5

6
a={};--所有未初始化的元素的索引都是nil,Lua将nil作为界定数组结尾的标志
7
a["x"] = 123;
8
a[0] = 343;
9
a.y = "yyyy";
10
monitor:debug(tostring(a["x"]))
11
monitor:debug(tostring(a.y))
12
monitor:debug(tostring(a[0]))
13
monitor:debug(tostring(#a))--#用于返回一个数组和线性表的最后一个索引值(key值,不是value值,只考虑索引值为数字格式的值)
14
for i=1,10 do
15
	a[i]=tostring(i*2)
16
	monitor:debug(a[i])
17
end--Lua将全局变量存储在table中
18
monitor:debug(tostring(a[#a]))--打印最后一项值
19
a[#a] = nil --删除最后一个值
20
a[#a+1] = "hahha"--添加到列表末尾
21
monitor:debug(tostring(#a))--
22
monitor:debug(tostring(#a))
23
monitor:debug(tostring(#a))
24
a[100] = "aad"
25
monitor:debug(tostring(table.maxn(a)))--包含“空隙”的数组的最大索引数
26

27
--比较运算符 == ~=(不等于) < > >= <= 不同的类型必定不相等(区分JS)对于table userdata和函数是比较引用是否相等
28
--只能对两个数字或两个字符串进行比较,字符串以字符次序比较 2<15 true  "2"<"15" false
29
--and or not  not只返回true或false
30
monitor:debug(tostring(4 and 5))
31
monitor:debug(tostring(nil and 13))
32
monitor:debug(tostring(false and 13))
33
monitor:debug(tostring(4 or 5))
34
monitor:debug(tostring(false or 5))
35
--短路求值
36
x = x or "eee";
37
monitor:debug(x)
38

39
if type(a)=="table" and a[100] =="aad" then
40
	monitor:debug("----lalalalal---")
41
end
42
h = 5
43
i = 7
44
max = h > i and h or i 
45
monitor:debug(tostring(max))
46
monitor:debug("------------------------")
47
local Class = require("util.Class")
48
local Tag = require("engine.Tag")
49
local WmTest = Class(Tag)
50

51
function WmTest:doStartTag(attr)
52
  return "123456789"
53
end
54

55
function WmTest:doEndTag()
56
  return "987654321"
57
end
58

59
return WmTest

+ 0 - 54
display-server/web/template/lua/tag/WmToolTip.lua

@ -1,54 +0,0 @@
1
local Class = require("util.Class")
2
local Tag = require("engine.Tag")
3
local WmToolTip = Class(Tag)
4

5
function WmToolTip:createNew(obj,htmlbuff)
6
  self.htmlbuff=htmlbuff
7
end
8

9

10
function WmToolTip:doStartTag(attr)
11
	self.id = attr.id
12
	local align = ""
13
	if attr.align=="right" then
14
		align = "c_toolTip-arrowRight"
15
	elseif attr.align=="left" then
16
		align = "c_toolTip-arrowLeft"
17
	end
18
	local position = ""
19
	if attr.position=="up" then
20
		position = "c_toolTip-positionBottom"
21
	end
22
	self.htmlbuff:append('<div class="c_toolTip '..align..' '..position..'" id="'.. self.id ..'" >')
23
	self.htmlbuff:append('<div class="pointer"></div>')
24
	self.htmlbuff:append('<div class="content" >')
25
	self.htmlbuff:append('<div class="ico"><span class="e_ico-swipe"></span></div>')
26
	local textAlign = ""
27
	if attr.textAlign == "center" then
28
		textAlign = "e_center"
29
	end
30
	self.htmlbuff:append('<div class="detail '..textAlign..'">'..attr.text..'</div>')
31
	if attr.buttonText then
32
		self.htmlbuff:append('<div class="submit"><span class="e_button">'..attr.buttonText..'</span></div>')
33
	end
34
	self.htmlbuff:append('</div></div>')
35
	self.htmlbuff:append('<script type="text/javascript">')
36
	self.htmlbuff:append('require(["wmToolTip","wmWebUI"],function(WmToolTip,WmWebUI) {')
37
	self.htmlbuff:append('var tooltip_'..self.id..' = new WmToolTip("'..self.id..'");')
38
	if attr.action then
39
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction(function(){ return '..attr.action..'.apply(window,arguments);});')
40
	else
41
		self.htmlbuff:append('tooltip_'..self.id..'.setCloseAction();')
42
	end
43
	self.htmlbuff:append('tooltip_'..self.id..'.setBaseElement("'..attr.baseId..'");')
44
	self.htmlbuff:append('tooltip_'..self.id..'.show();')
45
	self.htmlbuff:append('WmWebUI.store("'..attr.id..'",tooltip_'..attr.id..');')
46
	self.htmlbuff:append('})')
47
	self.htmlbuff:append('</script>')
48
end
49

50
function WmToolTip:doEndTag()
51

52
end
53

54
return WmToolTip

+ 152 - 20
ipu-server-lib/pom.xml

@ -23,18 +23,19 @@
23 23
		<commons-lang3>3.4</commons-lang3>
24 24
		<beetl-core>2.2.3</beetl-core>
25 25
		<velocity>1.7</velocity>
26
		
26
27 27
		<!-- 公共可选依赖 -->
28 28
		<jsoup>1.7.2</jsoup>
29 29
		<commons-fileupload>1.3.1</commons-fileupload>
30 30
		<commons-dbcp>1.4</commons-dbcp>
31 31
		<mysql-connector-java>5.1.38</mysql-connector-java>
32 32
		<commons-codec>1.3</commons-codec>
33
		
33
34 34
		<!-- 公共插件 -->
35 35
		<maven-clean-plugin>3.0.0</maven-clean-plugin>
36 36
		<maven-resources-plugin>2.6</maven-resources-plugin>
37 37
		<maven-compiler-plugin>3.1</maven-compiler-plugin>
38
		<compiler-version>1.6</compiler-version>
38 39
		<maven-surefire-plugin>2.16</maven-surefire-plugin>
39 40
		<maven-war-plugin>2.6</maven-war-plugin>
40 41
		<exec-maven-plugin>1.5.0</exec-maven-plugin>
@ -99,7 +100,7 @@
99 100
				<artifactId>velocity</artifactId>
100 101
				<version>${velocity}</version>
101 102
			</dependency>
102
			
103
103 104
			<!-- 公共本地依赖 -->
104 105
			<dependency>
105 106
				<groupId>local</groupId>
@ -171,7 +172,7 @@
171 172
				<scope>system</scope>
172 173
				<systemPath>${jar-path}/java_memcached-release_2.5.3.jar</systemPath>
173 174
			</dependency>
174
			
175
175 176
			<!-- 公共可选依赖 -->
176 177
			<dependency>
177 178
				<groupId>org.jsoup</groupId>
@ -179,9 +180,9 @@
179 180
				<version>${jsoup}</version>
180 181
			</dependency>
181 182
			<dependency>
182
			    <groupId>commons-fileupload</groupId>
183
			    <artifactId>commons-fileupload</artifactId>
184
			    <version>${commons-fileupload}</version>
183
				<groupId>commons-fileupload</groupId>
184
				<artifactId>commons-fileupload</artifactId>
185
				<version>${commons-fileupload}</version>
185 186
			</dependency>
186 187
			<dependency>
187 188
				<groupId>commons-dbcp</groupId>
@ -206,24 +207,17 @@
206 207
		<pluginManagement>
207 208
			<plugins>
208 209
				<!-- 默认插件,不引入也可使用 -->
209
				<plugin>
210
					<groupId>org.apache.maven.plugins</groupId>
211
					<artifactId>maven-clean-plugin</artifactId>
212
					<version>${maven-clean-plugin}</version>
213
				</plugin>
214
				<plugin>
215
					<groupId>org.apache.maven.plugins</groupId>
216
					<artifactId>maven-resources-plugin</artifactId>
217
					<version>${maven-resources-plugin}</version>
218
				</plugin>
210
				<!-- 默认jre编译版本 -->
219 211
				<plugin>
220 212
					<groupId>org.apache.maven.plugins</groupId>
221 213
					<artifactId>maven-compiler-plugin</artifactId>
222 214
					<version>${maven-compiler-plugin}</version>
223
					<!-- <configuration>
224
						<encoding>${encoding}</encoding>
225
					</configuration> -->
215
					<configuration>
216
						<source>${compiler-version}</source>
217
						<target>${compiler-version}</target>
218
					</configuration>
226 219
				</plugin>
220
				<!-- war包去除servlet-api的jar包 -->
227 221
				<plugin>
228 222
					<groupId>org.apache.maven.plugins</groupId>
229 223
					<artifactId>maven-war-plugin</artifactId>
@ -233,6 +227,7 @@
233 227
						<packagingExcludes> WEB-INF/lib/servlet-api*.jar </packagingExcludes>
234 228
					</configuration>
235 229
				</plugin>
230
				<!-- 跳过单元测试 -->
236 231
				<plugin>
237 232
					<groupId>org.apache.maven.plugins</groupId>
238 233
					<artifactId>maven-surefire-plugin</artifactId>
@ -242,11 +237,148 @@
242 237
						<skip>true</skip>
243 238
					</configuration>
244 239
				</plugin>
240
				<!-- clean中间文件 -->
241
				<plugin>
242
					<artifactId>maven-clean-plugin</artifactId>
243
					<version>${maven-clean-plugin}</version>
244
					<executions>
245
						<execution>
246
							<id>clean-all</id>
247
							<phase>clean</phase>
248
							<goals>
249
								<goal>clean</goal>
250
							</goals>
251
							<configuration>
252
								<filesets>
253
									<fileset>
254
										<directory>${basedir}/src/main/webapp/encrypt</directory>
255
										<includes>
256
											<include>**/*</include>
257
										</includes>
258
									</fileset>
259
									<fileset>
260
										<directory>${basedir}/src/main/webapp</directory>
261
										<includes>
262
											<include>res.version.properties</include>
263
										</includes>
264
									</fileset>
265
									<fileset>
266
										<directory>${basedir}/src/main/webapp/template/lua</directory>
267
										<includes>
268
											<include>**/*</include>
269
										</includes>
270
									</fileset>
271
								</filesets>
272
							</configuration>
273
						</execution>
274
						<!-- 打包之前clean掉明文配置文件 -->
275
						<execution>
276
							<id>clean-config</id>
277
							<phase>prepare-package</phase><!-- 打包之前 -->
278
							<goals>
279
								<goal>clean</goal>
280
							</goals>
281
							<configuration>
282
								<excludeDefaultDirectories>true</excludeDefaultDirectories>
283
								<filesets>
284
									<fileset>
285
										<directory>${basedir}/src/main/webapp/template</directory>
286
										<includes>
287
											<include>server-config.xml</include>
288
											<include>server-data.xml</include>
289
											<include>server-page.xml</include>
290
										</includes>
291
									</fileset>
292
								</filesets>
293
							</configuration>
294
						</execution>
295
					</executions>
296
				</plugin>
297
				<!-- 复制资源 -->
298
				<plugin>
299
					<artifactId>maven-resources-plugin</artifactId>
300
					<version>${maven-resources-plugin}</version>
301
					<executions>
302
						<execution>
303
							<id>copy-config</id>
304
							<phase>process-resources</phase><!-- 编译之前处理文件 -->
305
							<goals>
306
								<goal>copy-resources</goal>
307
							</goals>
308
							<configuration>
309
								<outputDirectory>${basedir}/src/main/webapp/template</outputDirectory>
310
								<resources>
311
									<resource>
312
										<directory>${basedir}/src/main/resources</directory>
313
										<includes>
314
											<include>server-config.xml</include>
315
											<include>server-data.xml</include>
316
											<include>server-page.xml</include>
317
										</includes>
318
									</resource>
319
								</resources>
320
							</configuration>
321
						</execution>
322
						<execution>
323
							<id>copy-lua</id>
324
							<phase>process-resources</phase>
325
							<goals>
326
								<goal>copy-resources</goal>
327
							</goals>
328
							<configuration>
329
								<outputDirectory>${basedir}/src/main/webapp/template/lua</outputDirectory>
330
								<resources>
331
									<resource>
332
										<directory>${basedir}/src/main/resources/lua</directory>
333
									</resource>
334
								</resources>
335
							</configuration>
336
						</execution>
337
					</executions>
338
				</plugin>
339
				<!-- 生成文件版本号和文件加密 -->
245 340
				<plugin>
246 341
					<groupId>org.codehaus.mojo</groupId>
247 342
					<artifactId>exec-maven-plugin</artifactId>
248 343
					<version>${exec-maven-plugin}</version>
344
					<executions>
345
						<execution>
346
							<id>res-encrypt</id>
347
							<phase>test</phase>
348
							<goals>
349
								<goal>java</goal>
350
							</goals>
351
							<configuration>
352
								<classpathScope>compile</classpathScope>
353
								<includeProjectDependencies>true</includeProjectDependencies>
354
								<mainClass>com.ai.ipu.server.tool.FileEncryptToolMaven</mainClass>
355
								<arguments>
356
									<argument>src/main/webapp/</argument>
357
									<argument>false</argument>
358
									<argument></argument>
359
								</arguments>
360
							</configuration>
361
						</execution>
362
						<execution>
363
							<id>res-version</id>
364
							<phase>prepare-package</phase>
365
							<goals>
366
								<goal>java</goal>
367
							</goals>
368
							<configuration>
369
								<classpathScope>compile</classpathScope>
370
								<includeProjectDependencies>true</includeProjectDependencies>
371
								<mainClass>com.ai.ipu.server.tool.VersionToolMaven</mainClass>
372
								<arguments>
373
									<argument>src/main/webapp/</argument>
374
									<argument>false</argument>
375
									<argument></argument>
376
								</arguments>
377
							</configuration>
378
						</execution>
379
					</executions>
249 380
				</plugin>
381
250 382
			</plugins>
251 383
		</pluginManagement>
252 384
	</build>

android-share - Nuosi Git Service

ipu的trunk版的android工程和服务端工程。

chengwb3 446c503804 集群推送第二版修改,调整P端增删改路由关系,M端查询等操作 vor 8 Jahren
..
antlr-2.7.6.jar 22bd19543c 初始化 vor 10 Jahren
aspectjweaver.jar 22bd19543c 初始化 vor 10 Jahren
bcprov-jdk16-140.jar 22bd19543c 初始化 vor 10 Jahren
commons-beanutils-1.7.0.jar 22bd19543c 初始化 vor 10 Jahren
commons-collections-3.2.jar 22bd19543c 初始化 vor 10 Jahren
commons-fileupload-1.2.1.jar 22bd19543c 初始化 vor 10 Jahren
commons-httpclient-3.0.jar 22bd19543c 初始化 vor 10 Jahren
commons-io-2.4.jar 22bd19543c 初始化 vor 10 Jahren
commons-lang-2.4.jar 22bd19543c 初始化 vor 10 Jahren
commons-logging-1.1.1.jar 22bd19543c 初始化 vor 10 Jahren
dom4j-1.6.1.jar 22bd19543c 初始化 vor 10 Jahren
ezmorph-1.0.6.jar 22bd19543c 初始化 vor 10 Jahren
freemarker-2.3.15.jar 22bd19543c 初始化 vor 10 Jahren
gson-2.1.jar 22bd19543c 初始化 vor 10 Jahren
httpclient-4.3.4.jar 22bd19543c 初始化 vor 10 Jahren
httpcore-4.3.2.jar 22bd19543c 初始化 vor 10 Jahren
ipu-basic-3.0.jar 446c503804 集群推送第二版修改,调整P端增删改路由关系,M端查询等操作 vor 8 Jahren
ipu-common-3.0.jar 381dc7f09d 集群推送消息第一版提交 vor 8 Jahren
ipu-server-web-3.0.jar 381dc7f09d 集群推送消息第一版提交 vor 8 Jahren
java_memcached-release_2.5.3.jar 22bd19543c 初始化 vor 10 Jahren
jaxen-1.1.1.jar 22bd19543c 初始化 vor 10 Jahren
jdom-1.0.jar 381dc7f09d 集群推送消息第一版提交 vor 8 Jahren
json-lib-2.2.3-jdk13.jar 22bd19543c 初始化 vor 10 Jahren
log4j-1.2.8.jar 22bd19543c 初始化 vor 10 Jahren
mina-integration-beans-2.0.0-RC1.jar 22bd19543c 初始化 vor 10 Jahren
ognl-2.7.3.jar 22bd19543c 初始化 vor 10 Jahren
servlet-api2.5.jar 22bd19543c 初始化 vor 10 Jahren
slf4j-api-1.7.5.jar 22bd19543c 初始化 vor 10 Jahren
slf4j-nop-1.7.5.jar 22bd19543c 初始化 vor 10 Jahren
spring-aop-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-aspects-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-beans-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-context-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-core-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-expression-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-jdbc-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-orm-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-tx-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
spring-web-3.2.8.RELEASE.jar 22bd19543c 初始化 vor 10 Jahren
wade-apache.jar 22bd19543c 初始化 vor 10 Jahren
wade-cache.jar 381dc7f09d 集群推送消息第一版提交 vor 8 Jahren
wade-common.jar 22bd19543c 初始化 vor 10 Jahren
wade-database.jar 22bd19543c 初始化 vor 10 Jahren
wade-mobile-data.jar 381dc7f09d 集群推送消息第一版提交 vor 8 Jahren
wade-mobile-push.jar 381dc7f09d 集群推送消息第一版提交 vor 8 Jahren
xstream-1.3.jar 22bd19543c 初始化 vor 10 Jahren
ios-share - Nuosi Git Service

ipu的trunk版ios客户端工程

module.modulemap 184B

    framework module IPUMobileUI { umbrella header "IPUMobileUI.h" export * module * { export * } } module IPUMobileUI.Swift { header "IPUMobileUI-Swift.h" requires objc }