upgrade

Assets/trCRM/upgradeRes4Dev/priority/lua/CLLMainLua.lua

@@ -36,18 +36,13 @@ CLLMainLua.init = function()
         ReporterMessageReceiver.self:setLua()
     end
     -- 设置显示状态栏
-    -- 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.setSoftInputMode(CS.ApplicationChrome.ADJUST_RESIZE);
+    local success, msg = pcall(CLLMainLua.setAndroidStatusBar)
+    if not success then
+        printe(msg)
+    end
 
     --设置帧率
-    Application.targetFrameRate = 10
+    Application.targetFrameRate = 30
     -- QualitySettings.SetQualityLevel(1, false)
     Time.fixedDeltaTime = 0.5
 
@@ -67,13 +62,38 @@ CLLMainLua.init = function()
     --     fps.enabled = false
     -- end
 
-
     -- 统计sprite的使用情况
     if CLCfgBase.self.isEditMode and CLCfgBase.self.isContBorrowSpriteTimes then
         UIAtlas.onBorrowSpriteCallback = onBorrowedSpriteCB
     end
 end
 
+function CLLMainLua.setAndroidStatusBar()
+    printe(SystemInfo.deviceName, "====", SystemInfo.deviceModel)
+    if CLPathCfg.self.platform ~= "Android" then
+        return
+    end
+    local mode = SystemInfo.deviceModel
+    if string.find(mode, "huawei") then
+        AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
+        AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
+    else
+        ApplicationChrome.statusBarState = ApplicationChrome.States.Visible
+        ApplicationChrome.dimmed = false
+    end
+
+    -- 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.setSoftInputMode(CS.ApplicationChrome.ADJUST_RESIZE);
+end
+
 -- 当离线调用
 function CLLMainLua.onOffline()
     local ok, result = pcall(procOffLine)
@@ -107,7 +127,7 @@ function CLLMainLua.OnApplicationPause(isPause)
         GC.Collect()
     else
         -- 设置帧率
-        Application.targetFrameRate = 10
+        Application.targetFrameRate = 30
     end
     for k, v in pairs(mApplicationPauseDelegate) do
         Utl.doCallback(v, isPause)

Assets/trCRM/upgradeRes4Dev/priority/lua/net/CLLNet.lua

@@ -125,7 +125,7 @@ function CLLNet.dispatch(map)
 
     if (succ ~= NetSuccess) then
         retInfor.msg = Localization.Get(joinStr("Error_", succ))
-        MyUtl.toastE(retInfor.msg)
+        MyUtl.toastW(retInfor.msg)
         hideHotWheel()
     else
         -- success

Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua

@@ -65,7 +65,7 @@ local dispatch = function(content, params)
         printe(joinStr("cmd:[", cmd, "]code:[", code, "]msg:", msg))
         -- retInfor.msg = Localization.Get(joinStr("Error_", succ))
         if not isNilOrEmpty(msg) then
-            MyUtl.toastE(msg)
+            MyUtl.toastW(msg)
         end
         hideHotWheel()
     else
@@ -106,7 +106,7 @@ end
 
 NetProto.sendGet = function(cmd, map, callback, failedCallback, orgs, _baseUrl)
     if isNilOrEmpty(NetProto.sign) and (cmd ~= NetProto.cmds.getTokenForAPI) then
-        MyUtl.toastE("与服务器失去联络，请重试！")
+        MyUtl.toastW("与服务器失去联络，请重试！")
         NetProto.init()
         return
     end
@@ -154,7 +154,7 @@ function NetProto.init(callback)
             end
         end,
         function()
-            MyUtl.toastE("取得会话ID失败！")
+            MyUtl.toastW("取得会话ID失败！")
             Utl.doCallback(callback, false)
         end
     )

Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua

@@ -103,6 +103,8 @@ B2OutputStream = CS.Coolape.B2OutputStream
 CLAlert = CS.Coolape.CLAlert
 ---@type Coolape.AndroidStatusBar
 AndroidStatusBar = CS.Coolape.AndroidStatusBar
+---@type Coolape.ApplicationChrome
+ApplicationChrome = CS.ApplicationChrome
 
 ---other
 ---@type MyMain

Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/KKLogListener.lua

@@ -4,7 +4,7 @@ KKLogListener = {}
 function KKLogListener.OnLogError(log)
     -- 当有异常日志时
     if MyUtl then
-        MyUtl.toastE("有异常日志，请在屏幕画圈查看详细！")
+        MyUtl.toastW("有异常日志，请在屏幕画圈查看详细！")
     end
 end