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

call modify

Browse Source
This commit is contained in:
陈彬
2020-11-30 22:39:38 +08:00
parent afd1ec7926
commit 98f0941160
22 changed files with 135 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

37
Assets/trCRM/upgradeRes4Dev/priority/lua/toolkit/MyUtl.lua
View File

@@ -42,6 +42,39 @@ MyUtl.getSizeAdjust = function()
return _sizeAdjust
end
---@param cust _DBCust
MyUtl.showCallOption = function(cust)
---@type _ParamCLLPPopList2
local params = {}
params.title = "拨号选择"
params.list = {}
table.insert(
params.list,
{
index = 1,
name = joinStr("云拨号：", cust._phoneNo),
subname = joinStr("", DBCust.getTaskName(cust.custName))
}
)
table.insert(
params.list,
{
index = 2,
name = joinStr("本机拨号：", cust._phoneNo),
subname = joinStr("", DBCust.getTaskName(cust.custName))
}
)
params.callback = function(d)
local index = d.index
if index == 1 then
MyUtl.callCust(cust)
else
MyUtl.callCustByNative(cust.phoneNo, cust)
end
end
getPanelAsy("PanelPopList2", onLoadedPanelTT, params)
end
---public 拨号
MyUtl.callCust = function(cust)
if type(cust.jsonStr) == "string" then
@@ -147,7 +180,9 @@ MyUtl.callCustByNative = function(phoneNo, cust)
else
Application.OpenURL(joinStr("tel:", phoneNo))
end
getPanelAsy("PanelNewFollowSimple", onLoadedPanelTT, cust)
if cust then
getPanelAsy("PanelNewFollowSimple", onLoadedPanelTT, cust)
end
end
MyUtl.toast = function(msg, staySec)

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/TRCellCustList.lua
View File

@@ -73,7 +73,7 @@ function _cell.uiEventDelegate(go)
elseif goName == "ButtonTask" then
getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, mData)
elseif goName == "ButtonContact" then
MyUtl.callCust(mData)
MyUtl.showCallOption(mData)
end
end

2
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustDetail.lua
View File

@@ -590,7 +590,7 @@ function TRPCustDetail:setEventDelegate()
getPanelAsy("PanelNewFollowTask", onLoadedPanelTT, self.mdata)
end,
ButtonCall = function()
MyUtl.callCust(self.mdata)
MyUtl.showCallOption(self.mdata)
end,
ButtonNewOrder = function()
getPanelAsy("PanelNewOrder", onLoadedPanelTT, self.mdata)

1
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPMakeCall.lua
View File

@@ -193,6 +193,7 @@ function TRPMakeCall.uiEventDelegate(go)
MyUtl.toastW("请输入要呼叫的号码")
return
end
MyUtl.callCustByNative(InputNumber.value)
elseif goName == "ButtonCallYun" then
if InputNumber.value == nil or InputNumber.value == "" then
MyUtl.toastW("请输入要呼叫的号码")

6
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowSimple.lua
View File

@@ -65,8 +65,10 @@ end
---@param paras _ParamTRPNewFollowSimple
function TRPNewFollowSimple:setData(paras)
self.mdata = {}
self.mdata.custId = paras.custId
self.mdata.taskId = paras.taskId
if paras then
self.mdata.custId = paras.custId
self.mdata.taskId = paras.taskId
end
self.mdata.followUpType = "0"
self.mdata.dealFlag = "0"
self.isNewFollow = true

78
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMakeCall.prefab
View File

@@ -27,7 +27,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1433074310}
m_LocalRotation: {x: 0, y: 0, z: 1, w: -0.00000004371139}
m_LocalPosition: {x: 426, y: 350, z: 0}
m_LocalPosition: {x: 0, y: 350, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5592905547070457646}
@@ -93,11 +93,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 7927105919409398303}
relative: 1
target: {fileID: 0}
relative: 0
absolute: -170
rightAnchor:
target: {fileID: 7927105919409398303}
target: {fileID: 0}
relative: 1
absolute: -100
bottomAnchor:
@@ -1833,7 +1833,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7503961266116029617}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 426, y: 350, z: 0}
m_LocalPosition: {x: 0, y: 350, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5841238317917837241}
@@ -1900,13 +1900,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 7927105919409398303}
relative: 1
target: {fileID: 0}
relative: 0
absolute: -170
rightAnchor:
target: {fileID: 7927105919409398303}
target: {fileID: 0}
relative: 1
absolute: -100
absolute: -150
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -2466,7 +2466,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &7927105919409391287
Transform:
m_ObjectHideFlags: 0
@@ -2475,7 +2475,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7927105919409559233}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -140, z: 0}
m_LocalPosition: {x: 0, y: -120, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 7927105919409367425}
@@ -2925,17 +2925,17 @@ MonoBehaviour:
topAnchor:
target: {fileID: 7927105919409336817}
relative: 1
absolute: -90
absolute: 170
updateAnchors: 0
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 7
mWidth: 1127
mHeight: 1349
mHeight: 1375
mDepth: -2
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 0.83469236
aspectRatio: 0.82023287
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -2962,8 +2962,8 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1127, y: 1349, z: 0}
m_Center: {x: 0, y: 674.5, z: 0}
m_Size: {x: 1127, y: 1375, z: 0}
m_Center: {x: 0, y: 687.5, z: 0}
--- !u!1 &7927105919409572387
GameObject:
m_ObjectHideFlags: 0
@@ -3405,7 +3405,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7927105919409583993}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 1, y: 0, z: 0, w: -0.00000004371139}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@@ -3462,7 +3462,7 @@ MonoBehaviour:
topType: 1
atlasName: atlasAllReal
mAtlas: {fileID: 11400000, guid: 5ceb49909c25f471fb6d136b24c49d48, type: 3}
mSpriteName: cust_input
mSpriteName: work_work_bg_shadow
mFillCenter: 1
isGrayMode: 0
--- !u!114 &1210273604098316216
@@ -3914,7 +3914,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &7927105919409452443
Transform:
m_ObjectHideFlags: 0
@@ -3923,7 +3923,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7927105919409597277}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -228, y: 350, z: 0}
m_LocalPosition: {x: -334, y: 350, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7927105919409363339}
@@ -3990,13 +3990,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
target: {fileID: 7927105919409398303}
relative: 0
absolute: 0
absolute: 150
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
target: {fileID: 7927105919409398303}
relative: 0
absolute: 310
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -4006,7 +4006,7 @@ MonoBehaviour:
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 0, g: 1, b: 0.8603997, a: 1}
mColor: {r: 0, g: 0.6403699, b: 1, a: 1}
mPivot: 4
mWidth: 160
mHeight: 160
@@ -4014,7 +4014,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
aspectRatio: 0.0125
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -4532,7 +4532,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7927105919409612843}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 1490.7402, z: 0}
m_LocalPosition: {x: 0, y: 1457, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7927105919409336817}
@@ -5003,7 +5003,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
mText: "\u672C\u5730"
mText: "\u672C\u673A"
mFontSize: 50
mFontStyle: 0
mAlignment: 0
@@ -5160,7 +5160,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 3.8
aspectRatio: 8.65
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 0}
mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
@@ -5428,7 +5428,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7927105919409636373}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 350, z: 0}
m_LocalPosition: {x: 331, y: 350, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7927105919409391287}
@@ -5513,13 +5513,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
target: {fileID: 7927105919409398303}
relative: 1
absolute: 0
absolute: -310
rightAnchor:
target: {fileID: 7927105919409398303}
relative: 1
absolute: -150
bottomAnchor:
target: {fileID: 0}
relative: 0
@@ -5537,7 +5537,7 @@ MonoBehaviour:
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
aspectRatio: 0.0125
mType: 1
mFillDirection: 4
mFillAmount: 1
@@ -5601,7 +5601,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 150, y: 150, z: 0}
m_Size: {x: 200, y: 150, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &7927105919419291847
MonoBehaviour:

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/toolkit/MyUtl.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/TRCellCustList.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPCustDetail.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPMakeCall.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPNewFollowSimple.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelMakeCall.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,a1591a15f0c69bbcbe85b3992432982d8 %trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,c614074d72ab97e19d230a736115cef28 %trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13

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

Binary file not shown.

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

Binary file not shown.