upgrade

2021-04-07 16:25:13 +08:00
parent 5a43e0d172
commit 5154e7d513
40 changed files with 870 additions and 1019 deletions
--- a/Assets/trCRM/DBCfg/jsonCfg.meta
+++ b/Assets/trCRM/DBCfg/jsonCfg.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4b0921c8d843d4a5f8193e0c2177fbcb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/Plugins/Android/gen/android/telephony.meta
+++ b/Assets/trCRM/Plugins/Android/gen/android/telephony.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 12d49a1a05449429383d2dd5bc950c04
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/Resources/Shaders.meta
+++ b/Assets/trCRM/Resources/Shaders.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: e9896101a0f2549c18be247df58ec735
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/Scripts/stomp.meta
+++ b/Assets/trCRM/Scripts/stomp.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 24ad222aaf90e4e88a89e4fd237253be
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/serversCfg/servers.json
+++ b/Assets/trCRM/serversCfg/servers.json
@@ -1 +1 @@
-{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29004, "androidVer":"c78481e5f51e86c500e469a70188a8ac", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"c78481e5f51e86c500e469a70188a8ac", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}}
+{"2020158":{"2":{"id":"2", "host":"47.111.20.34", "name":"\u6d4b\u8bd5\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29004, "androidVer":"18edbf9fb5eb660b4a63cd96b79c2a93", "isDev":1}, "3":{"id":"3", "host":"192.168.1.11", "name":"\u672c\u5730\u6d4b\u8bd5", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"18edbf9fb5eb660b4a63cd96b79c2a93", "isDev":1}, "1":{"id":"1", "host":"app.ttf-cti.com", "name":"\u6b63\u5f0f\u670d\u52a1\u5668", "iosVer":"fb48beff87f4fe19229784b93020d5ba", "port":29000, "androidVer":"4f33d26a37d983936fa5feebfe6b57f8", "isDev":0}}}
--- a/Assets/trCRM/trCRM.code-workspace
+++ b/Assets/trCRM/trCRM.code-workspace
@@ -13,6 +13,7 @@
 		},
 		"search.exclude": {
 			"**/*.prefab": true
-		}
+		},
+		"editor.fontSize": 14
 	}
 }
--- a/Assets/trCRM/upgradeRes4Dev/other/Materials.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/Materials.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 56c42d3fd510e4971b5af24431d8d323
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/Textures.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/Textures.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: e2f7d25eee4e14b039f09947cfc1ff79
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/bullet.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/bullet.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ec1df1efe62c44207bfd15283039dcd6
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/effect.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/effect.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 8ca68eaa4427041b1b52f8eb546ba471
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/roles.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/roles.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 048b2cb8354d746649768ed6ab646169
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/sound.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/sound.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: f910205a28f1b42d19bc44a959056d42
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/other/things.meta
+++ b/Assets/trCRM/upgradeRes4Dev/other/things.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 32e2827f76cc6403aa14a5a882b6638b
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/cfg.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/cfg.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 3f389e0b803d140978ae416f9f864988
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/font.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/font.meta
@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: 0f27f70c4415d449ab7b83167721b75f
-folderAsset: yes
-timeCreated: 1498220621
-licenseType: Pro
-DefaultImporter:
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/battle.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: a52b70505ac2042b794323c3d45cd60a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/net/NetProto.lua
@@ -762,7 +762,7 @@ end

 NetProto.send.wforder_cancel_reminder = function(id, callback, timeOutSec)
    local content = {}
-    content.action = NetProto.cmds.readNotice
+    content.action = NetProto.cmds.wforder_cancel_reminder
    content.orderId = id
    content.groupId = NetProto.groupId
    NetProto.sendSocket(content, callback, timeOutSec)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/cell/CSCellBottomBtn.lua
@@ -33,7 +33,7 @@ function _cell.show(go, data)
    uiobjs.Background.spriteName = mData.Background
    uiobjs.Checkmark.spriteName = mData.Checkmark
    if mData.id == 1 then
-        local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys)
+        local unreadNum = DBMessage.getUnreadNum(DBMessage.MsgType.Sys) + DBMessage.getUnreadNum(DBMessage.MsgType.Timeout)
        _cell.setReddotNum(unreadNum)
    else
        _cell.setReddotNum(0)
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMain.lua
@@ -86,7 +86,7 @@ end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMain.procNetwork(cmd, succ, msg, paras)
    if (succ == NetSuccess) then
-        if cmd == NetProto.cmds.readNotice then
+        if cmd == NetProto.cmds.readNotice or cmd == NetProto.cmds.wforder_cancel_reminder then
            CSPMain.refreshBtns()
        end
    end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/CSPMsg.lua
@@ -79,6 +79,7 @@ function CSPMsg.onDragEnd()
    if offset.y < -50 then
        -- 刷数据
        NetProto.send.announcement_query()
+        NetProto.send.wforder_expiry_reminder()
    end
    if isShowdDragFrefresh then
        CSPMsg.repositon()
@@ -108,7 +109,7 @@ end
 -- 网络请求的回调；cmd：指命，succ：成功失败，msg：消息；paras：服务器下行数据
 function CSPMsg.procNetwork(cmd, succ, msg, paras)
    if (succ == NetSuccess) then
-        if cmd == NetProto.cmds.readNotice then
+        if cmd == NetProto.cmds.readNotice or cmd == NetProto.cmds.wforder_cancel_reminder then
            CSPMsg.setList()
        end
    end
--- a/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
+++ b/Assets/trCRM/upgradeRes4Dev/priority/lua/ui/panel/TRPSysMsgList.lua
@@ -120,7 +120,12 @@ function TRPSysMsgList:onClickCell(cell, data)
                end
            end
        )
-        getPanelAsy("PanelSysMsgDetail", onLoadedPanelTT, data)
+        NetProto.send.workFlowQuery({wfId = data.wfId}, "", 1, 
+        function(params)
+            if(params.result and params.result.data) then
+                getPanelAsy("PanelOrderDetail", onLoadedPanelTT, params.result.data[1])
+            end
+        end)
    else
        printw("没有处理该消息类型", data.NOTICETYPE)
    end
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelNewOrder.prefab
@@ -3611,7 +3611,7 @@ MonoBehaviour:
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u5230\u671F\u65E5\u671F"
+  mText: "\u5F00\u59CB\u65E5\u671F"
  mFontSize: 42
  mFontStyle: 0
  mAlignment: 0
--- a/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
+++ b/Assets/trCRM/upgradeRes4Dev/priority/ui/panel/PanelOrderDetail.prefab
@@ -11160,7 +11160,7 @@ MonoBehaviour:
  keepCrispWhenShrunk: 1
  mTrueTypeFont: {fileID: 0}
  mFont: {fileID: 7005176185871406937, guid: 7d76ebfe2dca9412195ae21f35d1b138, type: 3}
-  mText: "\u5230\u671F\u65E5\u671F"
+  mText: "\u5F00\u59CB\u65E5\u671F"
  mFontSize: 42
  mFontStyle: 0
  mAlignment: 0
--- a/Assets/trCRM/upgradeRes4Publish/other/sound/Android.meta
+++ b/Assets/trCRM/upgradeRes4Publish/other/sound/Android.meta
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 4b7502380666f4ba99e1d25a01c0a9c4
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/net/NetProto.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/cell/CSCellBottomBtn.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMain.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/CSPMsg.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
+++ b/Assets/trCRM/upgradeRes4Publish/priority/lua/ui/panel/TRPSysMsgList.lua
--- a/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d
+++ b/Assets/trCRM/upgradeRes4Publish/priority/ui/panel/Android/PanelNewOrder.unity3d
--- 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,abde52b4ad73b695c12c0f094420fe138	%trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13
+r8	(trCRM/resVer/Android/VerCtl/priority.ver8,0c7ce2857d76038850f7a032ab8440018	%trCRM/resVer/Android/VerCtl/other.ver8,a1697c41c0443f2de244401dc128db13
--- 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