申请消息整理

lua_probject/base_project/Game/View/Common/BaseWindow.lua

@@ -263,3 +263,11 @@ function BaseWindow.DestroyAll()
     WindowQueue = {}
     WindowMap = {}
 end
+
+function BaseWindow.FindWindow(viewName)
+    for _, view in pairs(WindowQueue) do
+        if view.class == viewName then
+            return view
+        end
+    end
+end

lua_probject/base_project/Game/View/Family/FamilyAuditNumber.lua

@@ -1,10 +1,7 @@
---local NumberRemark = import(".FamilyNumberRemark")
 local GroupSetTagView = import("..NewGroup.GroupSetTagView")
 
 local FamilyAuditNumber = {}
 
-local M = FamilyAuditNumber
-
 local function AddItem(self, index, obj)
     local group = DataManager.groups:get(self._group.id)
     local info = group.joinsData[index + 1]
@@ -23,40 +20,63 @@ local function AddItem(self, index, obj)
 end
 
 function FamilyAuditNumber.new(root)
-    setmetatable(M, { __index = root })
+    setmetatable(FamilyAuditNumber, { __index = BaseView })
-    local self = setmetatable({}, { __index = M })
+    local self = setmetatable({}, { __index = FamilyAuditNumber })
-
+    self.class = "FamilyAuditNumber"
-    local list = self._view:GetChild('list_auditNumberList')
+    self._scale = true
-    --list:RemoveChildrenToPool()
+    self._animation = false
-    --list:SetVirtual()
+    self:init("ui://Family/com_auditNumber")
-    list.itemRenderer = function(index, obj)
-        AddItem(self, index, obj)
-    end
-
     return self
 end
 
-function M:Reflash()
+function FamilyAuditNumber:init(url)
-    local list = self._view:GetChild('list_auditNumberList')
+    BaseView.InitView(self, url)
-    local group = DataManager.groups:get(self._group.id)
+
-    list.numItems = #group.joinsData
+    self.btn_close = self._view:GetChild("btn_close")
+    self.list_auditNumberList = self._view:GetChild("list_auditNumberList")
+
+    self.list_auditNumberList = self._view:GetChild('list_auditNumberList')
+
+    self.btn_close.onClick:Set(function()
+        self:Close()
+    end)
+
+    self.list_auditNumberList.itemRenderer = function(index, obj)
+        AddItem(self, index, obj)
+    end
 end
 
-function M:Show()
+function FamilyAuditNumber:Reflash()
+    local group = DataManager.groups:get(self._group.id)
+    self.list_auditNumberList.numItems = #group.joinsData
+end
+
+function FamilyAuditNumber:Show(group)
+    self._group = group
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupJoins(self._group.id, function(res)
         if res.ReturnCode ~= 0 then
             ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败")
             return
         else
-            --self.data[self._group.id] = res.Data.joins
-            self.familyType.selectedIndex = 6
             self:Reflash()
         end
     end)
+
+    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+    mgr_ctr:AddEventListener(GroupMgrEvent.OnNewApply, handler(self, self.OnNewApply))
+
+    BaseView.Show(self)
 end
 
-function M:ClickBtn(isAllow, uid)
+function FamilyAuditNumber:Close()
+    local mgr_ctr = ControllerManager.GetController(GroupMgrController)
+    mgr_ctr:RemoveEventListener(GroupMgrEvent.OnNewApply, handler(self, self.OnNewApply))
+
+    BaseView.Close(self)
+end
+
+function FamilyAuditNumber:ClickBtn(isAllow, uid)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     fgCtr:FG_GroupVerifyJoin(self._group.id, uid, isAllow == 1, function(res)
         if res.ReturnCode ~= 0 then
@@ -76,24 +96,11 @@ function M:ClickBtn(isAllow, uid)
     end)
 end
 
-function M:OnNewApply(arg)
+function FamilyAuditNumber:OnNewApply(arg)
     local group = DataManager.groups:get(self._group.id)
-
-    --[[
-    arg = arg[1]
-
-    local msg = {}
-    msg.nick = arg.nick
-    msg.id = arg.uid
-    msg.portrait = arg.portrait
-    msg.tag = arg.remark
-    local groupInfo = self.data[self._group.id]
-    groupInfo[#groupInfo + 1] = msg
-    ]]
-
     local list = self._view:GetChild('list_auditNumberList')
     local obj = list:AddItemFromPool()
     AddItem(self, #group.joinsData - 1, obj)
 end
 
-return M
+return FamilyAuditNumber

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,6 +139,7 @@ function M:_evtNewMailTip(...)
     print("family event _evtNewMailTip")
 end
 
+--[[
 function M:_evtOnNewApply(...)
     print("_evtOnNewApply")
     local arg = { ... }
@@ -151,6 +152,7 @@ function M:_evtOnNewApply(...)
     view:ChangeOther()
     self._child_familyAuditNumber:OnNewApply(arg)
 end
+]]
 
 function M:_evtInviteResponse(...)
     local arg = { ... }
@@ -310,7 +312,11 @@ function M:_evtOnFamilyReflash(...)
         end
 
         view:ChangeOther()
-        view._child_familyAuditNumber:Reflash()
+
+        local win = BaseWindow.FindWindow("FamilyAuditNumber")
+        if win then
+            win:Reflash()
+        end
     end
 end
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -93,7 +93,7 @@ function M:init(url)
     local view = self._view
     self.lastTime = os.time()
 
-    self._child_familyAuditNumber = FamilyAuditNumber.new(self)
+    --self._child_familyAuditNumber = FamilyAuditNumber.new(self)
     self.com_FamilyChatRoom = FamilyChatRoom:Init(view:GetChild('com_chatRoom'), self)
 
     local fgCtr = ControllerManager.GetController(NewGroupController)
@@ -316,8 +316,10 @@ function M:AllNumber()
 end
 
 function M:AuditNumber()
-    self.lastType = 1
+    local view = FamilyAuditNumber.new(self)
-    self._child_familyAuditNumber:Show()
+    view:Show(self._group)
+    --self.lastType = 1
+    --self._child_familyAuditNumber:Show()
     --self._child_familyAuditNumber = FamilyAuditNumber.new(self)
 end
 

wb_new_ui/assets/Family/Main.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="1"/>
+  <controller name="familyType" exported="true" homePageType="specific" homePage="6" pages="6,空,0,main,1,playEdit,4,createAndJoin,5,numberList,7,numberRecord,8,auditNumber" selected="6"/>
   <controller name="createOrJoin" pages="0,create,1,join" selected="0"/>
   <controller name="listFamily" pages="0,,1,,10,,11,,12,,13,,14,,15," selected="0"/>
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
@@ -176,28 +176,6 @@
       <gearDisplay controller="familyType" pages="4"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>
-    <image id="n281_jrro" name="text_titleAuditNumber" src="c8pn7cz4" fileName="Main/Image/Group 327.png" xy="969,24" size="593,99" group="n349_jrro">
-      <relation target="" sidePair="center-center"/>
-    </image>
-    <image id="n282_jrro" name="n282" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="228,168" size="2076,960" group="n284_jrro">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <image id="n283_jrro" name="n283" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="246,186" size="2040,924" group="n284_jrro">
-      <relation target="" sidePair="width-width,height-height"/>
-    </image>
-    <group id="n284_jrro" name="bg_auditNumber" xy="228,168" size="2076,960" group="n349_jrro"/>
-    <list id="n351_jrro" name="list_auditNumberList" xy="272,215" size="1987,854" group="n349_jrro" overflow="scroll" lineGap="24" defaultItem="ui://htcn7v3rjrro7cxz" align="center" autoClearItems="true">
-      <relation target="" sidePair="width-width,height-height"/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-    </list>
-    <group id="n349_jrro" name="auditNumber" xy="228,24" size="2076,1104" advanced="true">
-      <gearDisplay controller="familyType" pages="8"/>
-    </group>
     <image id="n369_j9s1" name="n369" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="424,248" size="359,913" group="n366_j9s1">
       <relation target="" sidePair="left-left,bottomext-bottom"/>
     </image>

wb_new_ui/assets/Family/package.xml

@@ -392,6 +392,7 @@
     <component id="oehx7d60" name="btn_cancel.xml" path="/InviteRoom/Component/"/>
     <component id="oehx7d62" name="btn_enter.xml" path="/InviteRoom/Component/"/>
     <image id="icft7d63" name="Group 687.png" path="/Main/Image/"/>
+    <component id="l4fo7d64" name="com_auditNumber.xml" path="/AuditNumber/" exported="true"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>