From c1b81d6e139b1437f1600866810e0660072b8a2a Mon Sep 17 00:00:00 2001
From: chenbin <chbin12@126.com>
Date: Fri, 10 Jul 2020 23:32:07 +0800
Subject: [PATCH] aa

---
 .../trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua  |  8 ++++----
 .../upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua    | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
index 367e6d9..4357204 100644
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua
@@ -36,14 +36,13 @@ CLLMainLua.init = function()
         ReporterMessageReceiver.self:setLua()
     end
     -- 设置显示状态栏
-    Screen.fullScreen = false
+    -- Screen.fullScreen = false
     -- AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
     -- AndroidStatusBar.statusBarState = AndroidStatusBar.States.Visible
     -- AndroidStatusBar.dimmed = false
     -- AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
-
-    CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible
-    CS.ApplicationChrome.dimmed = false
+    -- CS.ApplicationChrome.statusBarState = CS.ApplicationChrome.States.Visible
+    -- CS.ApplicationChrome.dimmed = false
 
     --设置帧率
     Application.targetFrameRate = 10
@@ -169,6 +168,7 @@ function CLLMainLua.onCheckUpgrader(isHaveUpdated)
 end
 
 function CLLMainLua.begain()
+    pcall(fitIphoneX)
     local success, msg = pcall(CLLMainLua.init)
     if not success then
         printe(msg)
diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua
index bf0f7cb..1fbfad1 100644
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/LuaUtl.lua
@@ -592,6 +592,17 @@ function dump(obj)
     end
     return dumpObj(obj, 0)
 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 = {}