mm

2020-08-07 07:27:09 +08:00
parent 113faa50ce
commit 0fd1912998
21 changed files with 578 additions and 56 deletions
--- a/Assets/trCRM/serversCfg/servers.json
+++ b/Assets/trCRM/serversCfg/servers.json
@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29006, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29000, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29004, "androidVer":"d3c817a9c95ff778a342528bd173d418", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29006, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29000, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"28addcf7f5a124dc81aae7279b11613a", "port":29004, "androidVer":"7fad7bf0c6d777cf5417ca63d49d8f2a", "isDev":0}}}
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBTextures.lua
@@ -3,6 +3,9 @@ local db = {}

 local dbUploadStatus = {}
 local isUploading = {}
+local isDownoading = {}
+local downloadCallback = {}
+local downloadDir = Utl.chgToSDCard(Path.Combine(Application.persistentDataPath, CLPathCfg.self.basePath, "download"))

 function DBTextures.init()
    InvokeEx.cancelInvoke(DBTextures.releaseTimeout)
@@ -99,4 +102,66 @@ function DBTextures.cancelUpload(path, uploadPath)
    end
 end

+function DBTextures.hadDownloaded(name)
+    local localPath = Path.Combine(downloadDir, name)
+    if File.Exists(localPath) then
+        return true, localPath
+    end
+    return false, localPath
+end
+
+function DBTextures.download(name, url, callback)
+    downloadCallback[name] = callback
+    if isDownoading[name] then
+        return isDownoading[name]
+    end
+    local localPath = Path.Combine(downloadDir, name)
+    local _url = url
+    if File.Exists(localPath) then
+        _url = Path.Combine("file://", localPath)
+    end
+    local assetType
+    if MyUtl.isImage(name) then
+        assetType = CLAssetType.texture
+    else
+        assetType = CLAssetType.bytes
+    end
+
+    local www =
+        WWWEx.get(
+        _url,
+        nil,
+        CLAssetType.texture,
+        function(content, orgs)
+            isDownoading[name] = nil
+            if content then
+                local bytes
+                if assetType == CLAssetType.texture then
+                    bytes = content:GetRawTextureData()
+                else
+                    bytes = content
+                end
+                Directory.CreateDirectory(Path.GetDirectoryName(localPath))
+                File.WriteAllBytes(localPath, bytes)
+                Utl.doCallback(downloadCallback[name], content, localPath)
+                downloadCallback[name] = nil
+            else
+                MyUtl.toastW("下载附件为空")
+                Utl.doCallback(downloadCallback[name], content, nil)
+                downloadCallback[name] = nil
+            end
+        end,
+        function()
+            isDownoading[name] = nil
+            MyUtl.toastW("下载附件失败")
+            Utl.doCallback(downloadCallback[name], nil, nil)
+            downloadCallback[name] = nil
+        end,
+        nil,
+        true,
+        2
+    )
+    isDownoading[name] = www
+end
+
 return DBTextures
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
@@ -129,4 +129,18 @@ MyUtl.hidePhone = function(phone)
    end
 end

+MyUtl.Images = {
+    [".JPG"] = true,
+    [".JPEG"] = true,
+    [".PNG"] = true,
+    [".PDF"] = true,
+    [".BMP"] = true,
+    [".GIF"] = true,
+}
+
+---public 是图片
+MyUtl.isImage = function(path)
+    local extension = Path.GetExtension(path)
+    return MyUtl.Images[string.upper(extension)] or false
+end
 return MyUtl
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellAttachment.lua
@@ -5,6 +5,8 @@ local csSelf = nil
 local transform = nil
 local mData = nil
 local uiobjs = {}
+local isDownLoading = false
+local www

 -- 初始化，只调用一次
 function _cell.init(csObj)
@@ -13,14 +15,29 @@ function _cell.init(csObj)
    uiobjs.Label = getCC(transform, "Label", "UILabel")
    uiobjs.ButtonDel = getChild(transform, "ButtonDel").gameObject
    uiobjs.SpriteIcon = getCC(transform, "SpriteIcon", "UISprite")
+
+    uiobjs.ButtonDownload = getChild(transform, "ButtonDownload").gameObject
+    uiobjs.DownloadProgress = getChild(transform, "DownloadProgress")
+    uiobjs.DownloadProgressLb = getCC(uiobjs.DownloadProgress, "Label", "UILabel")
 end

 -- 显示，
 -- 注意，c#侧不会在调用show时，调用refresh
 function _cell.show(go, data)
    mData = data
+    SetActive(uiobjs.ButtonDel, false)
    uiobjs.Label.text = mData.name
+    if MyUtl.isImage(mData.name) then
+        --//TODO:
+    else
+    end
+
    --//TODO:权限判断，如果有权限的可以考虑直接显示图片
+    if DBTextures.hadDownloaded(mData.name) then
+        SetActive(uiobjs.ButtonDownload, false)
+    else
+        SetActive(uiobjs.ButtonDownload, true)
+    end
 end

 -- 取得数据
@@ -28,5 +45,49 @@ function _cell.getData()
    return mData
 end

+function _cell.download()
+    if isDownLoading then
+        return
+    end
+
+    isDownLoading = true
+    SetActive(uiobjs.ButtonDownload, false)
+    www =
+        DBTextures.download(
+        mData.name,
+        mData.url,
+        function(content, localPath)
+            isDownLoading = false
+            www = nil
+            if content and localPath then
+                -- 附件下载完成
+                MyUtl.toastS(joinStr("附件已保存本地：" .. localPath))
+            else
+                SetActive(uiobjs.ButtonDownload, true)
+            end
+        end
+    )
+    _cell.refreshProgress()
+end
+
+function _cell.refreshProgress()
+    if www == nil then
+        SetActive(uiobjs.DownloadProgress.gameObject, false)
+        return
+    else
+        SetActive(uiobjs.DownloadProgress.gameObject, true)
+        local progressVal = www.downloadProgress or 0 -- downloadProgress uploadProgress
+        uiobjs.LabelPersent.text = joinStr(math.floor(progressVal * 100), "%")
+    end
+
+    csSelf:invoke4Lua(_cell.refreshProgress, 0.1)
+end
+
+function _cell.uiEventDelegate(go)
+    if go.name == "ButtonDownload" then
+        _cell.download()
+    end
+end
+
 --------------------------------------------
 return _cell
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
@@ -105,10 +105,10 @@ function _cell.onFinisInitFields()
    uiobjs.Table.repositionNow = true
    hideHotWheel()

+    isLoading = false
    csSelf:invoke4Lua(
        function()
            Utl.doCallback(mData.onFinish, csSelf.gameObject)
-            isLoading = false
            -- 再次处理
            _cell.refresh()
        end,
@@ -121,6 +121,8 @@ function _cell.release()
        SetActive(v.gameObject, false)
        CLUIOtherObjPool.returnObj(v.gameObject)
    end
+    
+    isLoading = false
    fieldsObjs = {}
    count = 0
 end
@@ -144,7 +146,7 @@ end

 function _cell.OnDisable()
    if #(fieldsObjs) > 0 then
-        printe("动态加载的字段没有释放" .. csSelf.name)
+        printw("动态加载的字段没有释放" .. csSelf.name)
    end
 end
 --------------------------------------------
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderDetail.lua
@@ -294,6 +294,21 @@ function TRPOrderDetail:initAttachmentCell(cell, data)
 end

 function TRPOrderDetail:onClickAttachment(cell, data)
+    local had, path = DBTextures.hadDownloaded(data.name)
+    if had then
+        CLUIUtl.showConfirm(
+            joinStr("附件已保存本地：", path),
+            false,
+            "打开",
+            function()
+                Application.OpenURL(joinStr("file://", path))
+            end,
+            "取消",
+            nil
+        )
+    else
+        MyUtl.toastW("附件未下载完成，暂时无法查看")
+    end
 end

 function TRPOrderDetail:showRecords()
@@ -493,7 +508,6 @@ function TRPOrderDetail:addAttachment(go)
    end
 end

-
 function TRPOrderDetail:onGetImage(path)
    if isNilOrEmpty(path) then
        return
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
@@ -487,7 +487,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 196174554914487288}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -132, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6081736162149425773}
@@ -1103,7 +1103,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 473791057614103523}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -31400.748, y: -30.904175, z: 0}
+  m_LocalPosition: {x: -31532.748, y: -30.904175, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 4805047464567458223}
@@ -1158,6 +1158,238 @@ MonoBehaviour:
  isPause: 0
  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
  isNeedResetAtlase: 1
+--- !u!1 &505517071713258037
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1360912303918495723}
+  - component: {fileID: 3834450592202181646}
+  - component: {fileID: 8497169072743663993}
+  - component: {fileID: 8198695786030183274}
+  m_Layer: 5
+  m_Name: ButtonDownload
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1360912303918495723
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_LocalRotation: {x: 0, y: 0, z: 1, w: -0.00000004371139}
+  m_LocalPosition: {x: 88, y: -88, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1467516596806451442}
+  m_RootOrder: 4
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &3834450592202181646
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 260, y: 260, z: 0}
+  m_Center: {x: 88.91, y: -88.6, z: 0}
+--- !u!114 &8497169072743663993
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  tweenTarget: {fileID: 505517071713258037}
+  hover: {r: 0.88235295, g: 0.78431374, b: 0.5882353, a: 1}
+  pressed: {r: 0.7176471, g: 0.6392157, b: 0.48235294, a: 1}
+  disabledColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+  duration: 0.2
+  skipColorEffect: 1
+  dragHighlight: 0
+  hoverSprite: 
+  pressedSprite: 
+  disabledSprite: 
+  hoverSprite2D: {fileID: 0}
+  pressedSprite2D: {fileID: 0}
+  disabledSprite2D: {fileID: 0}
+  pixelSnap: 0
+  onClick:
+  - mTarget: {fileID: 5746343202289990627}
+    mMethodName: uiEventDelegate
+    mParameters:
+    - obj: {fileID: 0}
+      field: 
+      name: go
+    oneShot: 0
+--- !u!114 &8198695786030183274
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 505517071713258037}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
+  mPivot: 4
+  mWidth: 60
+  mHeight: 60
+  mDepth: 7
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 1
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: order_upload
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!1 &565501314856477289
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 3074807661475435551}
+  - component: {fileID: 2409807572937764693}
+  - component: {fileID: 4581390671853285643}
+  m_Layer: 5
+  m_Name: Sprite
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3074807661475435551
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565501314856477289}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 707187227634174975}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2409807572937764693
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565501314856477289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 200
+  mHeight: 200
+  mDepth: 5
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 1
+  mType: 0
+  mFillDirection: 4
+  mFillAmount: 1
+  mInvert: 0
+  mFlip: 0
+  centerType: 1
+  leftType: 1
+  rightType: 1
+  bottomType: 1
+  topType: 1
+  atlasName: atlasAllReal
+  mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
+  mSpriteName: hotwheel_loading
+  mFillCenter: 1
+  isGrayMode: 0
+--- !u!114 &4581390671853285643
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 565501314856477289}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cf6484591c9cb0e409f5c53c6978a95d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rotationsPerSecond: {x: 0, y: 0, z: 0.1}
+  ignoreTimeScale: 0
 --- !u!1 &704041659391080358
 GameObject:
  m_ObjectHideFlags: 0
@@ -2016,7 +2248,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1217192100569320354}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: -171.62, z: 0}
+  m_LocalPosition: {x: 0, y: -181.5, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children: []
  m_Father: {fileID: 1467516596806451442}
@@ -4935,7 +5167,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 3294423761365210736}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 846, z: 0}
+  m_LocalPosition: {x: -132, y: 846, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 9131447998686714841}
@@ -8139,6 +8371,38 @@ MonoBehaviour:
  mSpriteName: order_icon_5
  mFillCenter: 1
  isGrayMode: 0
+--- !u!1 &5432750105014609252
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 707187227634174975}
+  m_Layer: 5
+  m_Name: DownloadProgress
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!4 &707187227634174975
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5432750105014609252}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children:
+  - {fileID: 3074807661475435551}
+  - {fileID: 781240651225443395}
+  m_Father: {fileID: 1467516596806451442}
+  m_RootOrder: 3
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5505984191990585591
 GameObject:
  m_ObjectHideFlags: 0
@@ -8256,7 +8520,7 @@ MonoBehaviour:
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
-  aspectRatio: 2.5882354
+  aspectRatio: 1
  mType: 1
  mFillDirection: 4
  mFillAmount: 1
@@ -8850,7 +9114,7 @@ MonoBehaviour:
  mPivot: 4
  mWidth: 88
  mHeight: 94
-  mDepth: 7
+  mDepth: 2
  autoResizeBoxCollider: 0
  hideIfOffScreen: 0
  keepAspectRatio: 0
@@ -10006,7 +10270,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 6741796850072368115}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -23484.998, y: -31.529205, z: 0}
+  m_LocalPosition: {x: -23616.998, y: -31.529205, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 1962320147976321985}
@@ -10063,6 +10327,106 @@ MonoBehaviour:
  isPause: 0
  luaPath: trCRM/upgradeRes/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
  isNeedResetAtlase: 1
+--- !u!1 &6780551916686076506
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 781240651225443395}
+  - component: {fileID: 4039382246727516577}
+  m_Layer: 5
+  m_Name: Label
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &781240651225443395
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6780551916686076506}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 707187227634174975}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4039382246727516577
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6780551916686076506}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  leftAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  rightAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  bottomAnchor:
+    target: {fileID: 0}
+    relative: 0
+    absolute: 0
+  topAnchor:
+    target: {fileID: 0}
+    relative: 1
+    absolute: 0
+  updateAnchors: 1
+  mColor: {r: 0.6, g: 0.6, b: 0.6, a: 1}
+  mPivot: 4
+  mWidth: 86
+  mHeight: 32
+  mDepth: 6
+  autoResizeBoxCollider: 0
+  hideIfOffScreen: 0
+  keepAspectRatio: 0
+  aspectRatio: 2.6875
+  keepCrispWhenShrunk: 1
+  mTrueTypeFont: {fileID: 0}
+  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
+  mText: 100%
+  mFontSize: 32
+  mFontStyle: 1
+  mAlignment: 0
+  mEncoding: 1
+  mMaxLineCount: 0
+  mEffectStyle: 0
+  mEffectColor: {r: 0, g: 0, b: 0, a: 1}
+  mSymbols: 1
+  mEffectDistance: {x: 1, y: 1}
+  mOverflow: 2
+  mMaterial: {fileID: 0}
+  mApplyGradient: 1
+  mGradientTop: {r: 1, g: 1, b: 1, a: 1}
+  mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
+  mSpacingX: 0
+  mSpacingY: 0
+  mUseFloatSpacing: 0
+  mFloatSpacingX: 0
+  mFloatSpacingY: 0
+  mShrinkToFit: 0
+  mMaxLineWidth: 0
+  mMaxLineHeight: 0
+  mLineWidth: 0
+  mMultiline: 1
+  isAppendEndingString: 0
+  AppendString: '...'
+  fontName: EmptyFont
 --- !u!1 &6790636284997338301
 GameObject:
  m_ObjectHideFlags: 0
@@ -11798,12 +12162,14 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 7988814047750342368}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -425.61, y: -0, z: 0}
+  m_LocalPosition: {x: 0, y: -0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 8958346099814627774}
  - {fileID: 4601844564519845584}
  - {fileID: 593301531348764212}
+  - {fileID: 707187227634174975}
+  - {fileID: 1360912303918495723}
  m_Father: {fileID: 4713050183387073493}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12145,7 +12511,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 8147893687025928433}
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -39727.246, y: -1777.6542, z: 0}
+  m_LocalPosition: {x: -39859.246, y: -1777.6542, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 6267045741486055760}
@@ -12763,7 +13129,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &7192762038683279864
 Transform:
  m_ObjectHideFlags: 0
@@ -13825,7 +14191,7 @@ Transform:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 9199839785384366174}
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalPosition: {x: -132, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_Children:
  - {fileID: 5238886842196287200}
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBTextures.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellAttachment.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellExtendFieldRoot.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderDetail.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelOrderDetail.unity3d
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
@@ -1 +1 @@
-r8	(trCRM/resVer/Android/VerCtl/priority.ver8,b1f7521d5a7aa1c234d530bec1ec77bf8	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,58839a7593d0cc9db0e1a5937a57e7968	%trCRM/resVer/Android/VerCtl/other.ver8,f3502f2ef879c7667f2af161db4bfdee
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/other.ver
--- a/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
+++ b/Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver