diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerView.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerView.lua index 3648ca80..970f6900 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerView.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyManagerView.lua @@ -47,10 +47,10 @@ end function M:FillData() local lev = self._data.lev or 1 self._data.lev = lev - self._viewList_left.numItems = #FamilyManagerTable.ManagerShow[lev] + self._viewList_left.numItems = #FamilyManagerTable.ManagerManger[self._data.pageType].table[lev] local frsitIndex = self._data.frsitIndex or 1 - local viewInfo = FamilyManagerTable.ManagerTable[FamilyManagerTable.ManagerShow[lev][frsitIndex]] + local viewInfo = FamilyManagerTable.ManagerTable[FamilyManagerTable.ManagerManger[self._data.pageType].table[lev][frsitIndex]] viewInfo.view.new({root=self}) self._viewList_left.selectedIndex = frsitIndex - 1 self:Show() diff --git a/lua_probject/base_project/Game/View/FamilyZuo/FamilyMenberManagerPlayerDetailView.lua b/lua_probject/base_project/Game/View/FamilyZuo/FamilyMenberManagerPlayerDetailView.lua new file mode 100644 index 00000000..5a6e68b3 --- /dev/null +++ b/lua_probject/base_project/Game/View/FamilyZuo/FamilyMenberManagerPlayerDetailView.lua @@ -0,0 +1,58 @@ +local FamilyMenberManagerPlayerDetailView = {} + +local M = FamilyMenberManagerPlayerDetailView + +function FamilyMenberManagerPlayerDetailView.new(data,callback) + setmetatable(M, { __index = BaseWindow }) + local self = setmetatable({}, { __index = M }) + self.class = "FamilyMenberManagerPlayerDetailView" + self._data = data + self._callback = callback + self._close_destroy = true + self._new_hide = false + self:init("ui://Family/FamilyMenberManagerPlayerDetail") + return self +end + +function M:init(url) + getmetatable(M).__index.init(self,url) + + local view = self._view + + self:FillData() +end + +function M:FillData() + local info = self._data.info + if not info then + ViewUtil:ErrorTip("页面已失效，请重新打开页面。") + return + end + + local view = self._view + ImageLoad.Load(info.portrait, view:GetChild('btn_head')._iconObject) + view:GetChild('text_name').text = info.nick + view:GetChild('textTitle_idText').text = info.uid + view:GetChild('textTitle_levText').text = info.lev == 1 and "群主" or "成员" + view:GetChild('textTitle_timeText').text = os.date("%Y-%m-%d", tonumber(info.join_time)) + + + self:Show() +end + +-- 打开窗口 +function M:Show() + getmetatable(M).__index.Show(self) +end + +-- 关闭窗口 +function M:Close() + getmetatable(M).__index.Close(self) +end + +-- 销毁窗口 +function M:Destroy() + getmetatable(M).__index.Destroy(self) +end + +return M diff --git a/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_PlayerView copy.lua b/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_PlayerView copy.lua index b66c501f..1a5bba06 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_PlayerView copy.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/ManagerChild_PlayerView copy.lua @@ -18,26 +18,11 @@ function M:init(url) return end local page = root._view:GetChild('page') - self:LoadPage(page, url, function(view) + ViewUtil.LoadPage(page, url, function(view) self._view = view end) end ---确保页面加载后再渲染初始化数据 -function M:LoadPage(loader, url, callback) - loader.url = url - - if loader.component then - callback(loader.component) - else - FrameTimer.New(function() - if loader.component then - callback(loader.component) - end - end, 1):Start() - end -end - function M:FillData() end diff --git a/lua_probject/base_project/Game/View/FamilyZuo/ManagerMenberChild_PlayerView.lua b/lua_probject/base_project/Game/View/FamilyZuo/ManagerMenberChild_PlayerView.lua index 2c23f347..87e0e43a 100644 --- a/lua_probject/base_project/Game/View/FamilyZuo/ManagerMenberChild_PlayerView.lua +++ b/lua_probject/base_project/Game/View/FamilyZuo/ManagerMenberChild_PlayerView.lua @@ -1,3 +1,5 @@ +local FamilyMenberManagerPlayerDetailView = import(".FamilyMenberManagerPlayerDetailView") + local ManagerMenberChild_PlayerView = {} local M = ManagerMenberChild_PlayerView @@ -18,28 +20,72 @@ function M:init(url) return end local page = root._view:GetChild('page') - self:LoadPage(page, url, function(view) + ViewUtil.LoadPage(page, url, function(view) self._view = view + self._viewText_onlineNum = view:GetChild('text_onlineNum') + + --成员列表 + self._viewList_menber = view:GetChild('list_menber') + self._viewList_menber:SetVirtual() + self._viewList_menber.itemRenderer = handler(self, self.MenberRenderer) + self._viewList_menber.onClickItem:Set(handler(self,self.ClickMenberList)) + --邀请 + self._btn_invite = view:GetChild('btn_invite') + self._btn_invite.onClick:Set(handler(self, self.ClickInvite)) + + --搜索 + self._viewInput_search = view:GetChild('input_search') + self._btn_search = view:GetChild('btn_search') + self._btn_search.onClick:Set(handler(self, self._btn_search)) + + self:FillData() end) end ---确保页面加载后再渲染初始化数据 -function M:LoadPage(loader, url, callback) - loader.url = url +--点击搜索 +function M:ClickSearch() - if loader.component then - callback(loader.component) - else - FrameTimer.New(function() - if loader.component then - callback(loader.component) - end - end, 1):Start() +end + +--点击邀请 +function M:ClickInvite() + ViewUtil:ErrorTip("功能暂未开放") +end + +--列表渲染 +function M:MenberRenderer(index, obj) + local info = DataManager.CurrenGroup.members[index + 1] + ImageLoad.Load(info.portrait, obj:GetChild('btn_head')._iconObject) + obj:GetChild('text_name').text = info.nick + obj:GetChild('text_id').text = string.format("标识：%s", info.uid) + local ctr_online = 0 + if info.online and info.online == 1 and info.playing == "startPlaying" then + ctr_online = 2 + elseif not info.online or info.online == 1 then + ctr_online = 1 end + obj:GetController('online').selectedIndex = ctr_online + obj.data = info +end + +function M:ClickMenberList(context) + local info = context.data.data + FamilyMenberManagerPlayerDetailView.new({info = info}) end function M:FillData() + local group = DataManager.CurrenGroup + ViewUtil:ShowModalWait2() + local fgCtr = ControllerManager.GetController(NewGroupController) + fgCtr:FG_GroupMembers12(group.id, 0, group.total_member_num, 2, 2, function(res) + ViewUtil:CloseModalWait2() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") + else + self._viewList_menber.numItems = #group.members + end + end) end -- 打开窗口 diff --git a/wb_new_ui/assets/Common/buttons/Btn_Normol.xml b/wb_new_ui/assets/Common/buttons/Btn_Normol.xml index 46050bf9..5c832319 100644 --- a/wb_new_ui/assets/Common/buttons/Btn_Normol.xml +++ b/wb_new_ui/assets/Common/buttons/Btn_Normol.xml @@ -1,5 +1,5 @@ - + diff --git a/wb_new_ui/assets/Common/images/btn_copy.png b/wb_new_ui/assets/Common/images/btn_copy.png new file mode 100644 index 00000000..e7c3da79 Binary files /dev/null and b/wb_new_ui/assets/Common/images/btn_copy.png differ diff --git a/wb_new_ui/assets/Common/package.xml b/wb_new_ui/assets/Common/package.xml index 287819cf..23d66fb8 100644 --- a/wb_new_ui/assets/Common/package.xml +++ b/wb_new_ui/assets/Common/package.xml @@ -2258,6 +2258,7 @@ + diff --git a/wb_new_ui/assets/Family/FamilyManager/compomemt/ManagerMenberChild_Player.xml b/wb_new_ui/assets/Family/FamilyManager/compomemt/ManagerMenberChild_Player.xml index 6a66b985..91e1a2c2 100644 --- a/wb_new_ui/assets/Family/FamilyManager/compomemt/ManagerMenberChild_Player.xml +++ b/wb_new_ui/assets/Family/FamilyManager/compomemt/ManagerMenberChild_Player.xml @@ -9,7 +9,7 @@