chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

aa

Browse Source
This commit is contained in:
陈彬
2020-07-10 23:32:07 +08:00
parent e0530eb7f5
commit c1b81d6e13
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
View File

@@ -36,14 +36,13 @@ CLLMainLua.init = function()
ReporterMessageReceiver.self:setLua() ReporterMessageReceiver.self:setLua()
end end
-- 设置显示状态栏 -- 设置显示状态栏
Screen.fullScreen = false -- Screen.fullScreen = false
-- AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR) -- AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
-- AndroidStatusBar.statusBarState = AndroidStatusBar.States.Visible -- AndroidStatusBar.statusBarState = AndroidStatusBar.States.Visible
-- AndroidStatusBar.dimmed = false -- AndroidStatusBar.dimmed = false
-- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN) -- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
-- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible
CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible -- CS.ApplicationChrome.dimmed = false
CS.ApplicationChrome.dimmed = false
--设置帧率 --设置帧率
Application.targetFrameRate = 10 Application.targetFrameRate = 10
@@ -169,6 +168,7 @@ function CLLMainLua.onCheckUpgrader(isHaveUpdated)
end end
function CLLMainLua.begain() function CLLMainLua.begain()
pcall(fitIphoneX)
local success, msg = pcall(CLLMainLua.init) local success, msg = pcall(CLLMainLua.init)
if not success then if not success then
printe(msg) printe(msg)

11
Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua
View File

@@ -592,6 +592,17 @@ function dump(obj)
end end
return dumpObj(obj, 0) return dumpObj(obj, 0)
end end
function fitIphoneX()
local mode = SystemInfo.deviceModel
if
string.find(mode, "iPhone10,3") or string.find(mode, "iPhone10,6") or string.find(mode, "iPhone11,3") or
string.find(mode, "iPhone11,6") or -- XS Max
string.find(mode, "iPhone11,8")
then -- xr
NGUITools.isFringe = true
end
end
--******************************************************************* --*******************************************************************
--******************************************************************* --*******************************************************************
local borrowedSpList = {} local borrowedSpList = {}