This commit is contained in:
2020-08-08 07:52:19 +08:00
parent 41747a05a1
commit f4958906c5
18 changed files with 83 additions and 71 deletions

View File

@@ -1 +1 @@
{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"b0fe536cc62b96acaca5e7dfc643fc79", "port":29006, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"b0fe536cc62b96acaca5e7dfc643fc79", "port":29000, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"b0fe536cc62b96acaca5e7dfc643fc79", "port":29004, "androidVer":"b1dd5a258abaa65e62c6e70070379eca", "isDev":0}}}
{"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}}}

View File

@@ -32,7 +32,7 @@ function _cell.selected(val)
uiobjs.SpriteIcon.color = Color.white
uiobjs.LabelName.color = Color.white
-- uiobjs.LabelState.color = Color.white
uiobjs.LabelState.text = "进入"
uiobjs.LabelState.text = "选择"
uiobjs.SpriteState.color = ColorEx.getColor(0xff1971b8)
else
uiobjs.bg.color = ColorEx.getColor(0xfff4f4f4)

View File

@@ -37,7 +37,7 @@ function CLLPStart.setLuasAtBegainning()
-- 资源释放时间
if CLAssetsManager.self then
CLAssetsManager.self.timeOutSec4Realse = 10
CLAssetsManager.self.timeOutSec4Realse = 60
end
-- 日志监听

View File

@@ -135,25 +135,35 @@ end
---public 显示扩展字段
function TRPNewCust:showExtentFiles(taskId)
---@type _ParamCellExtendFiledRoot
local param = {}
param.data = self.mdata and self.mdata.jsonStr or {}
param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
param.fields = {}
local fields = DBCust.getFieldsByTask(taskId) or {}
---@type _ParamCellExtendFiled
local filedInfor
for i, v in ipairs(fields) do
filedInfor = {}
filedInfor.attr = v
filedInfor.showMode = self.isNewCust and _FieldMode.inputOnly or _FieldMode.modifyOnly
if not self.isNewCust then
filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend)
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend)
if #fields > 0 then
---@type _ParamCellExtendFiledRoot
local param = {}
param.data = self.mdata and self.mdata.jsonStr or {}
param.onFinish = self:wrapFunc(self.setExtendFieldsMode)
param.fields = {}
---@type _ParamCellExtendFiled
local filedInfor
for i, v in ipairs(fields) do
filedInfor = {}
filedInfor.attr = v
filedInfor.showMode = self.isNewCust and _FieldMode.inputOnly or _FieldMode.modifyOnly
if not self.isNewCust then
filedInfor.onClick = self:wrapFunc(self.onClickInputField4Extend)
filedInfor.onSelect = self:wrapFunc(self.onPopupFieldValChg4Extend)
end
table.insert(param.fields, filedInfor)
end
table.insert(param.fields, filedInfor)
SetActive(uiobjs.ExtendRoot.gameObject, true)
uiobjs.ExtendRoot:init(param, nil)
else
if uiobjs.ExtendRoot.luaTable then
uiobjs.ExtendRoot.luaTable.release()
end
SetActive(uiobjs.ExtendRoot.gameObject, false)
end
uiobjs.ExtendRoot:init(param, nil)
end
function TRPNewCust:reposition()
@@ -389,8 +399,10 @@ function TRPNewCust:setEventDelegate()
local cust = uiobjs.DetailRoot:getValue(true)
cust.phoneNo = cust._phoneNo
cust.customerLabel = self.mdata.customerLabel
local jsonStr = uiobjs.ExtendFormRoot:getValue(true)
cust.jsonStr = jsonStr
if uiobjs.ExtendFormRoot.gameObject.activeInHierarchy then
local jsonStr = uiobjs.ExtendFormRoot:getValue(true)
cust.jsonStr = jsonStr
end
showHotWheel()
NetProto.send.save_customer(
cust,

View File

@@ -516,13 +516,13 @@ MonoBehaviour:
updateAnchors: 1
mColor: {r: 0.21176471, g: 0.21176471, b: 0.21176471, a: 1}
mPivot: 4
mWidth: 120
mHeight: 40
mWidth: 309
mHeight: 80
mDepth: 5
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3
aspectRatio: 3.8625
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -536,7 +536,7 @@ MonoBehaviour:
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 2
mOverflow: 0
mMaterial: {fileID: 0}
mApplyGradient: 0
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
@@ -10634,7 +10634,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3000
startingRenderQueue: 3004
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 0
@@ -14517,7 +14517,7 @@ MonoBehaviour:
anchorOffset: 0
softBorderPadding: 1
renderQueue: 0
startingRenderQueue: 3010
startingRenderQueue: 3014
mClipTexture: {fileID: 0}
mAlpha: 1
mClipping: 3

View File

@@ -1 +1 @@
r8 $trCRM/resVer/IOS/VerCtl/priority.ver8,09df1180d27a5f77bfd97db244b61fda8 !trCRM/resVer/IOS/VerCtl/other.ver8,62728fec0546980ac4d5f4ec9806a711
r8 $trCRM/resVer/IOS/VerCtl/priority.ver8,fbeb3f65349c7b82f2efe68599e0d3678 !trCRM/resVer/IOS/VerCtl/other.ver8,62728fec0546980ac4d5f4ec9806a711