diff --git a/lua_probject/base_project/Game/Controller/GroupMgrController.lua b/lua_probject/base_project/Game/Controller/GroupMgrController.lua index 7320ac08..1ab0b2dd 100644 --- a/lua_probject/base_project/Game/Controller/GroupMgrController.lua +++ b/lua_probject/base_project/Game/Controller/GroupMgrController.lua @@ -21,6 +21,7 @@ GroupMgrEvent = { Onpush_assistant = "Onpush_assistant", OnFamilyReflash = "OnFamilyReflash", OnFamilyRoomReflash = "OnFamilyRoomReflash", + OnFamilyMemberOut = "OnFamilyMemberOut", } GroupMgrController = { @@ -62,6 +63,7 @@ function GroupMgrController.new() self._eventmap[Protocol.FGMGR_EVT_Member_State] = self.FG_Data_Member_State self._eventmap[Protocol.FGMGR_EVT_Push_Assistant] = self.OnEVT_Push_Assistant self._eventmap[Protocol.WEB_FG_REFLASH] = self.FG_Data_Family_Reflash + self._eventmap[Protocol.WEB_FG_MEMBER_OUT] = self.OnMemberOut -- self:connect(callback) return self end @@ -154,6 +156,7 @@ function M:connect(host, groupId, callback) group.ban_chat2 = res.Data.ban_chat2 group.isvip = res.Data.isvip group.isWatch = res.Data.isWatch + group.joinsData = {} else self.code = SocketCode.ExceptionOnConnect _mgr_client:destroy() @@ -482,6 +485,12 @@ function M:FG_Data_Family_Reflash(evt_data) DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyReflash, evt_data) end +function M:OnMemberOut(evt_data) + print("收到成员退出推送") + pt(evt_data) + DispatchEvent(self._dispatcher, GroupMgrEvent.OnFamilyMemberOut, evt_data) +end + function M:PopEvent() local _cacheEvent = self._cacheEvent if (_cacheEvent:Count() > 0) then diff --git a/lua_probject/base_project/Game/Protocol.lua b/lua_probject/base_project/Game/Protocol.lua index f6aacbe0..91de46d5 100644 --- a/lua_probject/base_project/Game/Protocol.lua +++ b/lua_probject/base_project/Game/Protocol.lua @@ -284,6 +284,9 @@ Protocol = { -- 家族界面刷新推送 WEB_FG_REFLASH = "11111", + -- 成员退出 + WEB_FG_MEMBER_OUT = "13008", + -- 获得申请列表的数量 WEB_FG_APPLYCOUNT = "group/request_apply_count", -------------- group-log--------------------- diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index 9fde4c26..44e109b6 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua @@ -26,9 +26,22 @@ function FamilyAuditNumber.new(root) setmetatable(M, { __index = root }) local self = setmetatable({}, { __index = M }) + local list = self._view:GetChild('list_auditNumberList') + --list:RemoveChildrenToPool() + --list:SetVirtual() + list.itemRenderer = function(index, obj) + AddItem(self, index, obj) + end + return self end +function M:Reflash() + local list = self._view:GetChild('list_auditNumberList') + local group = DataManager.groups:get(self._group.id) + list.numItems = #group.joinsData +end + function M:Show() local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GroupJoins(self._group.id, function(res) @@ -38,14 +51,7 @@ function M:Show() else --self.data[self._group.id] = res.Data.joins self.familyType.selectedIndex = 6 - local list = self._view:GetChild('list_auditNumberList') - --list:RemoveChildrenToPool() - --list:SetVirtual() - list.itemRenderer = function(index, obj) - AddItem(self, index, obj) - end - local group = DataManager.groups:get(self._group.id) - list.numItems = #group.joinsData + self:Reflash() end end) end diff --git a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua index 3cc7de1d..983bc7b1 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -29,7 +29,7 @@ function FamilyEventView.new(root) mgr_ctr:AddEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState)) mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyReflash, handler(self, self._evtOnFamilyReflash)) mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash)) - + mgr_ctr:AddEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut)) print("家族添加监听") return self end @@ -54,7 +54,7 @@ function M:RemoveAll() mgr_ctr:RemoveEventListener(GroupMgrEvent.Onpush_assistant, handler(self, self._evtOnPush_assistant)) mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState)) mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyRoomReflash, handler(self, self._evtOnFamilyRoomReflash)) - + mgr_ctr:RemoveEventListener(GroupMgrEvent.OnFamilyMemberOut, handler(self, self._evtOnFamilyMemberOut)) print("家族去除监听") end @@ -273,6 +273,7 @@ end -- reflashType == "joinFamily" 成功加入了亲友圈 -- reflashType == "outFamily" 成员退出了亲友圈 -- reflashType == "kickoutFamily" 成员被踢出了亲友圈 +-- reflashType == "changeJoins" 修改了申请信息 function M:_evtOnFamilyReflash(...) local view = ViewManager.GetCurrenView() if view.class ~= "FamilyMainView" then @@ -281,22 +282,41 @@ function M:_evtOnFamilyReflash(...) local arg = { ... } local reflashType = arg[1].reflashType - local gourpId = arg[1].gourpId - local parm = arg[1].parm if reflashType == "joinFamily" then view:Reflash() end if reflashType == "outFamily" then - - local player = DataManager. - + --local player = DataManager. --local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈" --string.format(tips, ) - MsgWindow.new(self._root_view, "确定要点过吗?") + --MsgWindow.new(self._root_view, "确定要点过吗?") + end + + if reflashType == "changeJoins" then + local uid = arg[1].uid + local joins = arg[1].joins + + local gMgr = ControllerManager.GetController(GroupMgrController) + local group = DataManager.groups:get(gMgr.groupId) + + group.joins = joins + + for _, data in pairs(group.joinsData) do + if data.id == uid then + group.joinsData[_] = nil + end + end + + view:ChangeOther() + view._child_familyAuditNumber:Reflash() + end + + if reflashType == "" then + end end @@ -318,4 +338,23 @@ function M:_evtOnFamilyRoomReflash(...) view:UpdateFamilyRoom(nil, groupId) end +function M:_evtOnFamilyMemberOut(...) + local arg = { ... } + local arg = arg[1] + + local uid = arg.uid + local groupId = arg.groupId + local name = arg.name + + local group = DataManager.groups:get(groupId) + + local view = ViewManager.GetCurrenView() + if view.class ~= "FamilyMainView" then + return + end + local tips = "成员 【%s(%s)】退出了【%s(%s)】亲友圈" + tips = string.format(tips, name, uid, group.name, groupId) + ViewUtil.ShowTips("成员 【%s】") +end + return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index 6c04f8d5..aacfa22d 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -133,6 +133,7 @@ function M:init(url) end function M:Reflash() + local fgCtr = ControllerManager.GetController(NewGroupController) fgCtr:FG_GroupList(function(res) local groups = res.Data.groups if #groups > 0 then diff --git a/lua_probject/base_project/Game/View/playerDetailView.lua b/lua_probject/base_project/Game/View/playerDetailView.lua index 8f6295af..2ad53cdf 100644 --- a/lua_probject/base_project/Game/View/playerDetailView.lua +++ b/lua_probject/base_project/Game/View/playerDetailView.lua @@ -24,6 +24,11 @@ function playerDetailView:Refalsh(player) self.tex_ip.text = "网络:" .. player.self_user.host_ip self.tex_id.text = "编号:" .. player.self_user.account_id ImageLoad.Load(player.self_user.head_url, self.loader_icon) + + self.cMissile.selectedIndex = 1 + if self.player.self_user.account_id == DataManager.SelfUser.account_id then + self.cMissile.selectedIndex = 0 + end end function playerDetailView:Show(player) @@ -44,6 +49,8 @@ function playerDetailView:Init() self.loader_icon = self._view:GetChild("loader_icon") + self.cMissile = self._view:GetController("cMissile") + self.btn_boom.onClick:Set(function() Send(self, "boom") self:Close() diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua index 3e71f92a..fb1581b9 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXClearingView.lua @@ -49,7 +49,8 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne if result then result.cardList = json.decode(result.cardList) - table.sort(result.cardList) + --排序 + --table.sort(result.cardList) end self.list_lastCard = self._view:GetChild('list_lastCard') diff --git a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua index df128298..2e07ef6f 100644 --- a/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua @@ -95,8 +95,8 @@ function M:InitView(url) end ---------为了下次复现出牌情况 - self._viewText_testName = self._view:GetChild('text_testName') - self._viewText_testName.text = 0 + --self._viewText_testName = self._view:GetChild('text_testName') + --self._viewText_testName.text = 0 end function M:__BuGang(cardInfo, callback) @@ -227,7 +227,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) -- self:ShowHuTip() - self._viewText_testName.text = 0 + --self._viewText_testName.text = 0 self:UpdateRound() self._state.selectedIndex = 1 self:ShowJing() @@ -254,7 +254,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.OutHint, function(...) local info = self._player_card_info[self:GetPos(_room.self_player.seat)] - self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 + --self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 info:UpdateHandCard(true) end) diff --git a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua index 954568a9..ab56a247 100644 --- a/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua @@ -92,8 +92,8 @@ function M:InitView(url) end ---------为了下次复现出牌情况 - self._viewText_testName = self._view:GetChild('text_testName') - self._viewText_testName.text = 0 + --self._viewText_testName = self._view:GetChild('text_testName') + --self._viewText_testName.text = 0 end function M:__BuGang(cardInfo, callback) @@ -224,7 +224,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) -- self:ShowHuTip() - self._viewText_testName.text = 0 + --self._viewText_testName.text = 0 self:UpdateRound() self._state.selectedIndex = 1 self:ShowJing() @@ -251,7 +251,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.OutHint, function(...) local info = self._player_card_info[self:GetPos(_room.self_player.seat)] - self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 + --self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 info:UpdateHandCard(true) end) diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua index 591ac8b2..1aabb032 100644 --- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua @@ -92,8 +92,8 @@ function M:InitView(url) end ---------为了下次复现出牌情况 - self._viewText_testName = self._view:GetChild('text_testName') - self._viewText_testName.text = 0 + --self._viewText_testName = self._view:GetChild('text_testName') + --self._viewText_testName.text = 0 end function M:__BuGang(cardInfo, callback) @@ -224,7 +224,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) -- self:ShowHuTip() --测试用记录出牌权次数 - self._viewText_testName.text = 0 + --self._viewText_testName.text = 0 self:UpdateRound() self._state.selectedIndex = 1 self:ShowJing() @@ -251,7 +251,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.OutHint, function(...) local info = self._player_card_info[self:GetPos(_room.self_player.seat)] - self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 + --self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 info:UpdateHandCard(true) end) diff --git a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua index 722e5cfc..03bacbda 100644 --- a/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua +++ b/lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua @@ -94,8 +94,8 @@ function M:InitView(url) end ---------为了下次复现出牌情况 - self._viewText_testName = self._view:GetChild('text_testName') - self._viewText_testName.text = 0 + --self._viewText_testName = self._view:GetChild('text_testName') + --self._viewText_testName.text = 0 end function M:__BuGang(cardInfo, callback) @@ -226,7 +226,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.SendCards, function(...) -- self:ShowHuTip() - self._viewText_testName.text = 0 + --self._viewText_testName.text = 0 self:UpdateRound() self._state.selectedIndex = 1 self:ShowJing() @@ -253,7 +253,7 @@ function M:EventInit() _gamectr:AddEventListener(TX_GameEvent.OutHint, function(...) local info = self._player_card_info[self:GetPos(_room.self_player.seat)] - self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 + --self._viewText_testName.text = tonumber(self._viewText_testName.text) + 1 info:UpdateHandCard(true) end) diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 35daca49..14fd8237 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -2110,6 +2110,7 @@ + diff --git a/wb_new_ui/assets/Common/window/playerDetail.xml b/wb_new_ui/assets/Common/window/playerDetail.xml index 1dbd7d28..653218e1 100644 --- a/wb_new_ui/assets/Common/window/playerDetail.xml +++ b/wb_new_ui/assets/Common/window/playerDetail.xml @@ -1,25 +1,31 @@ + + + - + - +