Skip to content

Commit 0c8674c

Browse files
author
videopls
committed
回退main.lua os_string.lua
1 parent f1a063c commit 0c8674c

File tree

2 files changed

+6
-41
lines changed

2 files changed

+6
-41
lines changed

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

Lines changed: 2 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,6 @@ local function checkHotspotShow(data)
163163
commonParam = Native:commonParam()
164164
}
165165

166-
local videoInfo = Native:getVideoInfo()
167-
168-
if videoInfo["extendDict"] ~= nil then
169-
paramData["videoInfo"] = videoInfo["extendDict"]
170-
end
171-
172166
local paramDataString = Native:tableToJson(paramData)
173167
-- local OS_HTTP_POST_CHECK_HOTSPOT = OS_HTTP_HOST .. "/api/notice"
174168

@@ -371,13 +365,6 @@ local function getTaglist()
371365
title = Native:getVideoTitle(),
372366
commonParam = Native:commonParam()
373367
}
374-
375-
local videoInfo = Native:getVideoInfo()
376-
377-
if videoInfo["extendDict"] ~= nil then
378-
paramData["videoInfo"] = videoInfo["extendDict"]
379-
end
380-
381368
local paramDataString = Native:tableToJson(paramData)
382369
--print("[LuaView] "..paramDataString)
383370
--print("[LuaView] "..Native:aesEncrypt(paramDataString, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY))
@@ -391,7 +378,6 @@ local function getTaglist()
391378
return
392379
end
393380
responseData = Native:aesDecrypt(response.encryptData, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY)
394-
print("luaview "..responseData)
395381

396382
response = toTable(responseData)
397383
if (response.resCode ~= "00") then
@@ -442,15 +428,8 @@ local function getSimulationTag()
442428
videoId = Native:nativeVideoID(),
443429
commonParam = Native:commonParam()
444430
}
445-
446-
local extendTable = nil
447-
448-
local videoInfo = Native:getVideoInfo()
449-
450-
if videoInfo["extendDict"] ~= nil then
451-
paramData["videoInfo"] = videoInfo["extendDict"]
452-
extendTable = videoInfo["extendDict"]
453-
end
431+
local extendJson = Native:getConfigExtendJSONString()
432+
local extendTable = toTable(extendJson)
454433

455434
if extendTable["creativeName"] ~= nil then
456435
paramData["creativeName"] = extendTable["creativeName"]
@@ -507,13 +486,6 @@ local function getResourcelist()
507486
videoId = Native:nativeVideoID(),
508487
commonParam = Native:commonParam()
509488
}
510-
511-
local videoInfo = Native:getVideoInfo()
512-
513-
if videoInfo["extendDict"] ~= nil then
514-
paramData["videoInfo"] = videoInfo["extendDict"]
515-
end
516-
517489
local paramDataString = Native:tableToJson(paramData)
518490
-- print("[LuaView] getResourcelist")
519491
--print("[LuaView] "..Native:aesEncrypt(paramDataString, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY))
@@ -589,13 +561,6 @@ function show(args)
589561
videoId = Native:nativeVideoID(),
590562
commonParam = Native:commonParam()
591563
}
592-
593-
local videoInfo = Native:getVideoInfo()
594-
595-
if videoInfo["extendDict"] ~= nil then
596-
paramData["videoInfo"] = videoInfo["extendDict"]
597-
end
598-
599564
local paramDataString = Native:tableToJson(paramData)
600565
--print("luaview "..Native:aesEncrypt(paramDataString, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY))
601566
mainNode.request:post(OS_HTTP_GET_CONFIG, {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ OS_HTTP_HOST = Native:videoOShost()
55
-- OS_HTTP_HOST = "http://dev-videopublicapi.videojj.com/videoos-api/"
66

77
OS_HTTP_GET_CONFIG = OS_HTTP_HOST .. "/api/config"
8-
OS_HTTP_GET_TAG_LIST = OS_HTTP_HOST .. "/api/v3/queryLaunchInfo"
9-
OS_HTTP_GET_RESOURCE_LIST = OS_HTTP_HOST .. "/api/v2/preloadLaunchInfo"
8+
OS_HTTP_GET_TAG_LIST = OS_HTTP_HOST .. "/api/v2/queryLaunchInfo"
9+
OS_HTTP_GET_RESOURCE_LIST = OS_HTTP_HOST .. "/api/preloadLaunchInfo"
1010
OS_HTTP_GET_MOBILE_QUERY = OS_HTTP_HOST .. "/api/mobileQuery"
1111
OS_HTTP_POST_MOBILE_QUERY = OS_HTTP_HOST .. "/api/mobileModify"
1212
OS_HTTP_GET_COMMON_QUERY = OS_HTTP_HOST .. "/api/commonQuery"
1313
OS_HTTP_GET_SIMULATION_TAG = OS_HTTP_HOST .. "/simulation/queryInfo"
14-
OS_HTTP_POST_CHECK_HOTSPOT = OS_HTTP_HOST .. "/api/v3/notice"
14+
OS_HTTP_POST_CHECK_HOTSPOT = OS_HTTP_HOST .. "/api/notice"
1515
OS_HTTP_POST_CHECK_HOTSPOT_TRACK = OS_HTTP_HOST .. "/statisticConfirmLaunch"
1616

1717
--数据统计网络相关
@@ -30,4 +30,4 @@ OS_ICON_BUBBLE_PROMPT_LEFT = OS_ICON_HEAD .. "[email protected]"
3030
OS_ICON_BUBBLE_PROMPT_RIGHT = OS_ICON_HEAD .. "[email protected]"
3131
OS_ICON_WEDGE_BACK = OS_ICON_HEAD .. "[email protected]"
3232
OS_ICON_WEDGE_CLOSE = OS_ICON_HEAD .. "[email protected]"
33-
OS_ICON_WIN_LINK_BACK = OS_ICON_HEAD .. "[email protected]"
33+
OS_ICON_WIN_LINK_BACK = OS_ICON_HEAD .. "[email protected]"

0 commit comments

Comments
 (0)