Skip to content

Commit eb995a9

Browse files
phochephoche
authored
Merge pull request #26 from VideoOS/dev_2.7.0
Dev 2.7.0
2 parents 721f31c + f0dd713 commit eb995a9

20 files changed

+753
-158
lines changed

‎VideoOS/VenvyLibrary/src/main/assets/lua/os_abdrama_hotspot.lua‎

Lines changed: 82 additions & 7 deletions
Large diffs are not rendered by default.

‎VideoOS/VenvyLibrary/src/main/assets/lua/os_ad_wheel_hotspot.lua‎

Lines changed: 59 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,45 @@ local adTypeName = "adWheel"
1616
local scale = getScale()
1717
local OS_ICON_WEDGE_CLOSE = "iVBORw0KGgoAAAANSUhEUgAAAC0AAAAtCAYAAAA6GuKaAAAAAXNSR0IArs4c6QAAAAlwSFlzAAAhOAAAITgBRZYxYAAAABxpRE9UAAAAAgAAAAAAAAAXAAAAKAAAABcAAAAWAAABJuDZqwUAAADySURBVGgFxNYxDsIwDAXQDiwwcR1uwB1ghpUj5Oh8S3yE2rTYju1GsiIlqf3Swe009ccFyw/Esb+dsnpA1hvi6sku4PaJJ+YKOMGsa4L/gpkgGz4Hs64K3gMzQRZ8Dcy6m/AtMBNEw/+BWbcL14CZIAquBbPuAi5dgpuaeRQu4Lux5gvnT4jvkO4gkGYIL9z6hsUk4DNiMSrgoWDeIBOeAs6Ep4Iz4CXgSHgpOAK+C3gU7unD3bZGiHX2dJWGItpY7cNW6Px8FjwNzAtEw9PB0fAycBS8HDwK3w0scOnD1rbW8Iz37xCPjg3Ph6OhJGMY/gYAAP//68uhBAAAANxJREFU7dZNDoIwEAVgEl2gK4/lCdh4ALceoUf3DfEloIjTdt6sbDIpJHTeF34ahqFuHHH5DVU66471J5R8RIELpFZyeDRYDleBZfAW8OP16InyzGGvSiv4ArR9ZAbxgHlNN7wHDOs8UuER4FR4JDgFrgBL4UqwBJ4BDofX/kvYPmzbWuto3VXGZeAVJ8VZvWDm1sInLDxwMWcPPArMTC98E8wme/BoMDN/wXfBbLIFV4GZ+Q3uArPJEq4GM/MdXgVmE4NngZlJeBOYTc48SJxHZH3sEon5/6jVHXgCCd+jGkmWfYoAAAAASUVORK5CYII="
1818
local OS_ICON_WEDGE_LANDSCAPE_CLOSE = "iVBORw0KGgoAAAANSUhEUgAAAFgAAABYBAMAAACDuy0HAAAAMFBMVEUAAAAAAACRkZHBwcEAAAAAAAAAAAAAAAAAAABHR0cAAAAAAAAAAAAAAAAAAAAAAACPWxS5AAAAEHRSTlMAgLLNQHprVAaUdWA6KhIMLcJxvwAAAPtJREFUSMdjGAWjYBSMAiqAN9WpYdvPEaWU300QDFI+EFbL4SoIBSENBBXfEoSDtYTUsggiAQcCjihEViyO3yHsgiigAK9iR1TFIvjU8gqigQt4FHehK16B3xVEu4M/EF2x6AcCgSwJUTeRQFCzgeUnK4JIIUswJwGn4odgeSEjEKmsCObI4VR8ECgLVgfWAQYyOBUXCkKNhhssKI5T8UZBmNEwgwWlcSpOFIQZDTNYUAynYngwKxvBA5p8xYSdQbkHCQcd4UihPLoJJyTCSZSixE84W1GeYTGLAooKGcLFF+UFI2aRS3lhTriaoLwCQlRto2AUjIJRQDkAAK7+UH2EAaaMAAAAAElFTkSuQmCC"
19+
--widgetEvent版本兼容
20+
local function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, selfLink)
21+
22+
local actionString = ""
23+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
24+
actionString = linkUrl
25+
elseif (deepLink ~= nil and string.len(deepLink) > 0) then
26+
actionString = deepLink
27+
elseif (selfLink ~= nil and string.len(selfLink) > 0) then
28+
actionString = selfLink
29+
end
30+
31+
if Native.widgetNotify then
32+
33+
local notifyTable = {}
34+
35+
notifyTable["eventType"] = eventType
36+
notifyTable["adID"] = adID
37+
notifyTable["adName"] = adName
38+
notifyTable["actionType"] = actionType
39+
notifyTable["actionString"] = actionString
40+
41+
if (linkUrl ~= nil) then
42+
notifyTable["linkUrl"] = linkUrl
43+
end
44+
45+
if (deepLink ~= nil) then
46+
notifyTable["deepLink"] = deepLink
47+
end
48+
49+
if (selfLink ~= nil) then
50+
notifyTable["selfLink"] = selfLink
51+
end
52+
53+
Native:widgetNotify(notifyTable)
54+
else
55+
Native:widgetEvent(eventType, adID, adName, actionType, actionString)
56+
end
57+
end
1958
local function getHotspotExposureTrackLink(data, index)
2059
if (data == nil or index == nil) then
2160
return nil
@@ -124,7 +163,21 @@ local function getAdLinkUrl(data, index)
124163
if (curIndexTable == nil) then
125164
return nil
126165
end
127-
return curIndexTable.linkUrl
166+
local linkData = curIndexTable.linkData
167+
if(linkData == nil) then
168+
return nil
169+
end
170+
local linkUrl = linkData.linkUrl
171+
local deepLink = linkData.deepLink
172+
local selfLink = linkData.selfLink
173+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
174+
return linkUrl
175+
elseif (deepLink ~= nil and string.len(deepLink) > 0) then
176+
return deepLink
177+
elseif (selfLink ~= nil and string.len(selfLink) > 0) then
178+
return selfLink
179+
end
180+
return nil
128181
end
129182

130183
--轮播按钮获取--
@@ -201,7 +254,7 @@ end
201254

202255
local function closeView()
203256
if Native:getCacheData(adWheel.id) == tostring(eventTypeShow) then
204-
Native:widgetEvent(eventTypeClose, adWheel.id, adTypeName, actionTypePlayVideo, "")
257+
widgetEvent(eventTypeClose, adWheel.id, adTypeName, actionTypePlayVideo, "")
205258
Native:deleteBatchCacheData({ adWheel.id })
206259
end
207260
Native:destroyView()
@@ -807,7 +860,7 @@ local function onCreate(data)
807860

808861
adWheel.luaview:addView(adWheel.shutDownView)
809862

810-
Native:widgetEvent(eventTypeShow, adWheel.id, adTypeName, actionTypeNone, "")
863+
widgetEvent(eventTypeShow, adWheel.id, adTypeName, actionTypeNone, "")
811864

812865
adWheel.shutDownView:onClick(function()
813866
closeView()
@@ -827,7 +880,8 @@ local function onCreate(data)
827880
end
828881
local linkUrl = getAdLinkUrl(data, adWheel.hotspotOrder)
829882
if (linkUrl ~= nil) then
830-
Native:widgetEvent(eventTypeClick, adWheel.id, adTypeName, actionTypeOpenUrl, linkUrl)
883+
local linkData = data.data.hotEdit.adArray[adWheel.hotspotOrder].linkData
884+
widgetEvent(eventTypeClick, adWheel.id, adTypeName, actionTypeOpenUrl, linkData.linkUrl,linkData.deepLink,linkData.selfLink)
831885
end
832886
end)
833887
changeAdWheel(adWheel.hotspotOrder, data)
@@ -858,6 +912,6 @@ function show(args)
858912

859913
setConfig(args.data)
860914
onCreate(args.data)
861-
Native:widgetEvent(eventTypeShow, adWheel.id, adTypeName, actionTypePauseVideo, "")
915+
widgetEvent(eventTypeShow, adWheel.id, adTypeName, actionTypePauseVideo, "")
862916
Native:saveCacheData(adWheel.id, tostring(eventTypeShow))
863917
end

‎VideoOS/VenvyLibrary/src/main/assets/lua/os_bubble_hotspot.lua‎

Lines changed: 73 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,45 @@ messageType 1 文本
4242
messageType 2 图片
4343
messageType 3 选择
4444
]] --
45+
--widgetEvent版本兼容
46+
local function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, selfLink)
47+
48+
local actionString = ""
49+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
50+
actionString = linkUrl
51+
elseif (deepLink ~= nil and string.len(deepLink) > 0) then
52+
actionString = deepLink
53+
elseif (selfLink ~= nil and string.len(selfLink) > 0) then
54+
actionString = selfLink
55+
end
56+
57+
if Native.widgetNotify then
58+
59+
local notifyTable = {}
60+
61+
notifyTable["eventType"] = eventType
62+
notifyTable["adID"] = adID
63+
notifyTable["adName"] = adName
64+
notifyTable["actionType"] = actionType
65+
notifyTable["actionString"] = actionString
66+
67+
if (linkUrl ~= nil) then
68+
notifyTable["linkUrl"] = linkUrl
69+
end
70+
71+
if (deepLink ~= nil) then
72+
notifyTable["deepLink"] = deepLink
73+
end
74+
75+
if (selfLink ~= nil) then
76+
notifyTable["selfLink"] = selfLink
77+
end
78+
79+
Native:widgetNotify(notifyTable)
80+
else
81+
Native:widgetEvent(eventType, adID, adName, actionType, actionString)
82+
end
83+
end
4584

4685
local function getHotspotExposureTrackLink(data, index)
4786
if (data == nil or index == nil) then
@@ -77,24 +116,35 @@ local function linkUrl(data) --获取linkUrl
77116
if (data == nil) then
78117
return nil
79118
end
80-
local link = data.link
81-
if (link ~= nil and string.len(link) > 0) then
82-
return link
83-
else
119+
local linkData = data.linkData
120+
if(linkData == nil) then
84121
return nil
85122
end
123+
local linkUrl = linkData.linkUrl
124+
local deepLink = linkData.deepLink
125+
local selfLink = linkData.selfLink
126+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
127+
return linkUrl
128+
elseif (deepLink ~= nil and string.len(deepLink) > 0) then
129+
return deepLink
130+
elseif (selfLink ~= nil and string.len(selfLink) > 0) then
131+
return selfLink
132+
end
133+
return nil
86134
end
87135

88136
local function closeView()
89137
if Native:getCacheData(bubble.id) == tostring(eventTypeShow) then
90-
Native:widgetEvent(eventTypeClose, bubble.id, adTypeName, actionTypeNone, "")
138+
widgetEvent(eventTypeClose, bubble.id, adTypeName, actionTypeNone, "")
91139
Native:deleteBatchCacheData({ bubble.id })
92140
end
93141
Native:destroyView()
94142
end
95143

96-
local function clickView(url, ise)
97-
Native:widgetEvent(eventTypeClick, bubble.id, adTypeName, actionTypeOpenUrl, url)
144+
local function clickView(urlTable, ise)
145+
146+
widgetEvent(eventTypeClick, bubble.id, adTypeName, actionTypeOpenUrl,urlTable.linkUrl,urlTable.deepLink,urlTable.selfLink)
147+
98148
local clickLinkUrl = getHotspotClickTrackLink(bubble.data, 1)
99149
if (clickLinkUrl ~= nil) then
100150
Native:get(clickLinkUrl)
@@ -437,13 +487,14 @@ local function createUserTypeLeftWithMessageImage(data, index) --左边用户云
437487
local promptTop = message:y() + message:height() - 17 * bubble.scale
438488
prompt:xy(message:x() + message:width() - 17 * bubble.scale, promptTop)
439489

440-
if (data.link ~= nil and string.len(data.link) > 0) then
490+
local linkUrl = linkUrl(data)
491+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
441492
performWithDelay(function()
442493
prompt:show()
443494
startViewMoveAnim(prompt, -prompt:width() * 0.3, -prompt:height() * 0.3, nil)
444495
end, promptShowTime)
445496
message:onClick(function()
446-
clickView(data.link, data.id)
497+
clickView(data.linkData, data.id)
447498
prompt:hide()
448499
end)
449500
end
@@ -543,13 +594,14 @@ local function createUserTypeLeftWithMessageImageIOS(data, index) --左边用户
543594
prompt:xy(message:x() + message:width() - 17 * bubble.scale, promptTop)
544595
userParent:frame(0, 0, bubble.width, prompt:y() + prompt:height())
545596

546-
if (data.link ~= nil and string.len(data.link) > 0) then
597+
local linkUrl = linkUrl(data)
598+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
547599
performWithDelay(function()
548600
prompt:show()
549601
startViewMoveAnim(prompt, -prompt:width() * 0.3, -prompt:height() * 0.3, nil)
550602
end, promptShowTime)
551603
message:onClick(function()
552-
clickView(data.link, data.id)
604+
clickView(data.linkData, data.id)
553605
prompt:hide()
554606
end)
555607
end
@@ -738,13 +790,15 @@ local function createUserTypeRightWithMessageImage(data, index) --左边用户
738790
prompt:margin(70 * bubble.scale, promptTop, 0, 0)
739791
message:size(messageWidth, messageHeight)
740792
message:margin(86 * bubble.scale, 19 * bubble.scale, 0, 0)
741-
if (data.link ~= nil and string.len(data.link) > 0) then
793+
794+
local linkUrl = linkUrl(data)
795+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
742796
performWithDelay(function()
743797
prompt:show()
744798
startViewMoveAnim(prompt, prompt:width() * 0.3, -prompt:height() * 0.3, nil)
745799
end, promptShowTime)
746800
message:onClick(function()
747-
clickView(data.link, data.id)
801+
clickView(data.linkData, data.id)
748802
prompt:hide()
749803
end)
750804
end
@@ -828,13 +882,14 @@ local function createUserTypeRightWithMessageImageIOS(data, index) --左边用
828882

829883
userParent:height(prompt:y() + prompt:height())
830884

831-
if (data.link ~= nil and string.len(data.link) > 0) then
885+
local linkUrl = linkUrl(data)
886+
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
832887
performWithDelay(function()
833888
prompt:show()
834889
startViewMoveAnim(prompt, prompt:width() * 0.3, -prompt:height() * 0.3, nil)
835890
end, promptShowTime)
836891
message:onClick(function()
837-
clickView(data.link, data.id)
892+
clickView(data.linkData, data.id)
838893
prompt:hide()
839894
end)
840895
end
@@ -1199,7 +1254,7 @@ function createUserMessageSelect(data, index) --左边用户云泡 显示问题
11991254
--TODO是否需要合并在一起，如果同时有数据怎么处理
12001255
local linkUrl = linkUrl(data.messageButtons[1])
12011256
if (linkUrl ~= nil) then
1202-
clickView(linkUrl, data.id)
1257+
clickView(data.messageButtons[1].linkData, data.id)
12031258
end
12041259
end
12051260
bubble.leftBtnClickFunction = leftBtnClickFunction
@@ -1208,7 +1263,7 @@ function createUserMessageSelect(data, index) --左边用户云泡 显示问题
12081263
local rightBtnClickFunction = function()
12091264
local linkUrl = linkUrl(data.messageButtons[2])
12101265
if (linkUrl ~= nil) then
1211-
clickView(linkUrl, data.id)
1266+
clickView(data.messageButtons[2].linkData, data.id)
12121267
end
12131268
end
12141269
bubble.rightBtnClickFunction = rightBtnClickFunction
@@ -1392,7 +1447,7 @@ function show(args)
13921447
bubble.id = dataTable.id
13931448

13941449
setBubbleTime(dataTable)
1395-
Native:widgetEvent(eventTypeShow, bubble.id, bubble.id, adTypeBubble, "") --todo 修改参数为table
1450+
widgetEvent(eventTypeShow, bubble.id, bubble.id, adTypeBubble, "") --todo 修改参数为table
13961451
Native:saveCacheData(bubble.id, tostring(eventTypeShow))
13971452
bubble.data = dataTable
13981453
bubble.media = registerMedia()

0 commit comments

Comments
 (0)