From f9657deec7e336cdccb1d8cb4c0201b2f94ac7e9 Mon Sep 17 00:00:00 2001 From: 1076390229 <1076390229@qq.com> Date: Mon, 28 Jul 2025 22:42:58 +0800 Subject: [PATCH] =?UTF-8?q?get=5Fonline=5Fmember=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Game/Controller/NewGroupController.lua | 10 ++++++++++ .../Game/View/Family/FamilyAuditNumber.lua | 15 +++++++++++++-- .../Game/View/Family/FamilyEventView.lua | 15 ++++++++++----- .../base_project/Game/View/FamilyView.lua | 2 ++ .../ProjectSettings/GraphicsSettings.asset | 1 + .../ProjectSettings/ProjectSettings.asset | 4 ++-- 6 files changed, 38 insertions(+), 9 deletions(-) diff --git a/lua_probject/base_project/Game/Controller/NewGroupController.lua b/lua_probject/base_project/Game/Controller/NewGroupController.lua index e57fbdff..ac1982a2 100644 --- a/lua_probject/base_project/Game/Controller/NewGroupController.lua +++ b/lua_probject/base_project/Game/Controller/NewGroupController.lua @@ -1688,4 +1688,14 @@ function M:FG_Get_Apply_Count(callback) _client:send(Protocol.WEB_FG_APPLYCOUNT, _data, function(res) callback(res) end) +end + +-- FG_Get_Online_Member +function M:FG_Get_Online_Member(groupId, callback) + local _data = {} + _data.id = groupId + local _client = ControllerManager.GroupClient + _client:send(Protocol.WEB_FG_APPLYCOUNT, _data, function(res) + callback(res) + end) end \ No newline at end of file diff --git a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua index 9f8b2f0d..683050e9 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua @@ -84,8 +84,19 @@ function FamilyAuditNumber:ClickBtn(isAllow, uid) end local group = DataManager.groups:get(self._group.id) group.joins = group.joins - 1 - self:Show() - self:ChangeOther() + + for _, joinInfo in pairs(group.joinsData) do + if joinInfo.id == uid then + group.joinsData[_] = nil + end + end + + self:Reflash() + + local view = BaseView.FindView("FamilyMainView") + if view then + view:ChangeOther() + end 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 a7390d6e..b90920df 100644 --- a/lua_probject/base_project/Game/View/Family/FamilyEventView.lua +++ b/lua_probject/base_project/Game/View/Family/FamilyEventView.lua @@ -23,7 +23,7 @@ function FamilyEventView.new(root) mgr_ctr:AddEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse)) mgr_ctr:AddEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtIsOpenChatRoom)) mgr_ctr:AddEventListener(GroupMgrEvent.ChatRoomData, handler(self, self._evtChatRoomData)) - --mgr_ctr:AddEventListener(GroupMgrEvent.OnNewApply, handler(self, self._evtOnNewApply)) + mgr_ctr:AddEventListener(GroupMgrEvent.OnNewApply, handler(self, self._evtOnNewApply)) mgr_ctr:AddEventListener(GroupMgrEvent.OnNewRecord, handler(self, self._evtOnNewRecord)) mgr_ctr:AddEventListener(GroupMgrEvent.Onpush_assistant, handler(self, self._evtOnPush_assistant)) mgr_ctr:AddEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState)) @@ -49,7 +49,7 @@ function M:RemoveAll() mgr_ctr:RemoveEventListener(GroupMgrEvent.InviteResponse, handler(self, self._evtInviteResponse)) mgr_ctr:RemoveEventListener(GroupMgrEvent.IsOpenChatRoom, handler(self, self._evtIsOpenChatRoom)) mgr_ctr:RemoveEventListener(GroupMgrEvent.ChatRoomData, handler(self, self._evtChatRoomData)) - --mgr_ctr:RemoveEventListener(GroupMgrEvent.OnNewApply, handler(self, self._evtOnNewApply)) + mgr_ctr:RemoveEventListener(GroupMgrEvent.OnNewApply, handler(self, self._evtOnNewApply)) mgr_ctr:RemoveEventListener(GroupMgrEvent.OnNewRecord, handler(self, self._evtOnNewRecord)) mgr_ctr:RemoveEventListener(GroupMgrEvent.Onpush_assistant, handler(self, self._evtOnPush_assistant)) mgr_ctr:RemoveEventListener(GroupMgrEvent.OnMemberState, handler(self, self._evtOnMemberState)) @@ -139,7 +139,7 @@ function M:_evtNewMailTip(...) print("family event _evtNewMailTip") end ---[[ + function M:_evtOnNewApply(...) print("_evtOnNewApply") local arg = { ... } @@ -150,9 +150,14 @@ function M:_evtOnNewApply(...) return end view:ChangeOther() - self._child_familyAuditNumber:OnNewApply(arg) + + local AuditNumber = BaseView.FindView("FamilyAuditNumber") + + if AuditNumber then + AuditNumber:OnNewApply(arg) + end end -]] + function M:_evtInviteResponse(...) local arg = { ... } diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index e6e35134..d840946e 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -485,6 +485,8 @@ function M:OnEnterGroupCallBack() ViewUtil.CloseModalWait() self:ReflashChatRoomRedPoint() + + fgCtr:FG_Get_Online_Member(self._group.id, callback) end function M:UpdateFamilyRoom(fgCtr, id) diff --git a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset index 4f4dac17..ad8f23e5 100644 --- a/wb_unity_pro/ProjectSettings/GraphicsSettings.asset +++ b/wb_unity_pro/ProjectSettings/GraphicsSettings.asset @@ -38,6 +38,7 @@ GraphicsSettings: - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0} m_PreloadedShaders: [] m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} diff --git a/wb_unity_pro/ProjectSettings/ProjectSettings.asset b/wb_unity_pro/ProjectSettings/ProjectSettings.asset index 1503613e..99642c80 100644 --- a/wb_unity_pro/ProjectSettings/ProjectSettings.asset +++ b/wb_unity_pro/ProjectSettings/ProjectSettings.asset @@ -178,8 +178,8 @@ PlayerSettings: buildNumber: iPhone: 1 AndroidBundleVersionCode: 12 - AndroidMinSdkVersion: 26 - AndroidTargetSdkVersion: 26 + AndroidMinSdkVersion: 21 + AndroidTargetSdkVersion: 30 AndroidPreferredInstallLocation: 1 aotOptions: stripEngineCode: 0