update lua

Author: shshjing

Resources/VideoPlsResources.bundle/lua/lua_version.json

@@ -1 +1 @@
-{"version":"1.2.0"}
+{"version":"1.3.0"}

Resources/VideoPlsResources.bundle/lua/main.lua

@@ -23,13 +23,13 @@ require "os_util"
 require "os_constant"
 local repeatAdTable = {} --广告轮询集合
 local showAdTable = {} --正在展示的table
+local checkAdTable = {} --广告是否可以展示
 local lastProgress = 0
 local bubbleIdList = {}
 local targetObjId = nil
 local roomId = Native:nativeVideoID()
-local deviceType = 2
-local buId = "videoos"
-local adShowInterval = 2000
+local adShowInterval = 1000
+local adCheckInterval = 5000
 local preloadCount = 1
 mainNode = object:new()
 
@@ -104,6 +104,55 @@ local function closeAdView(adId, data)
     end
 end
 
+local function checkHotspotShow(data)
+
+    if (data == nil) then
+        return nil
+    end
+
+    local paramData = {
+        videoId = Native:nativeVideoID(),
+        id = data.id,
+        launchPlanId = data.launchPlanId,
+        createId = data.createId,
+        timestamp = data.videoStartTime,
+        commonParam = Native:commonParam()
+    }
+
+    local paramDataString = Native:tableToJson(paramData)
+    -- local OS_HTTP_POST_CHECK_HOTSPOT = OS_HTTP_HOST .. "/api/notice"
+
+    -- print("[LuaView] "..paramDataString)
+    -- print("[LuaView] "..OS_HTTP_POST_CHECK_HOTSPOT)
+    -- print("[LuaView] "..Native:aesEncrypt(paramDataString, OS_HTTP_PUBLIC_KEY, OS_HTTP_PUBLIC_KEY))
+
+    mainNode.request:post(OS_HTTP_POST_CHECK_HOTSPOT, {
+        bu_id = buId,
+        device_type = deviceType,
+        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
+            end
+        end
+        
+    end)
+end
+
 --轮询添加广告逻辑广告逻辑(注:)
 local function dispatchAd(dataTables, position)
     local currentPositionAdInfos = {}
@@ -117,7 +166,11 @@ local function dispatchAd(dataTables, position)
                 showAdTable[value.id] = value
                 currentPositionAdInfos[value.id] = value
                 table.insert(bubbleIdList, value.id)
-            elseif value.videoStartTime ~= nil and (tonumber(value.videoStartTime) <= position and (tonumber(value.videoStartTime) + adShowInterval) >= position and showAdTable[value.id] == nil) then
+            elseif value.videoStartTime ~= nil and ((tonumber(value.videoStartTime) - adCheckInterval) <= position and tonumber(value.videoStartTime) >= position and checkAdTable[value.id] == nil) then
+                checkAdTable[value.id] = false
+                checkHotspotShow(value)
+            elseif value.videoStartTime ~= nil and (tonumber(value.videoStartTime) <= position and (tonumber(value.videoStartTime) + adShowInterval) >= position and showAdTable[value.id] == nil) and checkAdTable[value.id] == true then
+                checkAdTable[value.id] = nil
                 showAdTable[value.id] = value
                 currentPositionAdInfos[value.id] = value
             elseif ((position >= tonumber(value.videoEndTime) or position <= tonumber(value.videoStartTime)) and showAdTable[value.id] ~= nil) then
@@ -163,6 +216,7 @@ local function registerMedia()
         onMediaProgress = function(progress)
             --视频被拖动时，删除所有已经显示的热点
             if lastProgress ~= nil and math.abs(lastProgress - progress) > 1500 then
+                checkAdTable = {}
                 for key, value in pairs(showAdTable) do
                     closeAdView(key, value)
                 end
@@ -422,9 +476,6 @@ function show(args)
     mainNode.media = registerMedia()
     mainNode.request = HttpRequest()
 
-    if System.ios() then
-        deviceType = 1
-    end
     --加载网络请求通用参数
     local paramData = {
         videoId = Native:nativeVideoID(),

Resources/VideoPlsResources.bundle/lua/os_config.lua

@@ -6,7 +6,7 @@ function object:new(o)
     return o
 end
 function getScale()
-    local screenW, screenH = System.screenSize()
+    local screenW, screenH = Native:getVideoSize(2)
     return math.min(screenW, screenH) / 375
 end
 is_iPhoneX = false

Resources/VideoPlsResources.bundle/lua/os_constant.lua

@@ -26,4 +26,12 @@ osTypeLiveOS = 2
 
 --页面层次
 osHotspotViewPriority = 1
-osInfoViewPriority = 2
+osInfoViewPriority = 2
+
+--设备类型 1 iOS 2 Android
+deviceType = 2
+if System.ios() then
+	deviceType = 1
+end
+
+buId = "videoos"

Resources/VideoPlsResources.bundle/lua/os_string.lua

@@ -11,6 +11,7 @@ OS_HTTP_GET_MOBILE_QUERY = OS_HTTP_HOST .. "/api/mobileQuery"
 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_GET_STARTS = OS_HTTP_HOST .. "/statistic"

Resources/VideoPlsResources.bundle/lua/os_win_link.lua

@@ -30,7 +30,7 @@ local function createParent(isPortrait)
         luaView = ThroughView()
     end
     luaView:backgroundColor(0xFFFFFF)
-    local screenWidth, screenHeight = System.screenSize()
+    local screenWidth, screenHeight = Native:getVideoSize(2)
     if (isPortrait) then
         luaView:frame(0, 0, math.min(screenWidth, screenHeight), math.max(screenWidth, screenHeight))
     else
@@ -41,7 +41,7 @@ end
 
 local function createTopView(isPortrait)
     local topParentView = View()
-    local screenWidth, screenHeight = System.screenSize()
+    local screenWidth, screenHeight = Native:getVideoSize(2)
     if (isPortrait) then
         topParentView:frame(0, 0, math.min(screenWidth, screenHeight), 44 * scale)
     else
@@ -65,7 +65,7 @@ end
 
 local function createWebView(isPortrait)
     local webview = WebView()
-    local screenWidth, screenHeight = System.screenSize()
+    local screenWidth, screenHeight = Native:getVideoSize(2)
     if (isPortrait) then
         webview:frame(0, 44 * scale, math.min(screenWidth, screenHeight), math.max(screenWidth, screenHeight))
     else