mm

Assets/trCRM/serversCfg/servers.json

@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"66fb3066ae19ba7d17942f583e33972e", "port":29006, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"66fb3066ae19ba7d17942f583e33972e", "port":29000, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"66fb3066ae19ba7d17942f583e33972e", "port":29004, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"66fb3066ae19ba7d17942f583e33972e", "port":29006, "androidVer":"264ba6c950fe927e208f8c89d684ecff", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"66fb3066ae19ba7d17942f583e33972e", "port":29000, "androidVer":"264ba6c950fe927e208f8c89d684ecff", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"66fb3066ae19ba7d17942f583e33972e", "port":29004, "androidVer":"264ba6c950fe927e208f8c89d684ecff", "isDev":0}}}

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua

@@ -8,6 +8,8 @@ local db = {}
 local icons = {}
 local poplist = {}
 local rolePermission = {}
+local getIconCallback = {}
+local isDownLoading = {}
 
 DBUser.FilterGroup = {
     user = "user",
@@ -112,21 +114,38 @@ function DBUser.getIcon(loginNo, callback)
         Utl.doCallback(callback, icons[user.imageUrl])
         return
     end
+
+    local callbacks = getIconCallback[user.imageUrl] or {}
+    callbacks[callback] = callback
+    getIconCallback[user.imageUrl] = callbacks
+
+    if isDownLoading[user.imageUrl] then
+        return
+    end
+    isDownLoading[user.imageUrl] = true
     WWWEx.get(
         user.imageUrl,
         nil,
         CLAssetType.texture,
         function(content, orgs)
-            content.name = user.imageUrl
-            icons[user.imageUrl] = content
-            Utl.doCallback(callback, content)
+            isDownLoading[user.imageUrl] = nil
+            if content then
+                content.name = user.imageUrl
+                icons[user.imageUrl] = content
+            end
+            local callbacks = getIconCallback[user.imageUrl]
+            for k, callback in pairs(callbacks) do
+                Utl.doCallback(callback, content)
+            end
+            getIconCallback[user.imageUrl] = {}
         end,
         function()
+            isDownLoading[user.imageUrl] = nil
             printe("取得头像失败")
         end,
         nil,
         true,
-        2
+        1
     )
 end
 

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMyInfor.lua

@@ -258,7 +258,7 @@ function TRPMyInfor:setEventDelegate()
             local popList = go:GetComponent("UIPopupList")
             if popList.value == "1" then
                 -- 相机
-                local permission = MyCamera.getImage(self:wrapFunc(self.onGetImage))
+                local permission = MyCamera.getImageFacing(self:wrapFunc(self.onGetImage), 256)
                 if permission ~= NativeCamera.Permission.Granted then
                     if permission == NativeCamera.Permission.ShouldAsk then
                         NativeCamera.RequestPermission()

Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,58839a7593d0cc9db0e1a5937a57e7968	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,38c6707a912481e1f76d5f6edf95c1fa8	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee