chenbin/tianrunCRM
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

up

Browse Source
This commit is contained in:
陈彬
2020-08-08 08:41:39 +08:00
parent f4958906c5
commit 96a895d014
11 changed files with 791 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1526
Assets/CoolapeFrameData/verControl/.resModifyDate.v
View File

File diff suppressed because it is too large Load Diff

BIN
Assets/CoolapeFrameData/verControl/android/ver4DevelopeMd5.v
View File

Binary file not shown.

16
Assets/CoolapeFrameData/verControl/android/ver4Upgrade.v
View File

@@ -72,15 +72,15 @@ trCRM/upgradeRes/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12a
trCRM/upgradeRes/priority/ui/panel/Android/PanelSelectServer.unity3d,b0a074f0b8b0e1e564fe46561e957be8
trCRM/upgradeRes/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,acf91842bee1f35910a1a31ef9a20085
trCRM/upgradeRes/priority/lua/ui/panel/TRPNewCust.lua,3e809cc93cfefc17376bd31a7af77b1d
trCRM/upgradeRes/other/uiAtlas/login/Android/log_invisible.unity3d,e1a5814af01e17e83e9939c9f1839524
trCRM/upgradeRes/other/uiAtlas/login/Android/log_sms.unity3d,8677ba455b4c85e5f1230986ff1032cf
trCRM/upgradeRes/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,edb08aadfb350845c99e74978da9f7a9
trCRM/upgradeRes/priority/lua/ui/panel/CLLPStart.lua,00f92c77080ad9f695285c428370846b
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
trCRM/upgradeRes/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
trCRM/upgradeRes/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,15a0f0e6173761934b56f48247fb85f5
trCRM/upgradeRes/priority/ui/panel/Android/PanelCustDetail.unity3d,4bfb961e97a1d551ff342682bfe86d39
trCRM/upgradeRes/other/uiAtlas/work/Android/wenjian-icon.unity3d,780e57115babb2c1f7f931f1bcc5a6ca
trCRM/upgradeRes/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
trCRM/upgradeRes/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f
@@ -123,7 +123,6 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPLogin.lua,f2ba83d01af3371bee83945f470
trCRM/upgradeRes/priority/ui/other/Android/reportform1.unity3d,5d061e9c5511ae3b978dbfe2be87f35e
trCRM/upgradeRes/priority/lua/ui/cell/TRCellProductList.lua,078920175f85f04660584bddb359b7ab
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_enterprise.unity3d,59d7dae785dea4fa88b52f40a8d167cf
trCRM/upgradeRes/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc
trCRM/upgradeRes/other/uiAtlas/main/Android/icon_me2.unity3d,6efa661cb74e62dfdc75bdbeaeeceb39
trCRM/upgradeRes/priority/ui/panel/Android/PanelStart.unity3d,50cfab21f360ee339c94b1111be09fef
trCRM/upgradeRes/other/uiAtlas/cust/Android/write.unity3d,cbf2cca163ccc6839cf9154547edd6f8
@@ -201,7 +200,7 @@ trCRM/upgradeRes/other/uiAtlas/work/Android/yuyue.unity3d,48a0b0f16711574af6c66f
trCRM/upgradeRes/priority/ui/panel/Android/PanelMain.unity3d,a56567b78909e1992695a97cb19d3e1c
trCRM/upgradeRes/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
trCRM/upgradeRes/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
trCRM/upgradeRes/priority/lua/db/DBUser.lua,d0084b481f8e9cb189354e710a2ad71f
trCRM/upgradeRes/priority/lua/db/DBUser.lua,782ec38717ce8e257a930c9fe7e98f73
trCRM/upgradeRes/priority/lua/ui/panel/TRBasePanel.lua,26b71aa4ebe7db385c5f159902022b6a
trCRM/upgradeRes/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
trCRM/upgradeRes/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -215,6 +214,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/TRCellOceanList.lua,911d6edb241c34ee721815
trCRM/upgradeRes/other/uiAtlas/logo/Android/512.unity3d,c51445206c8f94af0fcbbe4befa8ae05
trCRM/upgradeRes/priority/lua/json/rpcserver.lua,48b8f5e53a1141652c38f8a5a8a77928
trCRM/upgradeRes/priority/lua/ui/panel/CLLPSplash.lua,6418723ac66fc8ab625db8d61cd2c07d
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes/priority/www/baidumap.html,d210e48796dd96343f9c17bc1d230136
trCRM/upgradeRes/priority/lua/ui/panel/CLLPHotWheel.lua,1760aa9933da4b421f1c6093d802cb4f
trCRM/upgradeRes/other/uiAtlas/cust/Android/record.unity3d,afd45ba065ba86f138b8c92b9794c722
@@ -279,7 +279,7 @@ trCRM/upgradeRes/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5f407385f
trCRM/upgradeRes/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
trCRM/upgradeRes/priority/ui/panel/Android/PanelTasks.unity3d,1ccaafb32c2b12b3cf5070636dc25009
trCRM/upgradeRes/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
trCRM/upgradeRes/priority/lua/net/NetProto.lua,5e58aa4d56f9439b896dfe5409f16cec
trCRM/upgradeRes/priority/lua/net/NetProto.lua,47e1938ef981f31a389d99cc859b1df1
trCRM/upgradeRes/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
trCRM/upgradeRes/priority/localization/Chinese.txt,08ac586b625d0a126a610344a1846e8f
trCRM/upgradeRes/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
@@ -299,7 +299,7 @@ trCRM/upgradeRes/other/uiAtlas/order/Android/ipt_bg.unity3d,89541a2aaed40069c1f0
trCRM/upgradeRes/other/uiAtlas/order/Android/system.unity3d,570fa72b2d385d604cc7c9f7516965da
trCRM/upgradeRes/other/uiAtlas/news/Android/news_bg_num2.unity3d,bfdbfc9e1fd1f91de555c0801d278d25
trCRM/upgradeRes/other/uiAtlas/login/Android/log_password.unity3d,6a41f099b79cda5941cf720c1452b5a5
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
trCRM/upgradeRes/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewFollow.unity3d,e8e8c2a2a8f7c91ded00896bf6ce2bfb
trCRM/upgradeRes/other/uiAtlas/cust/Android/pause.unity3d,f67cbbc84b61bc281f486e4e18fb177f
trCRM/upgradeRes/priority/lua/ui/panel/CLLPWWWProgress.lua,b713ddf9f0af8602ec48f71162181d6d
@@ -307,7 +307,7 @@ trCRM/upgradeRes/priority/lua/ui/cell/CLLCellServer.lua,52979aedf684a79bc667bbe7
trCRM/upgradeRes/priority/lua/ui/panel/TRPModifyFiled.lua,99b250c386ce8dad9c10c8f4fe9874f1
trCRM/upgradeRes/priority/lua/ui/panel/TRPOrderDetail.lua,a6f126d3075af9b1dfa62f31f9833c35
trCRM/upgradeRes/priority/ui/other/Android/InputText.unity3d,c769d4034a021eb15ff4e63c62da3958
trCRM/upgradeRes/other/uiAtlas/news/Android/new2_wait.unity3d,4171ead446231d4429305811f6e91fbc
trCRM/upgradeRes/other/uiAtlas/public/Android/_empty.unity3d,69ddb5d00f576f414974eaff196cb6cc
trCRM/upgradeRes/priority/ui/panel/Android/PanelNewCust.unity3d,3847bb19ae8c2c8ead7aea9e881773a5
trCRM/upgradeRes/priority/ui/panel/Android/PanelServers.unity3d,1613390ef03ce766ec3680f99949122b
trCRM/upgradeRes/priority/lua/ui/panel/TRPCustDetail.lua,3787ca23b6d800304dc72ab8921b8428

2
Assets/CoolapeFrameData/verControl/android/ver4UpgradeList.v
View File

File diff suppressed because one or more lines are too long

12
Assets/CoolapeFrameData/verControl/android/ver4UpgradeMd5.v
View File

@@ -77,7 +77,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_4.unity3d,d1cf8069
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSelectServer.lua,50a46489d0d704df26d61ae9a2f5d5fe
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelLogin.unity3d,5cac11a5557933d49c37a554c76a730f
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_followup.unity3d,a722ae8374cf3aa0fd87fc6d74ddabfd
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,acf91842bee1f35910a1a31ef9a20085
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewCust.lua,3e809cc93cfefc17376bd31a7af77b1d
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPOrderList.lua,dad09d99c3d896f7c1ce1c1c854073ea
trCRM/upgradeRes4Publish/other/uiAtlas/news/Android/new2_time.unity3d,16ca1ec9a44b8633ca032c3c8cdf1a9b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPConnect.lua,24712c363be3eef2c7e32413cc9f146d
@@ -85,7 +85,7 @@ trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua,4820cbe7f1f16ec6
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_shadow.unity3d,10087f2ab389bdfd71cfce8a6c466038
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_bg_noshadow.unity3d,4aee082b48104519ba82bad6aac83cf3
trCRM/upgradeRes4Publish/other/uiAtlas/icon/Android/company_1.unity3d,8ba9f20b736fb17e2f6ee414df072492
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,15a0f0e6173761934b56f48247fb85f5
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d,4bfb961e97a1d551ff342682bfe86d39
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/wenjian-icon.unity3d,780e57115babb2c1f7f931f1bcc5a6ca
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_ranking.unity3d,9a0b0f94d60e9ff144193c83915b21fa
trCRM/upgradeRes4Publish/other/uiAtlas/order/Android/xuanze_bg.unity3d,5f13e0f57914e2a06fd8f53e20d1106f
@@ -114,7 +114,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/kuang.unity3d,a6ce8e74b0631e
trCRM/upgradeRes4Publish/other/uiAtlas/logo/Android/logo2.unity3d,1bddae3d3fe67d91fc6b5c6f9dbb0bea
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLLUICellPoplist.lua,18d47301d459fd66ed63b902546e8619
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/sms.unity3d,9d63dc8f82de2f772e544b8c8518021b
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,edb08aadfb350845c99e74978da9f7a9
trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPStart.lua,00f92c77080ad9f695285c428370846b
trCRM/upgradeRes4Publish/other/uiAtlas/main/Android/icon_me.unity3d,b6060c4f6b1cf669b21b5d4f8b23efbe
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewFollowSimple.unity3d,d0f73f4324743d77717668fdcda14680
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelPlaySoundRecord.unity3d,14e1a1da65735a1ac9a4256be49a4e40
@@ -205,7 +205,7 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/yuyue.unity3d,48a0b0f1671157
trCRM/upgradeRes4Publish/other/uiAtlas/hotwheel/Android/loading.unity3d,2f74f17f1282c12ab63108377b4798e0
trCRM/upgradeRes4Publish/other/uiAtlas/cust/Android/cus_tel.unity3d,692b010c775fb99d05d342f5ad0272fa
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelWebView.unity3d,e5372cdacc520ff8ba318ce09b681772
trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,d0084b481f8e9cb189354e710a2ad71f
trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua,782ec38717ce8e257a930c9fe7e98f73
trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRBasePanel.lua,26b71aa4ebe7db385c5f159902022b6a
trCRM/upgradeRes4Publish/priority/lua/public/class.lua,cc0f201cc55c59f8bc8f623853382b9c
trCRM/upgradeRes4Publish/other/uiAtlas/login/Android/log_bg.unity3d,a7398f0f48b3b469e31bea6dac45457e
@@ -281,7 +281,7 @@ trCRM/upgradeRes4Publish/priority/lua/ui/panel/CLLPPopList.lua,17086f0c2296f83f5
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellReportform2.lua,e62a82bcc9fb817a4460e82b6351e18f
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelTasks.unity3d,1ccaafb32c2b12b3cf5070636dc25009
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/me_customer.unity3d,5676922ef1749c311285d1a207b8397b
trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,5e58aa4d56f9439b896dfe5409f16cec
trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua,47e1938ef981f31a389d99cc859b1df1
trCRM/upgradeRes4Publish/other/uiAtlas/public/Android/tips_3.unity3d,2834e3cc399b70e7621065ad4ddaedf6
trCRM/upgradeRes4Publish/other/uiAtlas/mine/Android/myset_clean_up.unity3d,51e9fd3012fca7d448c3578c281bd15e
trCRM/upgradeRes4Publish/priority/lua/ui/cell/CLCellToast.lua,6e350721fca8167bd621df86ad982326
@@ -357,5 +357,5 @@ trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_1.unity3d,41ae133f
trCRM/upgradeRes4Publish/priority/lua/toolkit/curve.lua,f97735ed6c39accb55cdae44b62b5b38
trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelEditPrice.unity3d,baa0e7f3e00e62b0d5cb5263d7583000
trCRM/upgradeRes4Publish/other/uiAtlas/work/Android/work_icon_3.unity3d,651d81480c5ea1ff8aa4ccdf7e0a6058
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,b145bc086a8b1657a314622614dcb70a
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCompany.lua,2cacaeb6845d8d0a0b16d726048a0216
trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellImage.lua,edeb733a40a67f9e0431e448b3356d95

2
Assets/trCRM/serversCfg/servers.json
View File

@@ -1 +1 @@
{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"18c7479d637333f40c4d7cc226886b37", "port":29006, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"18c7479d637333f40c4d7cc226886b37", "port":29000, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"18c7479d637333f40c4d7cc226886b37", "port":29000, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":0}}}
{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"18c7479d637333f40c4d7cc226886b37", "port":29006, "androidVer":"b46a41731d03cad356cce32e9292fb48", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"18c7479d637333f40c4d7cc226886b37", "port":29000, "androidVer":"b46a41731d03cad356cce32e9292fb48", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"18c7479d637333f40c4d7cc226886b37", "port":29000, "androidVer":"b46a41731d03cad356cce32e9292fb48", "isDev":0}}}

13
Assets/trCRM/upgradeRes4Dev/priority/lua/db/DBUser.lua
View File

@@ -79,7 +79,11 @@ function DBUser.refreshUserInfor(loginNo, loginName)
for i = 0, count - 1 do
local v = infor.values[i]
if v == loginNo then
infor.options[i] = loginName
if loginName == "系统生成" then
infor.options[i] = joinStr(v, "_", loginName)
else
infor.options[i] = loginName
end
break
end
end
@@ -88,7 +92,12 @@ function DBUser.refreshUserInfor(loginNo, loginName)
local list = DBUser.getFilters(DBUser.FilterGroup.user) or {}
for i, v in ipairs(list or {}) do
if v.value == loginNo then
v.name = loginNo
v.name = loginName
if loginName == "系统生成" then
v.name = joinStr(v.value, "_", loginName)
else
v.name = loginName
end
break
end
end

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/db/DBUser.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelCustDetail.unity3d
View File

Binary file not shown.

2
Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl.ver
View File

@@ -1 +1 @@
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,048ea73ad033153969ebfc46a363c56d8 %trCRM/resVer/Android/VerCtl/other.ver8,0a763b03453ce762f67786f8d8aee352
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,88cd3cee02b6afb9d88fb28348fb6ddc8 %trCRM/resVer/Android/VerCtl/other.ver8,0a763b03453ce762f67786f8d8aee352

BIN
Assets/trCRM/upgradeRes4Ver/trCRM/resVer/Android/VerCtl/priority.ver
View File

Binary file not shown.