Skip to content

Commit 64c14ee

Browse files
committed
update assets lua
1 parent 6b3e76e commit 64c14ee

File tree

4 files changed

+10
-73
lines changed

4 files changed

+10
-73
lines changed

VideoOS/VenvyLibrary/src/main/assets/lua/os_util.lua

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ function table_leng(t)
99
end
1010
return leng;
1111
end
12-
function toTable(data)
13-
--string json 转table
12+
function toTable(data) --string json 转table
1413
local dataTable
1514
if (type(data) == 'string') then
1615
if (System.android()) then
@@ -54,6 +53,7 @@ function checkMqttHotspotToSetClose(data, callback)
5453
end
5554

5655
function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, selfLink)
56+
5757
local actionString = ""
5858
if (linkUrl ~= nil and string.len(linkUrl) > 0) then
5959
actionString = linkUrl
@@ -66,7 +66,7 @@ function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, sel
6666
if Native.widgetNotifyEvent then
6767

6868
local notifyTable = {}
69-
69+
7070
notifyTable["eventType"] = eventType
7171
notifyTable["adID"] = adID
7272
notifyTable["adName"] = adName
@@ -80,13 +80,14 @@ function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, sel
8080
if (deepLink ~= nil) then
8181
notifyTable["deepLink"] = deepLink
8282
end
83-
83+
8484
if (selfLink ~= nil) then
8585
notifyTable["selfLink"] = selfLink
8686
end
87-
87+
8888
Native:widgetNotify(notifyTable)
89-
else
90-
Native:widgetEvent(eventType, adID, adName, actionType, actionString)
89+
else
90+
Native:widgetEvent(eventType, id, typeName, actionType, actionString)
9191
end
92-
end
92+
end
93+

VideoOS/VenvyLibrary/src/main/assets/lua/os_vote_hotspot.lua

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -472,10 +472,7 @@ local function onCreate(args)
472472
if (vote.launchPlanId ~= nil) then
473473
osTrack(vote.launchPlanId, 3, 2)
474474
end
475-
--Native:sendAction(Native:base64Encode("LuaView://defaultLuaView?template=" .. "os_vote_window.lua" .. "&id=" .. "os_vote_window" .. tostring(vote.id) .. "&priority=2"), args)
476-
-- LuaView://applets?appletId=xxxx&type=x(type: 1横屏,2竖屏)
477-
478-
Native:sendAction(Native:base64Encode("LuaView://applets?appletId=123&type=1"), args)
475+
Native:sendAction(Native:base64Encode("LuaView://defaultLuaView?template=" .. "os_vote_window.lua" .. "&id=" .. "os_vote_window" .. tostring(vote.id) .. "&priority=2"), args)
479476
end)
480477
local dataTable = args.data
481478
if (dataTable == nil) then
@@ -505,7 +502,6 @@ function show(args)
505502
if (args == nil or args.data == nil or vote.luaview ~= nil) then
506503
return
507504
end
508-
509505
vote.id = args.data.id
510506
vote.launchPlanId = args.data.launchPlanId
511507
vote.request = HttpRequest()

VideoOS/VenvyLibrary/src/main/assets/lua/test.lua

Lines changed: 0 additions & 33 deletions
This file was deleted.

VideoOS/VenvyLibrary/src/main/assets/lua/test1.lua

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)