diff --git a/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua b/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua new file mode 100644 index 00000000..2446910b --- /dev/null +++ b/lua_probject/base_project/Game/View/Family/FamilyBanDeskmate.lua @@ -0,0 +1,56 @@ +local FamilyNumberDetail = import(".FamilyNumberDetail") + +local FamilyBanDeskmate = {} + +local M = FamilyBanDeskmate + +function FamilyBanDeskmate.new(root) + setmetatable(M, { __index = root }) + local self = setmetatable({}, { __index = M }) + + + local numbers = self._group.members + local fgCtr = ControllerManager.GetController(NewGroupController) + if #numbers == 0 then + ViewUtil.ShowModalWait() + fgCtr:FG_GroupMembers(self._group.id, 0, self._group.total_member_num, false, 1, function(res) + numbers = self._group.members + -- print("==========================res.Data.members") + pt(self._group.members) + ViewUtil:CloseModalWait() + if res.ReturnCode ~= 0 then + ViewUtil.ErrorTip(res.ReturnCode, "获取成员列表失败") + else + self:GetAllDeskmate(numbers) + end + end) + else + self:GetAllDeskmate(numbers) + end + self:initBtn() + return self +end + +function M:initBtn() + +end + +function M:GetAllDeskmate(numbers) + local fgCtr = ControllerManager.GetController(NewGroupController) + local Deskmate = {} + ViewUtil.ShowModalWait() + for i = 1, #numbers do + fgCtr:FG_GetBanTable(self._group.id, numbers[i].uid, function(res) + if res.ReturnCode == 0 then + + else + ViewUtil.ErrorTip(res.ReturnCode, "获取禁止同桌列表失败！") + end + if i == #numbers then + ViewUtil:CloseModalWait() + end + end) + end +end + +return M diff --git a/lua_probject/base_project/Game/View/FamilyView.lua b/lua_probject/base_project/Game/View/FamilyView.lua index f87baa4c..12eb3bcb 100644 --- a/lua_probject/base_project/Game/View/FamilyView.lua +++ b/lua_probject/base_project/Game/View/FamilyView.lua @@ -8,6 +8,7 @@ local FamilyAllNumbers = import(".Family.FamilyAllNumbers") local FamilyNumberRecord = import(".Family.FamilyNumberRecord") local FamilyAuditNumber = import(".Family.FamilyAuditNumber") local FamilyJoinAndCreate = import(".Family.FamilyJoinAndCreate") +local FamilyBanDeskmate = import(".Family.FamilyBanDeskmate") --- FamilyView = {} @@ -122,7 +123,7 @@ end function M:BanFamily() local fgCtr = ControllerManager.GetController(NewGroupController) - fgCtr:FG_UpdateGroupInfo(self._group.id, name, self._group.name, not self._group.ban, self._group.dissolve_opt, + fgCtr:FG_UpdateGroupInfo(self._group.id, self._group.name, "", not self._group.ban, self._group.dissolve_opt, self._group.kick_opt, self._group.apply, self._group.ban_chat1, self._group.ban_chat2, self._group.option, 0, function(res) if res.ReturnCode ~= 0 then @@ -133,6 +134,10 @@ function M:BanFamily() end) end +function M:BanDeskmate() + self._child_familyAllNumbers = FamilyBanDeskmate.new(self) +end + function M:ChangeNumber(fgCtr, group_id, limit, num, minus_only, sort_type) local list_familyNumber = self._view:GetChild('list_familyNumber') list_familyNumber:SetVirtual() @@ -162,6 +167,7 @@ function M:ConnetFamilyRoom(fgCtr, id) ViewUtil.ErrorTip(res.ReturnCode, "获取房间列表列表失败") else self:UpdateFamilyRoom(fgCtr, id) + self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 return 1 end end) @@ -311,8 +317,7 @@ function M:ConnetFamily(index, groups, isCreate) list_family:SetVirtual() self._group = DataManager.groups:get(groups[index].id) self._view:GetChild('text_familyId').text = self._group.id - self._view:GetController('familyBan').selectedIndex = self._group.ban and 1 or 0 - -- print("===================================self._group") + print("===================================self._group") pt(self._group) self._roomNum = self._group.room_num @@ -510,7 +515,7 @@ local MORE_LIST = { }, { name = "禁止同桌", - Fct = M.ShareWx + Fct = M.BanDeskmate }, { name = "关闭聊天室", diff --git a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua index 549298ce..e899ff4a 100644 --- a/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua +++ b/lua_probject/extend_project/extend/poker/runfast/RunFast_PlayerSelfPokerInfoView.lua @@ -1024,7 +1024,7 @@ function M:UpdateHandCardsPos() card_view.index = i card_view.btn_card.touchable = true self:UpdateCardMove(card_view.btn_card, false, false) - self:SetBtnCardColor(card_view, 0) + self:SetBtnCardColor(card_view, 1) end end diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml new file mode 100644 index 00000000..4912fd7a --- /dev/null +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Component/btn_normol.xml @@ -0,0 +1,10 @@ + + + + + + + + +