update 2.0.2

Author: phoche

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

@@ -104,6 +104,34 @@ local function closeAdView(adId, data)
     end
 end
 
+local function trackNotice(data, requestType, status, isShow)
+    if (data == nil or requestType == nil or status == nil or isShow == nil) then
+        return nil
+    end
+
+    -- local OS_HTTP_POST_CHECK_HOTSPOT_TRACK = OS_HTTP_HOST .. "/statisticConfirmLaunch"
+
+    -- print("[LuaView] "..paramDataString)
+    -- print("[LuaView] "..OS_HTTP_POST_CHECK_HOTSPOT_TRACK)
+
+    mainNode.request:post(OS_HTTP_POST_CHECK_HOTSPOT_TRACK, {
+        bu_id = buId,
+        device_type = deviceType,
+        videoId = Native:nativeVideoID(),
+        id = data.id,
+        launchPlanId = data.launchPlanId,
+        createId = data.createId,
+        timestamp = data.videoStartTime,
+        type = requestType,
+        status = status,
+        isShow = isShow,
+        commonParam = Native:commonParam()
+    }, function(response, errorInfo)
+        -- print("luaview getVoteCountInfo")
+
+    end)
+end
+
 local function checkHotspotShow(data)
 
     if (data == nil) then
@@ -132,24 +160,30 @@ local function checkHotspotShow(data)
         data = Native:aesEncrypt(paramDataString, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY)
     }, function(response, errorInfo)
         -- print("luaview getVoteCountInfo")
-        if (response == nil) then
-            return
-        end
-        -- print("luaview getVoteCountInfo 11"..Native:tableToJson(response))
-        responseData = Native:aesDecrypt(response.encryptData, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY)
-        -- print("luaview " .. Native:tableToJson(data))
-        -- print("luaview " .. responseData)
-        response = toTable(responseData)
-        if (response.resCode ~= "00") then
-            return
-        end
-        
-        if (response.status == "00") then
-            if checkAdTable[data.id] ~= nil then
-                checkAdTable[data.id] = true
+
+        local requestType = 0
+        local playStatus = 0
+        local isShow = 0
+        if (response ~= nil) then
+            requestType = 1
+            -- print("luaview getVoteCountInfo 11"..Native:tableToJson(response))
+            responseData = Native:aesDecrypt(response.encryptData, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY)
+            -- print("luaview " .. Native:tableToJson(data))
+            -- print("luaview " .. responseData)
+            response = toTable(responseData)
+            if (response.resCode == "00") then
+                if (response.status == "00") then
+                    playStatus = 1
+                    if checkAdTable[data.id] ~= nil then
+                        checkAdTable[data.id] = true
+                    end
+                    if data.videoStartTime + adShowInterval > lastProgress then
+                        isShow = 1
+                    end
+                end
             end
         end
-        
+        trackNotice(data, requestType, playStatus, isShow)
     end)
 end
 
@@ -322,7 +356,17 @@ local function getTaglist()
         if (dataTable == nil) then
             return
         end
-        --osTypeVideoOS = 1, osTypeLiveOS = 2, 直播开启Mqtt，点播不开启
+        
+        --下载投放的lua文件
+        local luaList = {}
+        for i,v in ipairs(dataTable) do
+            if (v.luaList ~= nil ) then
+                table.insert(luaList, v.luaList)
+            end
+        end
+        Native:preloadLuaList(luaList)
+
+        --osTypeVideoOS = 1, osTypeLiveOS = 2, 点播按时间点加载，直播直接加载
         if Native:osType() < osTypeLiveOS then
             print("osTypeVideoOS")
             for key, value in pairs(dataTable) do
@@ -440,7 +484,8 @@ local function getResourcelist()
         local videoList = {}
         local imageList = {}
         for i, v in ipairs(dataTable) do
-            local position = string.find(v, ".mp4", 1)
+            local lowerUrl = string.lower(v)
+            local position = string.find(lowerUrl, ".mp4", 1)
             if position ~= nil and position > 0 then
                 table.insert(videoList, v)
             else
@@ -498,6 +543,11 @@ function show(args)
         if (response.resCode ~= "00") then
             return
         end
+
+        if (response.confirmTime ~= nil) then
+            adCheckInterval = response.confirmTime * 1000.0
+        end
+
         mainNode.mqtt = registerMqtt(response)
         getTag()
         getResourcelist()

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

@@ -12,6 +12,7 @@ OS_HTTP_POST_MOBILE_QUERY = OS_HTTP_HOST .. "/api/mobileModify"
 OS_HTTP_GET_COMMON_QUERY = OS_HTTP_HOST .. "/api/commonQuery"
 OS_HTTP_GET_SIMULATION_TAG = OS_HTTP_HOST .. "/simulation/queryInfo"
 OS_HTTP_POST_CHECK_HOTSPOT = OS_HTTP_HOST .. "/api/notice"
+OS_HTTP_POST_CHECK_HOTSPOT_TRACK = OS_HTTP_HOST .. "/statisticConfirmLaunch"
 
 --数据统计网络相关
 OS_HTTP_GET_STARTS = OS_HTTP_HOST .. "/statistic"

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

@@ -9,7 +9,9 @@ function table_leng(t)
     end
     return leng;
 end
-function toTable(data) --string json 转table
+
+--string json 转table
+function toTable(data)
     local dataTable
     if (type(data) == 'string') then
         if (System.android()) then
@@ -22,6 +24,7 @@ function toTable(data) --string json 转table
     end
     return dataTable
 end
+
 --四舍五入--
 function rounded(decimal)
     decimal = math.floor(decimal)
@@ -52,6 +55,8 @@ function checkMqttHotspotToSetClose(data, callback)
     end
 end
 
+
+--widgetEvent版本兼容
 function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, selfLink)
 
     local actionString = ""
@@ -63,7 +68,7 @@ function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, sel
         actionString = selfLink
     end
 
-    if Native.widgetNotifyEvent then
+    if Native.widgetNotify then
 
         local notifyTable = {}
 
@@ -87,7 +92,7 @@ function widgetEvent(eventType, adID, adName, actionType, linkUrl, deepLink, sel
 
         Native:widgetNotify(notifyTable)
      else
-        Native:widgetEvent(eventType, id, typeName, actionType, actionString)
+        Native:widgetEvent(eventType, adID, adName, actionType, actionString)
     end
 end
 

VideoOS/gradle.properties

@@ -15,4 +15,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-VERSION_NAME = 2.0.0
+VERSION_NAME = 2.0.2