From 0b577c501c54e64d1b3a624fe7de476af354d46d Mon Sep 17 00:00:00 2001
From: chenbin <chbin12@126.com>
Date: Tue, 18 Aug 2020 09:43:15 +0800
Subject: [PATCH] mm

---
 Assets/3rd/AndroidOpener/Plugins/release.aar  | Bin 1231447 -> 1231447 bytes
 .../upgradeRes4Dev/priority/lua/db/DBUser.lua |  49 ++++++++++++++++--
 .../priority/lua/ui/panel/TRPSetting.lua      |   4 +-
 .../ui/panel/PanelMoreProc4Cust.prefab        |   2 +-
 4 files changed, 48 insertions(+), 7 deletions(-)

diff --git a/Assets/3rd/AndroidOpener/Plugins/release.aar b/Assets/3rd/AndroidOpener/Plugins/release.aar
index e152c0bf4ed7995d4fadbb32a5d9ac62c6cef786..ccb272fc2ec2058599059f035894e880a9a1bd1b 100644
GIT binary patch
delta 78
zcmcaU#rygc?}iq}7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQEkd<NnQqlh
duRkjE3`lQJKPHsK3=%kfQpgcR^PLj%1ORw39xwm^

delta 78
zcmcaU#rygc?}iq}7N!>F7M2#)7Pc1l7LFFq7OocV7M>Q~7QPn#7J(MQEkd<NnO;Op
duRkjE3`lQJKPHsK3=%kfQpgcR^PLj%1ORb)9nb&(

diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
index a997c45..6a04f11 100644
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
@@ -3,7 +3,9 @@
 ---@field loginName
 ---@field groupId
 ---@field imageUrl string 头像
----@field char string 首字母
+---@field PY
+---@field PYFirst string 首字母
+---@field isHeadPy
 
 DBUser = {}
 local db = {}
@@ -34,7 +36,7 @@ function DBUser.onGetUsers(userlist, groupList, permissions)
     --------------------------------------------
     for i, v in ipairs(userlist) do
         v.PY = CLUIFormUtl.GetChineseSpell(v.loginName) -- 拼音首字母
-        v.PYFirst = v.PY[1] -- 设置首字母
+        v.PYFirst = string.sub(v.PY, 1, 1) -- 设置首字母
         if v.loginName == "系统生成" then
             name = joinStr(v.loginNo, "_", v.loginName)
         else
@@ -79,9 +81,46 @@ function DBUser.wrapUserList(userlist, groupList)
         end
     )
 
-    -- for i, v in ipairs(userlist) do
-    --     printe(v.PY)
-    -- end
+    db.userList = userlist
+    db.userPyIndexs = {} -- 拼音字母所在的index
+    db.groupTree = {}
+    db.userGroupList = {}
+
+    local char = ""
+    ---@param v _DBUser
+    for i, v in ipairs(userlist) do
+        if char == "" or char ~= v.PYFirst then
+            char = v.PYFirst
+            v.isHeadPy = true
+            db.userPyIndexs[v.PYFirst] = i
+        else
+            v.isHeadPy = false
+        end
+
+        local list = db.userGroupList[v.groupId] or {}
+        table.insert(list, v)
+        db.userGroupList[v.groupId] = list
+    end
+    
+    --//TODO:组装部门的数据
+end
+
+function DBUser.getUserList()
+    return db.userList
+end
+
+function DBUser.getGroupList(parentGId)
+    parentGId = parentGId or -1
+    return db.groupTree[parentGId]
+end
+
+function DBUser.getUsersByGId(groupId)
+    return db.userGroupList[groupId]
+end
+
+---public 取得拼音字母所在的index
+function DBUser.getUserPyIndex(pyChar)
+    return db.userPyIndexs[pyChar]
 end
 
 function DBUser.getFilters(group)
diff --git a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
index b7baac6..0eabe6c 100644
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSetting.lua
@@ -103,7 +103,9 @@ function TRPSetting:setEventDelegate()
                         Utl.chgToSDCard(
                         Path.Combine(Application.persistentDataPath, CLPathCfg.self.basePath, "download")
                     )
-                    Directory.Delete(downloadDir)
+                    if Directory.Exists(downloadDir) then
+                        Directory.Delete(downloadDir)
+                    end
 
                     pcall(cleanRes)
                     local panel = CLPanelManager.getPanel(CLMainBase.self.firstPanel)
diff --git a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab
index 9bcf054..eb9339c 100644
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab
@@ -1525,7 +1525,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &4350464794319423872
 Transform:
   m_ObjectHideFlags: 0