modify

Assets/trCRM/Resources/Atlas/EmptyAtlas.prefab

@@ -46,7 +46,7 @@ MonoBehaviour:
   material: {fileID: 0}
   mSprites: []
   mPixelSize: 1
-  mReplacement: {fileID: 0}
+  mReplacement: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
   mCoordinates: 0
   sprites: []
   _isBorrowSpriteMode: 1

Assets/trCRM/Scripts/public/NPinyin.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: b63928a5a1f84442caf50f72c6d11e47
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/Scripts/xLua/XluaGenCodeConfig.cs

@@ -208,6 +208,7 @@ public static class XluaGenCodeConfig
 		typeof(MyCamera),
 		typeof(MyFileOpen),
 		typeof(TextureFormat),
+		typeof(FileInfo),
 	};
 
 	//C#静态调用Lua的配置（包括事件的原型），仅可以配delegate，interface

Assets/trCRM/serversCfg/servers.json

@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29004, "androidVer":"77b5a72418df6d6852092b2427a37656", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"ff78bbd5751a99f2fd109e9f64bb7470", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"ff78bbd5751a99f2fd109e9f64bb7470", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29004, "androidVer":"d348e970d6ec52a9cd5f8c2039cbcefd", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"d348e970d6ec52a9cd5f8c2039cbcefd", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"49a8c514f675dc39ba88795e36da4ce3", "port":29000, "androidVer":"d348e970d6ec52a9cd5f8c2039cbcefd", "isDev":0}}}

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/gongsi.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: ad27e546e898e437d8706352b7c32ac4
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/gou.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 95f4fc1f8ff4c43dd904910d851797c8
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/other/uiAtlas/order/xiaji.png.meta

@@ -0,0 +1,88 @@
+fileFormatVersion: 2
+guid: 28000020ff34442479b37b0ec3a2a5fd
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 9
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 2
+    aniso: 1
+    mipBias: -100
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 2
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/priority/atlas/atlasAllReal.prefab

@@ -2047,6 +2047,48 @@ MonoBehaviour:
     paddingTop: 0
     paddingBottom: 0
     path: trCRM/upgradeRes4Dev/other/uiAtlas/work/wenjian-icon.png
+  - name: order_xiaji
+    x: 0
+    y: 0
+    width: 44
+    height: 40
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/xiaji.png
+  - name: order_gongsi
+    x: 0
+    y: 0
+    width: 64
+    height: 56
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/gongsi.png
+  - name: order_gou
+    x: 0
+    y: 0
+    width: 44
+    height: 40
+    borderLeft: 0
+    borderRight: 0
+    borderTop: 0
+    borderBottom: 0
+    paddingLeft: 0
+    paddingRight: 0
+    paddingTop: 0
+    paddingBottom: 0
+    path: trCRM/upgradeRes4Dev/other/uiAtlas/order/gou.png
   mPixelSize: 1
   mReplacement: {fileID: 0}
   mCoordinates: 0

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

@@ -73,9 +73,10 @@ function CLLMainLua.setAndroidStatusBar()
         return
     end
     local mode = SystemInfo.deviceModel
-    if string.find(string.upper(mode), "HUAWEI")
-        and "HUAWEI BAC-TL00" ~= mode -- 齐川的手机
-     then
+    if string.find(string.upper(mode), "HUAWEI") and "HUAWEI BAC-TL00" ~= mode then -- 齐川的手机
+        AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
+        AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
+    elseif "OPPO PCCM00" == mode then
         AndroidStatusBar.setFlags(AndroidStatusBar.WINDOW_FLAG_FORCE_NOT_FULLSCREEN)
         AndroidStatusBar.setColor(AndroidStatusBar.DEFAULT_BACKGROUND_COLOR)
     else

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

@@ -1,4 +1,4 @@
-DBTextures = {}
+DBAttachment = {} -- 附件相关
 local db = {}
 
 local dbUploadStatus = {}
@@ -6,14 +6,16 @@ local isUploading = {}
 local isDownoading = {}
 local downloadCallback = {}
 local downloadDir = Utl.chgToSDCard(Path.Combine(Application.persistentDataPath, CLPathCfg.self.basePath, "download"))
+local _TimeOutSec = 6 * 60 * 60 * 1000
+local invokeSec = 60
 
-function DBTextures.init()
-    InvokeEx.cancelInvoke(DBTextures.releaseTimeout)
-    InvokeEx.invoke(DBTextures.releaseTimeout, 60)
+function DBAttachment.init()
+    InvokeEx.cancelInvoke(DBAttachment.releaseTimeout)
+    InvokeEx.invoke(DBAttachment.releaseTimeout, invokeSec)
 end
 
-function DBTextures.clean()
-    InvokeEx.cancelInvoke(DBTextures.releaseTimeout)
+function DBAttachment.clean()
+    InvokeEx.cancelInvoke(DBAttachment.releaseTimeout)
     for k, v in ipairs(db) do
         GameObject.DestroyImmediate(v)
     end
@@ -29,17 +31,33 @@ function DBTextures.clean()
     dbUploadStatus = {}
 end
 
-function DBTextures.releaseTimeout()
+function DBAttachment.releaseTimeout()
     for k, v in ipairs(db) do
-        if DateEx.nowMS - v.lastUseTime > 300000 then
+        if DateEx.nowMS - v.lastUseTime > 3000000 then
             GameObject.DestroyImmediate(v.texture)
             db[k] = nil
         end
     end
+
+    -- 删掉超时的文件
+    local files = FileEx.GetFiles(downloadDir)
+    local count = files.Length
+    for i = 0, count - 1 do
+        ---@type System.IO.FileInfo
+        local fi = FileInfo(files[i])
+        if fi then
+            local diff = (DateTime.Now:ToFileTime() - fi.LastAccessTime:ToFileTime()) / 10000
+            if diff > _TimeOutSec then
+                FileEx.Delete(files[i])
+            end
+        end
+    end
+
+    InvokeEx.invoke(DBAttachment.releaseTimeout, invokeSec)
 end
 
 ---@return UnityEngine.UnityWebRequest
-function DBTextures.getByUrl(url, callback, orgs)
+function DBAttachment.getByUrl(url, callback, orgs)
     local tt = db[url]
     if tt then
         tt.lastUseTime = DateEx.nowMS
@@ -65,7 +83,7 @@ function DBTextures.getByUrl(url, callback, orgs)
     return request
 end
 
-function DBTextures.upload(path, uploadPath, finishCallback)
+function DBAttachment.upload(path, uploadPath, finishCallback)
     local key = joinStr(path, "_", uploadPath)
     if (not dbUploadStatus[key]) and (not isUploading[key]) then
         local www =
@@ -91,7 +109,7 @@ function DBTextures.upload(path, uploadPath, finishCallback)
     end
 end
 
-function DBTextures.cancelUpload(path, uploadPath)
+function DBAttachment.cancelUpload(path, uploadPath)
     local key = joinStr(path, "_", uploadPath)
     local www = isUploading[key]
     if www then
@@ -102,7 +120,7 @@ function DBTextures.cancelUpload(path, uploadPath)
     end
 end
 
-function DBTextures.hadDownloaded(name)
+function DBAttachment.hadDownloaded(name)
     local localPath = Path.Combine(downloadDir, name)
     if File.Exists(localPath) then
         return true, localPath
@@ -110,7 +128,7 @@ function DBTextures.hadDownloaded(name)
     return false, localPath
 end
 
-function DBTextures.download(name, url, callback)
+function DBAttachment.download(name, url, callback)
     downloadCallback[name] = callback
     if isDownoading[name] then
         return isDownoading[name]
@@ -153,4 +171,4 @@ function DBTextures.download(name, url, callback)
     return www
 end
 
-return DBTextures
+return DBAttachment

Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBAttachment.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cac9f1511b28342cf8dcf803d0838654
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -4,14 +4,14 @@ require "db.DBCust"
 require "db.DBStatistics"
 require "db.DBUser"
 require "db.DBOrder"
-require "db.DBTextures"
+require "db.DBAttachment"
 
 ---@class DBRoot
 DBRoot = {}
 DBRoot.db = {}
 DBRoot.init = function()
     DBMessage.init()
-    DBTextures.init()
+    DBAttachment.init()
     NetProto.setReceiveCMDCallback(DBRoot.onReceiveData)
 end
 
@@ -20,7 +20,7 @@ DBRoot.clean = function()
     DBMessage.clean()
     DBCust.clean()
     DBStatistics.clean()
-    DBTextures.clean()
+    DBAttachment.clean()
 end
 
 DBRoot.funcs = {

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

@@ -3,6 +3,8 @@
 ---@field loginName
 ---@field groupId
 ---@field imageUrl string 头像
+---@field char string 首字母
+
 DBUser = {}
 local db = {}
 local icons = {}
@@ -22,13 +24,17 @@ function DBUser.clean()
     rolePermission = {}
 end
 
-function DBUser.onGetUsers(list, groupList, permissions)
+function DBUser.onGetUsers(userlist, groupList, permissions)
     local options = ArrayList()
     local values = ArrayList()
     db.filters = {}
     local name
     db.filters[DBUser.FilterGroup.user] = {}
-    for i, v in ipairs(list) do
+
+    --------------------------------------------
+    for i, v in ipairs(userlist) do
+        v.PY = CLUIFormUtl.GetChineseSpell(v.loginName) -- 拼音首字母
+        v.PYFirst = v.PY[1] -- 设置首字母
         if v.loginName == "系统生成" then
             name = joinStr(v.loginNo, "_", v.loginName)
         else
@@ -62,6 +68,20 @@ function DBUser.onGetUsers(list, groupList, permissions)
     for i, v in ipairs(permissions) do
         rolePermission[v] = true
     end
+    DBUser.wrapUserList(userlist, groupList)
+end
+
+function DBUser.wrapUserList(userlist, groupList)
+    table.sort(
+        userlist,
+        function(a, b)
+            return string.byte(a.PY) < string.byte(b.PY)
+        end
+    )
+
+    -- for i, v in ipairs(userlist) do
+    --     printe(v.PY)
+    -- end
 end
 
 function DBUser.getFilters(group)

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

@@ -280,7 +280,8 @@ MyFileOpen = CS.MyFileOpen
 TextureFormat = CS.UnityEngine.TextureFormat
 ---@type UnityEngine.ImageConversion
 ImageConversion = CS.UnityEngine.ImageConversion
-
+---@type System.IO.FileInfo
+FileInfo = CS.System.IO.FileInfo
 -------------------------------------------------------
 
 -------------------------------------------------------

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

@@ -35,6 +35,7 @@ MyUtl.setContentView = function(go, top, bottom)
         panel.clipOffset = Vector2.zero
         panel.baseClipRegion = MyUtl.getUIContent(panel, top, bottom)
     end
+    return panel.baseClipRegion
 end
 
 MyUtl.getSizeAdjust = function()
@@ -77,7 +78,7 @@ MyUtl.callCust = function(cust)
         MyUtl.doCall(cust.custId, cust.phoneNo, cust)
     end
 end
-
+---public 云拨号
 MyUtl.doCall = function(custId, phoneNo, cust)
     showHotWheel("拨号中...")
     NetProto.send.bi_call(
@@ -94,6 +95,16 @@ MyUtl.doCall = function(custId, phoneNo, cust)
     )
 end
 
+---public 调用系统拨打电话
+MyUtl.callCustByNative = function(phoneNo, cust)
+    if CLUIFormUtl.callPhone then
+        CLUIFormUtl.callPhone(phoneNo)
+    else
+        Application.OpenURL(joinStr( "tel:", phoneNo))
+    end
+    getPanelAsy("PanelNewFollowSimple", onLoadedPanelTT, cust)
+end
+
 MyUtl.toast = function(msg, staySec)
     CLToastRoot.toast(msg, CLToastRoot.Type.normal, staySec)
 end

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua

@@ -35,7 +35,7 @@ function _cell.show(go, data)
     SetActive(uiobjs.DownloadProgress.gameObject, false)
 
     --//TODO:权限判断，如果有权限的可以考虑直接显示图片
-    if DBTextures.hadDownloaded(mData.name) then
+    if DBAttachment.hadDownloaded(mData.name) then
         SetActive(uiobjs.ButtonDownload, false)
         SetActive(uiobjs.SpriteRight, true)
     else
@@ -57,7 +57,7 @@ function _cell.download()
     isDownLoading = true
     SetActive(uiobjs.ButtonDownload, false)
     www =
-        DBTextures.download(
+        DBAttachment.download(
         mData.name,
         mData.url,
         function(content, localPath)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellImage.lua

@@ -38,7 +38,7 @@ function _cell.show(go, data)
     if uiobjs.texture.mainTexture and uiobjs.texture.mainTexture.name == mData.path then
     else
         _cell.release()
-        DBTextures.getByUrl(url, _cell.onGetTextue, mData.path)
+        DBAttachment.getByUrl(url, _cell.onGetTextue, mData.path)
     end
     
     SetActive(uiobjs.success.gameObject, false)
@@ -48,7 +48,7 @@ end
 function _cell.upload()
     SetActive(uiobjs.Failed.gameObject, false)
     www =
-        DBTextures.upload(
+        DBAttachment.upload(
         mData.path,
         DBOrder.getUploadPath(),
         function(content)
@@ -107,7 +107,7 @@ end
 function _cell.uiEventDelegate(go)
     if go.name == "ButtonDel" then
         csSelf:cancelInvoke4Lua(_cell.refreshProgress)
-        DBTextures.cancelUpload(mData.path, DBOrder.getUploadPath())
+        DBAttachment.cancelUpload(mData.path, DBOrder.getUploadPath())
         www = nil
         Utl.doCallback(mData.onDelete, mData)
     elseif go.name == "ButtonReload" then

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellRecord.lua

@@ -21,6 +21,8 @@ end
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
     mData = data
+    mData._callerno = MyUtl.hidePhone(mData.callerno)
+    mData._destno = MyUtl.hidePhone(mData.destno)
     uiobjs.formRoot:setValue(mData)
     if not isNilOrEmpty(mData.recordfile) then
         SetActive(uiobjs.ButtonPlayVoice.gameObject, true)

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellUserList.lua

@@ -0,0 +1,33 @@
+-- xx单元
+local _cell = {}
+---@type Coolape.CLCellLua
+local csSelf = nil
+local transform = nil
+local mData = nil
+local uiobjs = {}
+
+-- 初始化，只调用一次
+function _cell.init(csObj)
+    csSelf = csObj
+    transform = csSelf.transform
+    --[[
+    上的组件：getChild(transform, "offset", "Progress BarHong"):GetComponent("UISlider");
+    --]]
+end
+
+-- 显示，
+-- 注意，c#侧不会在调用show时，调用refresh
+function _cell.show(go, data)
+    mData = data
+    --[[
+    TODO:
+    --]]
+end
+
+-- 取得数据
+function _cell.getData()
+    return mData
+end
+
+--------------------------------------------
+return _cell

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellUserList.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7b643c7c6e0b84e33b2df87e36f47099
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -0,0 +1,103 @@
+-- xx界面
+local CLLPSendSms = {}
+
+---@type Coolape.CLPanelLua
+local csSelf = nil
+---@type UnityEngine.Transform
+local transform = nil
+local uiobjs = {}
+---@type _DBCust
+local mdata
+
+-- 初始化，只会调用一次
+function CLLPSendSms.init(csObj)
+    csSelf = csObj
+    transform = csObj.transform
+    ---@type CLUIFormRoot
+    uiobjs.offset = getCC(transform, "Bottom/offset", "CLUIFormRoot")
+    uiobjs.InputContentCell = getCC(uiobjs.offset.transform, "InputContent", "CLCellLua")
+
+    local attr = {}
+    attr.attrName = "短信内容"
+    attr.id = "body"
+    attr.attrType = DBCust.FieldType.multext
+    attr.ifMust = 1
+    attr.donotJoinKey = true
+
+    ---@type _ParamCellExtendFiled
+    local param = {}
+    param.attr = attr
+    uiobjs.InputContentCell:init(param, nil)
+end
+
+-- 设置数据
+function CLLPSendSms.setData(paras)
+    mdata = paras
+end
+
+--当有通用背板显示时的回调
+function CLLPSendSms.onShowFrame()
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function CLLPSendSms.show()
+    uiobjs.offset:setValue({})
+end
+
+-- 刷新
+function CLLPSendSms.refresh()
+end
+
+-- 关闭页面
+function CLLPSendSms.hide()
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function CLLPSendSms.procNetwork(cmd, succ, msg, paras)
+    --[[
+    if(succ == NetSuccess) then
+      if(cmd == "xxx") then
+        -- TODO:
+      end
+    end
+    --]]
+end
+
+-- 处理ui上的事件，例如点击等
+function CLLPSendSms.uiEventDelegate(go)
+    local goName = go.name
+    if goName == "ButtonClose" then
+        hideTopPanel(csSelf)
+    elseif goName == "ButtonYunSend" then
+        local err = uiobjs.offset:checkValid()
+        if not isNilOrEmpty(err) then
+            MyUtl.toastW(err)
+            return
+        end
+        local data = uiobjs.offset:getValue(true)
+        MyUtl.toastW("//TODO:云发短信的接口")
+    elseif goName == "ButtonNativeSend" then
+        local err = uiobjs.offset:checkValid()
+        if not isNilOrEmpty(err) then
+            MyUtl.toastW(err)
+            return
+        end
+        local data = uiobjs.offset:getValue(true)
+        Application.OpenURL(joinStr("sms:", mdata.phoneNo, "?body=", data.body))
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function CLLPSendSms.onTopPanelChange(topPanel)
+end
+
+-- 当按了返回键时，关闭自己（返值为true时关闭）
+function CLLPSendSms.hideSelfOnKeyBack()
+    if NetProto and csSelf then
+        NetProto.removePanelListener(csSelf)
+    end
+    return true
+end
+
+--------------------------------------------
+return CLLPSendSms

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CLLPSendSms.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b86511a64e1c345c0b24a673a1f312e3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -168,8 +168,8 @@ end
 -- 更新安装游戏
 function CLLPSplash.upgradeGame(url)
     if not isNilOrEmpty(url) then
-        -- Application.OpenURL(url)
-        MyUtl.installNewApk(url)
+        Application.OpenURL(url)
+        -- MyUtl.installNewApk(url)
     end
 end
 

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

@@ -48,6 +48,9 @@ function TRPConnect.procNetwork(cmd, succ, msg, paras)
         if (cmd == "connect") then
             -- socket正常
             require "db.DBRoot"
+            if DBRoot then
+                DBRoot.clean()
+            end
             DBRoot.init()
             TRPConnect.getDataFromServer()
         end
@@ -66,9 +69,6 @@ end
 
 ---public 从服务器取得数据
 function TRPConnect.getDataFromServer()
-    if DBRoot then
-        DBRoot.clean()
-    end
     NetProto.send.filter_customers(
         function(content)
             if content.success then

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

@@ -536,7 +536,7 @@ function TRPCustDetail:procNetwork(cmd, succ, msg, paras)
                     uiobjs.OrderRoot:appendList(result.data)
                 end
             end
-        elseif cmd == NetProto.cmds.update_customer then
+        elseif cmd == NetProto.cmds.update_customer or cmd == NetProto.cmds.create_followUp_record then
             if self.currToggle == 1 then
                 self:showDetail()
                 uiobjs.Head:setValue(self.mdata)
@@ -548,6 +548,14 @@ function TRPCustDetail:procNetwork(cmd, succ, msg, paras)
             if self.currToggle == 3 then
                 self:showOrders()
             end
+        elseif cmd == NetProto.cmds.get_customerById then
+            if self.mdata.custId == paras.result.custId then
+                self.mdata = paras.result
+                if self.currToggle == 1 then
+                    self:showDetail()
+                    uiobjs.Head:setValue(self.mdata)
+                end
+            end
         end
     end
 end

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

@@ -221,7 +221,7 @@ function TRPCustList:procNetwork(cmd, succ, msg, paras)
             hideHotWheel()
         elseif cmd == NetProto.cmds.update_customer then
             uiobjs.Grid:refreshContentOnly()
-        elseif cmd == NetProto.cmds.save_customer then
+        elseif cmd == NetProto.cmds.save_customer or cmd == NetProto.cmds.create_followUp_record then
             self:refreshList()
         elseif cmd == NetProto.cmds.delCustomerInfo or cmd == NetProto.cmds.backToGH then
             self:refreshList()

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

@@ -49,6 +49,7 @@ function TRPMoreProc4Cust:setEventDelegate()
             hideTopPanel(self.csSelf)
         end,
         ButtonSendSM = function()
+            getPanelAsy("PanelSendSms", onLoadedPanelTT, self.mdata)
         end,
         ButtonMovetoOcean = function()
             MyUtl.confirm(

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

@@ -265,6 +265,7 @@ function TRPNewFollow:setEventDelegate()
                             -- 刷新预约的状态
                             self.bookingData.bookingDone = "1"
                         end
+                        NetProto.send.get_customerById(self.cust.custId)
                         MyUtl.toastS("保存成功")
                         hideTopPanel(self.csSelf)
                     end

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

@@ -294,7 +294,7 @@ function TRPOrderDetail:initAttachmentCell(cell, data)
 end
 
 function TRPOrderDetail:onClickAttachment(cell, data)
-    local had, path = DBTextures.hadDownloaded(data.name)
+    local had, path = DBAttachment.hadDownloaded(data.name)
     if had then
         CLUIUtl.showConfirm(
             joinStr("附件已保存本地：", path),

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

@@ -26,6 +26,8 @@ end
 ---@param paras _ParamTRPPlaySoundRecord
 function TRPPlaySoundRecord:setData(paras)
     self.mdata = paras
+    self.mdata._callerno = MyUtl.hidePhone(self.mdata.callerno)
+    self.mdata._destno = MyUtl.hidePhone(self.mdata.destno)
 end
 
 -- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh

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

@@ -114,5 +114,10 @@ end
 function TRPSelectCompany:onTopPanelChange(topPanel)
 end
 
+-- 当按了返回键时，关闭自己（返值为true时关闭）
+function TRPSelectCompany:hideSelfOnKeyBack()
+    return false
+end
+
 --------------------------------------------
 return TRPSelectCompany

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

@@ -0,0 +1,201 @@
+---@type IDBasePanel
+local TRBasePanel = require("ui.panel.TRBasePanel")
+---@class TRPUserList:TRBasePanel 邮件列表
+local TRPUserList = class("TRPUserList", TRBasePanel)
+local _charList = {
+    "A",
+    "B",
+    "C",
+    "D",
+    "E",
+    "F",
+    "G",
+    "H",
+    "I",
+    "J",
+    "K",
+    "L",
+    "M",
+    "N",
+    "O",
+    "P",
+    "Q",
+    "R",
+    "S",
+    "T",
+    "U",
+    "V",
+    "W",
+    "X",
+    "Y",
+    "Z",
+    "#"
+}
+local uiobjs = {}
+-- 初始化，只会调用一次
+function TRPUserList:init(csObj)
+    TRPUserList.super.init(self, csObj)
+    self:setEventDelegate()
+    self:initFilters()
+    MyUtl.setContentView(
+        getChild(self.transform, "PanelContent"),
+        MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 160 + 40,
+        0
+    )
+    uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")
+    ---@type CLUIScrollViewWithEvent
+    uiobjs.scrollView = getCC(self.transform, "PanelContent", "UIScrollView")
+    uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
+    ---@type Coolape.CLUILoopTable
+    uiobjs.Grid = getCC(uiobjs.scrollView.transform, "Grid", "CLUILoopTable")
+
+    uiobjs.indexGrid = getChild(self.transform, "AnchorTopRight/PanelScrollBar/Grid"):GetComponent("UIGrid")
+    uiobjs.indexPrefab = getChild(uiobjs.indexGrid.transform, "00000").gameObject
+end
+
+-- 设置数据
+---@param paras _ParamTRPUserList
+function TRPUserList:setData(paras)
+    self.mdata = paras or {}
+end
+
+-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
+function TRPUserList:show()
+    uiobjs.InputSeachKey.value = ""
+
+    local bottomHeight = 0
+    if self.mdata.isSelectMode then
+        bottomHeight = 180
+    end
+    local v4 =
+        MyUtl.setContentView(
+        getChild(self.transform, "PanelContent"),
+        MyUtl.defaultTopHeight + MyUtl.defaultTopHeight + 160 + 40,
+        bottomHeight
+    )
+    uiobjs.indexGrid.cellHeight = NumEx.getIntPart(v4.w / 27)
+
+    self:showList({})
+end
+
+function TRPUserList:showList(list)
+    list = list or {}
+    SetActive(uiobjs.ButtonHeadList.gameObject, false)
+    if #list > 0 then
+        SetActive(uiobjs.ButtonEndList.gameObject, false)
+    else
+        SetActive(uiobjs.ButtonEndList.gameObject, true)
+    end
+    uiobjs.Grid:setList(
+        list or {},
+        self:wrapFunc(self.initCell),
+        self:wrapFunc(self.onHeadList),
+        self:wrapFunc(self.onEndList)
+    )
+
+    self:reposition()
+    self.csSelf:invoke4Lua(self.reposition, 0.1)
+end
+
+function TRPUserList:reposition()
+    uiobjs.scrollView:ResetPosition()
+end
+
+function TRPUserList:appList(list)
+    SetActive(uiobjs.ButtonEndList.gameObject, false)
+    uiobjs.Grid:appendList(list)
+end
+
+function TRPUserList:initCell(cell, data)
+    cell:init(data, self:wrapFunc(self.onClickCell))
+end
+
+function TRPUserList:onClickCell(cell, data)
+    -- getPanelAsy("PanelOrderDetail", onLoadedPanelTT, data)
+end
+
+function TRPUserList:setIndexs()
+    local onClickCell = function(cell)
+        local d = cell.luaTable.getData()
+        local index = d.index
+        if (index >= 0) then
+            local userList = GLData.userList
+            local listPart1 = {}
+            for i = index, #userList do
+                table.insert(listPart1, userList[i])
+            end
+            CLLPUserList.setList(listPart1)
+
+            local listPart2 = {}
+            for i = 1, index - 1 do
+                table.insert(listPart2, userList[i])
+            end
+            uiobjs.Grid:insertList(listPart2, false, true)
+        end
+    end
+
+    local initCell = function(cell, data)
+        local label = getChild(cell.transform, "Label"):GetComponent("UILabel")
+        local boxCollider = cell:GetComponent("BoxCollider")
+        boxCollider.center = Vector3(0, -uiobjs.indexGrid.cellHeight / 2, 0)
+        boxCollider.size = Vector3(uiobjs.indexGrid.cellWidth, uiobjs.indexGrid.cellHeight, 0)
+        local d = GLData.userCharMap[data]
+        cell:init(d, onClickCell)
+        label.text = data
+    end
+
+    CLUIUtl.resetList4Lua(uiobjs.indexGrid, uiobjs.indexPrefab, _charList, initCell)
+end
+
+-- 刷新
+function TRPUserList:refresh()
+end
+
+-- 关闭页面
+function TRPUserList:hide()
+    self.filterValue = nil
+end
+
+-- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
+function TRPUserList:procNetwork(cmd, succ, msg, paras)
+    if (succ == NetSuccess) then
+        if cmd == NetProto.cmds.workFlowQuery then
+            local result = paras.result or {}
+            self.pageInfo = result.meta
+            if self.pageInfo and self.pageInfo.current_page > 1 then
+                self:appList(result.data)
+            else
+                self:showList(result.data)
+            end
+            hideHotWheel()
+        elseif cmd == NetProto.cmds.update_customer then
+            uiobjs.Grid:refreshContentOnly()
+        elseif cmd == NetProto.cmds.save_customer then
+            self:refreshList()
+        end
+    end
+end
+
+function TRPUserList:setEventDelegate()
+    self.EventDelegate = {
+        InputSeachKey = function()
+            local queryKey = uiobjs.InputSeachKey.value
+            NetProto.send.workFlowQuery(self.filterValue, queryKey, 1)
+        end
+    }
+end
+
+-- 处理ui上的事件，例如点击等
+function TRPUserList:uiEventDelegate(go)
+    local func = self.EventDelegate[go.name]
+    if func then
+        func()
+    end
+end
+
+-- 当顶层页面发生变化时回调
+function TRPUserList:onTopPanelChange(topPanel)
+end
+
+--------------------------------------------
+return TRPUserList

Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPUserList.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 14ec618d628f74d1986170382f6e0e22
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelCustDetail.prefab

@@ -17,7 +17,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1177340836
 Transform:
   m_ObjectHideFlags: 0
@@ -4898,7 +4898,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3050677561645679325}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 482, y: 70, z: 0}
+  m_LocalPosition: {x: 483, y: 70, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1558906886}
@@ -4985,7 +4985,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: destno
+  jsonKey: _destno
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 
@@ -8622,7 +8622,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5236849235535661990}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 382, y: -100, z: 0}
+  m_LocalPosition: {x: 383, y: -100, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1558906886}
@@ -9766,7 +9766,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: callerno
+  jsonKey: _callerno
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 
@@ -10634,7 +10634,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3004
+  startingRenderQueue: 3000
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -13692,7 +13692,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8660845382695000543}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 482, y: 140, z: 0}
+  m_LocalPosition: {x: 483, y: 140, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1558906886}
@@ -14517,7 +14517,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3014
+  startingRenderQueue: 3010
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 3

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMoreProc4Cust.prefab

@@ -210,7 +210,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 499400275736742615}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -420, y: -200, z: 0}
+  m_LocalPosition: {x: -700, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1221806652923567659}
@@ -1285,7 +1285,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5302636813556190272}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -140, y: -0, z: 0}
+  m_LocalPosition: {x: -420, y: -0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 3074551617188155498}
@@ -1534,7 +1534,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6010324266785203443}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -700, y: -0, z: 0}
+  m_LocalPosition: {x: -280, y: -0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6227542931138195830}
@@ -1699,7 +1699,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6545508908313909632}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -700, y: -200, z: 0}
+  m_LocalPosition: {x: -980, y: -200, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1151304663116218500}
@@ -2333,7 +2333,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7553703605476557833}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -280, y: -0, z: 0}
+  m_LocalPosition: {x: 0, y: -0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4948126674344885475}
@@ -2414,7 +2414,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7811480330925744859}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 280, y: -0, z: 0}
+  m_LocalPosition: {x: 0, y: -0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2706796553119845174}
@@ -2495,7 +2495,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7816656800586324046}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -0, z: 0}
+  m_LocalPosition: {x: 280, y: -0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 5137697459384881279}

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelPlaySoundRecord.prefab

@@ -346,7 +346,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: callerno
+  jsonKey: _callerno
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 
@@ -636,7 +636,7 @@ MonoBehaviour:
   anchorOffset: 0
   softBorderPadding: 1
   renderQueue: 0
-  startingRenderQueue: 3004
+  startingRenderQueue: 3000
   mClipTexture: {fileID: 0}
   mAlpha: 1
   mClipping: 0
@@ -1986,7 +1986,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: faeca5bfa217c493c8446b842f01a3fa, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  jsonKey: destno
+  jsonKey: _destno
   formatValue: 
   labeName: {fileID: 0}
   defaultName: 

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSendSms.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 840626d5c320544979a5de2f23223337
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelUserList.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 241f3c46a73634087a6497b0ef050bcf
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/gongsi.unity3d.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 0c5a5751e2f924a6abdab89e00841a0f
+guid: 5046ee4194efd45178a8a842be121f5f
 DefaultImporter:
   externalObjects: {}
   userData: 

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/gou.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: e70b82ec252e74081b7835c69c20805c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xiaji.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d7f45f21143fb43e38989471e0cddcd1
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBAttachment.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 99f263ff07a514a9cbdc1d63fd800951
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellUserList.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1390ec146040b43f081037faf7efa1bc
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPSendSms.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: cdd85ebad1f9b499cbad4afdc4016fa8
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPUserList.lua.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2872b898e98174fb9911d6cbb4776a61
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSendSms.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5e57b41a1f684405383a43089b5889fb
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelUserList.unity3d.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: bf1258da67a0c428b8770d98e2fb1899
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,9cb494cde4e58ba1a0e493fa24037e508	%trCRM/resVer/Android/VerCtl/other.ver8,0a763b03453ce762f67786f8d8aee352
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,acdad37bbb9e0e5413360621105c40778	%trCRM/resVer/Android/VerCtl/other.ver8,5094ef5ef543efb04468fbc566ded853