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

android

Browse Source
This commit is contained in:
陈彬
2020-08-03 23:05:29 +08:00
parent f3ecc018ff
commit 9e8c6f080f
64 changed files with 325 additions and 261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/trCRM/_scene/Main.unity
View File

@@ -1668,7 +1668,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 5e28cad2f718f443db7bef1ef8b01221, type: 3}
m_Name:
m_EditorClassIdentifier:
appUniqueID: 1000
appUniqueID: 2020158
isContBorrowSpriteTimes: 0
isNotEditorMode: 0
isEncodeLua: 1

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

@@ -1,32 +1 @@
{
"appid": "2020158",
"servers": {
"1": {
"id": "1",
"name": "正式服",
"host": "app.ttf-cti.com",
"port": 29004,
"isDev": 0,
"iosVer": "",
"androidVer": ""
},
"2": {
"id": "2",
"name": "测试服",
"host": "app.ttf-cti.com",
"port": 29004,
"isDev": 1,
"iosVer": "",
"androidVer": ""
},
"3": {
"id": "3",
"name": "本地测试",
"host": "192.168.1.11",
"port": 29000,
"isDev": 1,
"iosVer": "",
"androidVer": ""
}
}
}
{"2020158":{"2":{"id":"2", "host":"app.ttf-cti.com", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"", "port":29006, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"", "port":29000, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"", "port":29004, "androidVer":"9a74a8c51d2c5ecc94c85758fb98308a", "isDev":0}}}

1
Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLInclude.lua
View File

@@ -269,6 +269,5 @@ NativeCamera = CS.NativeCamera
---@type MyCamera
MyCamera = CS.MyCamera
-------------------------------------------------------
json = require("json.json")
-------------------------------------------------------

1
Assets/trCRM/upgradeRes4Dev/priority/lua/public/CLLIncludeBase.lua
View File

@@ -126,6 +126,7 @@ function require(path)
end
-------------------------------------------------------
-- require
json = require("json.json")
require("bio.BioUtl")
require("toolkit.LuaUtl")
require("public.CLLPrefs")

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

@@ -1,6 +1,5 @@
--开始loading页面，处理资源更新、及相关初始化
---@type json
local json = require("json.json")
local DBUser = require("db.DBUser")
---@type Coolape.CLPanelLua
@@ -204,8 +203,8 @@ end
CLLPSplash.selectServer = function(callback)
local onGetServers = function(content, orgs)
local content = json.decode(content)
local servers = content[CLCfgBase.self.appUniqueID] or {}
local _content = json.decode(content)
local servers = _content[tostring(CLCfgBase.self.appUniqueID)] or {}
local userName = Prefs.getUserName()
DBUser.isWhiteUser(
userName,
@@ -267,6 +266,7 @@ end
--设置进度条
function CLLPSplash.onProgress(...)
do return end
local args = {...}
local all = args[1] -- 总量
local v = args[2] -- 当前值

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

@@ -25,6 +25,7 @@ function CSPMsg.init(csObj)
---@type UIScrollView
objs.scrollView = objs.Content:GetComponent("UIScrollView")
objs.scrollView.dampenStrength = MyUtl.dampenStrength
---@type UITable
objs.Table = getCC(objs.scrollView.transform, "Table", "UITable")
objs.LoopGrid = getCC(objs.Table.transform, "msgList/Grid", "CLUILoopGrid")

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

@@ -34,6 +34,7 @@ function CSPTasks.init(csObj)
---@type UIScrollView
uiobjs.scrollView = uiobjs.Content:GetComponent("UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
---@type CLUIFormRoot
uiobjs.Top = getCC(transform, "Top", "CLUIFormRoot")

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

@@ -132,7 +132,7 @@ function TRPAbout:upgrade()
CLUIUtl.showConfirm(LGet("MsgHadNewVerApp"), false, "更新", doUpgradeApp, "忽略", nil)
end
else
MyUtl.toastS("当前已经是最新版本 V" .. newVer)
MyUtl.toastS("当前已经是最新版本 V" .. oldVer)
end
end

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

@@ -11,7 +11,7 @@ function TRPBindPhone:init(csObj)
MyUtl.setContentView(uiobjs.content)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
uiobjs.formRoot = getCC(uiobjs.scrollview.transform, "Table", "CLUIFormRoot")
self:setEventDelegate()
end

4
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPCustList.lua
View File

@@ -129,7 +129,9 @@ function TRPCustList:onShowRefreshFlg()
end
function TRPCustList:onhideRefreshFlg()
SetActive(uiobjs.ButtonHeadList.gameObject, false)
-- uiobjs.scrollView:ResetPosition()
if uiobjs.Grid.list.Count == 0 then
uiobjs.scrollView:ResetPosition()
end
end
function TRPCustList:refreshList()
local queryKey = uiobjs.InputSeachKey.value

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

@@ -12,7 +12,7 @@ function TRPCustListProc:init(csObj)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 30, 0)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
uiobjs.grid = getCC(self.transform, "PanelContent/Grid", "CLUILoopGrid")
end

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

@@ -17,7 +17,7 @@ function TRPFollowFilter:init(csObj)
MyUtl.setContentView(getChild(self.transform, "PanelContent"), 132 + 132 + 50, 190)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
uiobjs.Table = getCC(self.transform, "PanelContent/Grid", "UITable")
uiobjs.prefab = getChild(uiobjs.Table.transform, "00000").gameObject
uiobjs.InputSeachKey = getCC(self.transform, "Top/InputSeachKey", "UIInput")

4
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPFollowList.lua
View File

@@ -137,7 +137,9 @@ function TRPFollowList:onShowRefreshFlg()
end
function TRPFollowList:onhideRefreshFlg()
SetActive(uiobjs.ButtonHeadList.gameObject, false)
-- uiobjs.scrollView:ResetPosition()
if uiobjs.Grid.list.Count == 0 then
uiobjs.scrollView:ResetPosition()
end
end
function TRPFollowList:refreshList()
local queryKey = uiobjs.InputSeachKey.value

30
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPLogin.lua
View File

@@ -97,7 +97,7 @@ function TRPLogin:setEventDelegate()
formData,
function(content, orgs)
if content.success then
MyUtl.setIsHidePhone(content.result.cover_phoneNo_flag)
-- MyUtl.setIsHidePhone(content.result.cover_phoneNo_flag)
Prefs.setUserName(formData.phone)
Prefs.setUserPsd(formData.password)
@@ -115,8 +115,32 @@ function TRPLogin:setEventDelegate()
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
end
else
MyUtl.setIsHidePhone(currGroup.cover_phoneNo_flag)
getPanelAsy("PanelConnect", onLoadedPanel)
local useOldCurrGroup = false
currGroup = json.decode(currGroup)
for i, v in ipairs(content.result) do
if v.company_id == currGroup.company_id then
Prefs.setCurrGroup(Prefs.getUserName(), json.encode(v))
currGroup = v
useOldCurrGroup = true
break
end
end
if useOldCurrGroup then
MyUtl.setIsHidePhone(currGroup.cover_phoneNo_flag)
getPanelAsy("PanelConnect", onLoadedPanel)
else
if #(content.result) == 1 then
Prefs.setCurrGroup(Prefs.getUserName(), json.encode(content.result[1]))
MyUtl.setIsHidePhone(content.result[1].cover_phoneNo_flag)
getPanelAsy("PanelConnect", onLoadedPanel)
else
---@type _ParamTRPSelectGroup
local d = {}
d.isHideCloseBtn = true
d.companyList = content.result
getPanelAsy("PanelSelectCompany", onLoadedPanel, d)
end
end
end
end
end,

17
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollow.lua
View File

@@ -26,6 +26,23 @@ function TRPNewFollow:init(csObj)
uiobjs.ButtonSave = getChild(self.transform, "Top/ButtonSave")
end
---public 当有通用背板显示时的回调
---@param cs Coolape.CLPanelLua
function TRPNewFollow:onShowFrame(cs)
if cs.frameObj then
---@type _BGFrame1Param
local d = {}
-- d.title = LGet(cs.titleKeyName)
if self.isNewFollow then
d.title = "新建跟进"
else
d.title = "跟进详情"
end
d.panel = cs
cs.frameObj:init(d)
end
end
function TRPNewFollow:initFiledsAttr()
---@type _ParamFieldAttr
local attr

20
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPNewFollowTask.lua
View File

@@ -62,7 +62,7 @@ end
-- 设置数据
---@param paras _ParamTRPNewFollowTask
function TRPNewFollowTask:setData(paras)
if paras and paras.taskId then
if paras and paras.bookingNote then
self.mdata = paras
self.isNewFollow = false
else
@@ -77,6 +77,24 @@ function TRPNewFollowTask:setData(paras)
end
end
---public 当有通用背板显示时的回调
---@param cs Coolape.CLPanelLua
function TRPNewFollowTask:onShowFrame(cs)
if cs.frameObj then
---@type _BGFrame1Param
local d = {}
-- d.title = LGet(cs.titleKeyName)
if self.isNewFollow then
d.title = "新建预约"
else
d.title = "预约详情"
end
d.panel = cs
cs.frameObj:init(d)
end
end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPNewFollowTask:show()
self:refreshContent()

20
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOceanList.lua
View File

@@ -37,7 +37,7 @@ function TRPOceanList:initFilters()
d.key2 = "createTime"
d.type = 1
d.isDateRange = true
d.isNeedTime = true
d.isNeedTime = false
table.insert(self.filters, d)
d = {}
@@ -46,7 +46,7 @@ function TRPOceanList:initFilters()
d.key2 = "updateTime"
d.type = 1
d.isDateRange = true
d.isNeedTime = true
d.isNeedTime = false
table.insert(self.filters, d)
d = {}
@@ -118,7 +118,9 @@ function TRPOceanList:onShowRefreshFlg()
end
function TRPOceanList:onhideRefreshFlg()
SetActive(uiobjs.ButtonHeadList.gameObject, false)
-- uiobjs.scrollView:ResetPosition()
if uiobjs.Grid.list.Count == 0 then
uiobjs.scrollView:ResetPosition()
end
end
function TRPOceanList:refreshList()
local queryKey = uiobjs.InputSeachKey.value
@@ -270,9 +272,17 @@ function TRPOceanList:getFilterStr()
end
ret[g.key2] = table.concat(list, ",")
elseif g.key == "createTime" then
--//TODO:
if not isNilOrEmpty(g.value) then
local strs = strSplit(g.value, "~")
ret.createTimeS = strs[1]
ret.createTimeE = strs[2]
end
elseif g.key == "updateTime" then
--//TODO:
if not isNilOrEmpty(g.value) then
local strs = strSplit(g.value, "~")
ret.updateTimeS = strs[1]
ret.updateTimeE = strs[2]
end
end
end
return ret

4
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPOrderList.lua
View File

@@ -141,7 +141,9 @@ function TRPOrderList:onShowRefreshFlg()
end
function TRPOrderList:onhideRefreshFlg()
SetActive(uiobjs.ButtonHeadList.gameObject, false)
-- uiobjs.scrollView:ResetPosition()
if uiobjs.Grid.list.Count == 0 then
uiobjs.scrollView:ResetPosition()
end
end
function TRPOrderList:refreshList()
local queryKey = uiobjs.InputSeachKey.value

4
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSelectServer.lua
View File

@@ -10,7 +10,7 @@ function TRPSelectServer:init(csObj)
self:setEventDelegate()
uiobjs.grid = getCC(self.transform, "Grid", "UIGrid")
uiobjs.gridPrefab = getChild(uiobjs.grid, "00000").gameObject
uiobjs.gridPrefab = getChild(uiobjs.grid.transform, "00000").gameObject
end
-- 设置数据
@@ -21,7 +21,7 @@ end
-- 显示，在c#中。show为调用refresh，show和refresh的区别在于，当页面已经显示了的情况，当页面再次出现在最上层时，只会调用refresh
function TRPSelectServer:show()
CLUIUtl.resetList4Lua(uiobjs.grid, uiobjs.gridPrefab, self.mdata.servers, self:wrapFunc(self.init))
CLUIUtl.resetList4Lua(uiobjs.grid, uiobjs.gridPrefab, self.mdata.servers, self:wrapFunc(self.initCell))
end
function TRPSelectServer:initCell(cell, data)

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

@@ -11,7 +11,7 @@ function TRPSetting:init(csObj)
MyUtl.setContentView(uiobjs.content)
---@type UIScrollView
uiobjs.scrollview = getCC(self.transform, "PanelContent", "UIScrollView")
uiobjs.scrollView.dampenStrength = MyUtl.dampenStrength
uiobjs.scrollview.dampenStrength = MyUtl.dampenStrength
self:setEventDelegate()
uiobjs.LabelPhone = getCC(uiobjs.scrollview.transform, "Table/ButtonPhone/LabelPhone", "UILabel")
end

4
Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPTaskList.lua
View File

@@ -153,7 +153,9 @@ function TRPTaskList:onShowRefreshFlg()
end
function TRPTaskList:onhideRefreshFlg()
SetActive(uiobjs.ButtonHeadList.gameObject, false)
-- uiobjs.scrollView:ResetPosition()
if uiobjs.Grid.list.Count == 0 then
uiobjs.scrollView:ResetPosition()
end
end
function TRPTaskList:refreshList()
local queryKey = uiobjs.InputSeachKey.value

12
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelMsg.prefab
View File

@@ -1525,7 +1525,7 @@ GameObject:
m_Component:
- component: {fileID: 7559427025382814600}
- component: {fileID: 7559427025382814606}
- component: {fileID: 7874584721905653174}
- component: {fileID: 3722797921129174865}
m_Layer: 5
m_Name: PanelContent
m_TagString: Untagged
@@ -1594,7 +1594,7 @@ MonoBehaviour:
mDepth: 2
mSortingOrder: 0
mClipOffset: {x: -1, y: -918.79785}
--- !u!114 &7874584721905653174
--- !u!114 &3722797921129174865
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@@ -1603,18 +1603,18 @@ MonoBehaviour:
m_GameObject: {fileID: 7559427025382814601}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5c85efbbc1ec4b75939e6d7f077e68c, type: 3}
m_Script: {fileID: 11500000, guid: d81807633ea807d4c8e3fff7e10c6000, type: 3}
m_Name:
m_EditorClassIdentifier:
movement: 1
dragEffect: 2
restrictWithinPanel: 1
disableDragIfFits: 0
disableDragIfFits: 1
smoothDragStart: 1
iOSDragEmulation: 1
scrollWheelFactor: 0.25
momentumAmount: 35
dampenStrength: 9
dampenStrength: 5
horizontalScrollBar: {fileID: 0}
verticalScrollBar: {fileID: 0}
showScrollBars: 1
@@ -1623,8 +1623,6 @@ MonoBehaviour:
scale: {x: 0, y: 0, z: 0}
relativePositionOnReset: {x: 0, y: 0}
centerOnChild: {fileID: 0}
loopGrid: {fileID: 7651258732160335458}
thresholDelta: {x: 0, y: -100}
--- !u!1 &8441046789887697199
GameObject:
m_ObjectHideFlags: 0

2
Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelSelectServer.prefab
View File

@@ -499,7 +499,7 @@ MonoBehaviour:
isPause: 0
luaPath: trCRM/upgradeRes/priority/lua/ui/panel/TRPSelectServer.lua
isNeedBackplate: 1
destroyWhenHide: 0
destroyWhenHide: 1
isNeedResetAtlase: 1
isNeedMask4Init: 0
isNeedMask4InitOnlyOnce: 1

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

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLInclude.lua
View File

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/lua/public/CLLIncludeBase.lua
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelSelectServer.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,ecb561caf31b4c411e1c818e160a29f98 %trCRM/resVer/Android/VerCtl/other.ver8,2eefe052e318b31f1af603804a16c317
r8 (trCRM/resVer/Android/VerCtl/priority.ver8,f866c7edbc8b45c009428cc94deb176e8 %trCRM/resVer/Android/VerCtl/other.ver8,2eefe052e318b31f1af603804a16c317

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

Binary file not shown.