更新公会推送
This commit is contained in:
parent
ada9d59d29
commit
94ea61f862
@ -57,12 +57,13 @@ func (l List) Less(i, j int) bool {
|
||||
}
|
||||
|
||||
type Item struct {
|
||||
Id string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Text string `json:"text"`
|
||||
Quantity int `json:"quantity"`
|
||||
Checked bool `json:"checked"`
|
||||
Size int64 `json:"size"`
|
||||
Id string `json:"id"`
|
||||
Title string `json:"title"`
|
||||
Text string `json:"text"`
|
||||
Quantity int `json:"quantity"`
|
||||
Checked bool `json:"checked"`
|
||||
Size int64 `json:"size"`
|
||||
Data interface{} `json:"data"`
|
||||
}
|
||||
|
||||
func NewList(name string) List {
|
||||
|
@ -52,8 +52,8 @@ func (a *appTester) LazyInit(service service.PttService, obs observer.Observer)
|
||||
|
||||
if view, ok := viewRegister[viewKey]; ok {
|
||||
timeLbl := widget.NewLabel("time")
|
||||
view.Init(service, obs, globalWin.w)
|
||||
resLog := widget.NewMultiLineEntry()
|
||||
view.Init(service, obs, globalWin.w, resLog)
|
||||
|
||||
obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{
|
||||
OnNotify: func(data interface{}, args ...interface{}) {
|
||||
|
@ -22,13 +22,14 @@ import (
|
||||
"strings"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/sirupsen/logrus"
|
||||
"github.com/spf13/cast"
|
||||
"google.golang.org/protobuf/proto"
|
||||
)
|
||||
|
||||
type MyCaseView interface {
|
||||
Init(service service.PttService, obs observer.Observer, w fyne.Window)
|
||||
Init(service service.PttService, obs observer.Observer, w fyne.Window, res *widget.Entry)
|
||||
CreateView(t *model.TestCase) fyne.CanvasObject
|
||||
Load()
|
||||
}
|
||||
|
@ -34,6 +34,7 @@ type toyUserInfo struct {
|
||||
obs observer.Observer
|
||||
copyBtn *widget.Button
|
||||
refreshBtn *widget.Button
|
||||
logoutBtn *widget.Button
|
||||
}
|
||||
|
||||
func (this *toyUserInfo) Init(obs observer.Observer) error {
|
||||
@ -62,6 +63,17 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
|
||||
})
|
||||
this.refreshBtn.Disable()
|
||||
|
||||
// 注销用户
|
||||
this.logoutBtn = widget.NewButtonWithIcon("", theme.AccountIcon(), func() {
|
||||
if err := service.GetPttService().SendToClient(
|
||||
string(comm.ModuleUser),
|
||||
user.UserSubTypeInfo,
|
||||
&pb.UserInfoReq{}); err != nil {
|
||||
logrus.Error(err)
|
||||
return
|
||||
}
|
||||
})
|
||||
|
||||
// list
|
||||
this.dataList = widget.NewListWithData(this.data,
|
||||
func() fyne.CanvasObject {
|
||||
@ -76,7 +88,7 @@ func (this *toyUserInfo) Init(obs observer.Observer) error {
|
||||
// sign := widget.NewRichTextFromMarkdown(``)
|
||||
// layout
|
||||
this.widget = widget.NewCard("", "",
|
||||
container.NewBorder(container.NewHBox(this.titleLabel, layout.NewSpacer(), this.refreshBtn, this.copyBtn),
|
||||
container.NewBorder(container.NewHBox(this.titleLabel, layout.NewSpacer(), this.logoutBtn, this.refreshBtn, this.copyBtn),
|
||||
nil, nil, nil, container.NewVScroll(this.dataList)))
|
||||
this.widget.Resize(fyne.NewSize(ToyWidth, 650))
|
||||
|
||||
|
@ -13,13 +13,15 @@ type BaseformView struct {
|
||||
form *widget.Form
|
||||
obs observer.Observer
|
||||
w fyne.Window
|
||||
res *widget.Entry
|
||||
service service.PttService
|
||||
}
|
||||
|
||||
func (this *BaseformView) Init(service service.PttService, obs observer.Observer, w fyne.Window) {
|
||||
func (this *BaseformView) Init(service service.PttService, obs observer.Observer, w fyne.Window, res *widget.Entry) {
|
||||
this.service = service
|
||||
this.obs = obs
|
||||
this.w = w
|
||||
this.res = res
|
||||
this.form = widget.NewForm()
|
||||
this.form.SubmitText = common.BUTTON_OK
|
||||
}
|
||||
|
@ -10,8 +10,11 @@ import (
|
||||
"go_dreamfactory/modules/sociaty"
|
||||
"go_dreamfactory/pb"
|
||||
|
||||
jsoniter "github.com/json-iterator/go"
|
||||
|
||||
"fyne.io/fyne/v2"
|
||||
"fyne.io/fyne/v2/container"
|
||||
"fyne.io/fyne/v2/dialog"
|
||||
"fyne.io/fyne/v2/theme"
|
||||
"fyne.io/fyne/v2/widget"
|
||||
"github.com/sirupsen/logrus"
|
||||
@ -20,8 +23,9 @@ import (
|
||||
type SociatyListView struct {
|
||||
sociatyList func()
|
||||
BaseformView
|
||||
itemList *common.ItemList
|
||||
flag bool
|
||||
itemList *common.ItemList
|
||||
flag bool
|
||||
detailFlag bool
|
||||
}
|
||||
|
||||
func (this *SociatyListView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
@ -29,6 +33,14 @@ func (this *SociatyListView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
|
||||
this.itemList.ItemList = this.itemList.CreateList()
|
||||
|
||||
this.itemList.ItemList.OnSelected = func(id widget.ListItemID) {
|
||||
item := this.itemList.CachedList.Items[id]
|
||||
logrus.Debug(item)
|
||||
if s, ok := item.Data.(*pb.DBSociaty); ok {
|
||||
this.res.Text, _ = jsoniter.MarshalToString(s)
|
||||
}
|
||||
}
|
||||
|
||||
this.sociatyList = func() {
|
||||
this.itemList.Reset()
|
||||
if err := service.GetPttService().SendToClient(
|
||||
@ -82,7 +94,31 @@ func (this *SociatyListView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
})
|
||||
|
||||
// 明细
|
||||
detailBtn := widget.NewButton("明细", nil)
|
||||
// item := &entryItem{
|
||||
// sociatyName: widget.NewEntry(),
|
||||
// notice: widget.NewMultiLineEntry(),
|
||||
// icon: widget.NewEntry(),
|
||||
// isApplyCheck: widget.NewCheck("审批", nil),
|
||||
// applyLv: widget.NewEntry(),
|
||||
// }
|
||||
|
||||
// this.form.AppendItem(widget.NewFormItem("公会名称", item.sociatyName))
|
||||
// this.form.AppendItem(widget.NewFormItem("公告", item.notice))
|
||||
// this.form.AppendItem(widget.NewFormItem("图标", item.icon))
|
||||
// this.form.AppendItem(widget.NewFormItem("审批", item.isApplyCheck))
|
||||
// this.form.AppendItem(widget.NewFormItem("入会等级", item.applyLv))
|
||||
// this.formdataListen(item)
|
||||
|
||||
// detailBtn := widget.NewButton("明细", func() {
|
||||
// if err := service.GetPttService().SendToClient(
|
||||
// string(comm.ModuleSociaty),
|
||||
// sociaty.SociatySubTypeMine,
|
||||
// &pb.SociatyMineReq{}); err != nil {
|
||||
// logrus.Error(err)
|
||||
// }
|
||||
|
||||
// defer this.showSociatyDetailWin()
|
||||
// })
|
||||
|
||||
//过滤
|
||||
filter := widget.NewSelect([]string{"全部", "满足条件", "无需审批", "申请中"}, func(s string) {
|
||||
@ -127,7 +163,7 @@ func (this *SociatyListView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
}
|
||||
})
|
||||
|
||||
buttonBar := container.NewHBox(refreshBtn, applyBtn, cancalApplyBtn, detailBtn, filter)
|
||||
buttonBar := container.NewHBox(refreshBtn, applyBtn, cancalApplyBtn, filter)
|
||||
cBar := container.NewBorder(nil, nil, buttonBar, searchBtn, searchEntry)
|
||||
// layout
|
||||
c := container.NewBorder(cBar, nil, nil, nil, this.itemList.ItemList)
|
||||
@ -161,10 +197,12 @@ func (this *SociatyListView) dataListener() {
|
||||
} else {
|
||||
isApplyCheckLbl = "无需审核"
|
||||
}
|
||||
lbl := fmt.Sprintf("%d - %-15s 等级:%-5d 等级限制:%-5d (%d) %10v", i+1, v.Name, v.Lv, v.ApplyLv, memberCount, isApplyCheckLbl)
|
||||
lbl := fmt.Sprintf("%d - %-15s 等级:%-5d 等级限制:%-5d (%d) %10v",
|
||||
i+1, v.Name, v.Lv, v.ApplyLv, memberCount, isApplyCheckLbl)
|
||||
item := common.Item{
|
||||
Id: v.Id,
|
||||
Text: lbl,
|
||||
Data: v,
|
||||
}
|
||||
this.itemList.AddItem(item)
|
||||
}
|
||||
@ -192,3 +230,38 @@ func (this *SociatyListView) dataListener() {
|
||||
})
|
||||
this.flag = true
|
||||
}
|
||||
|
||||
// 显示公会明细
|
||||
func (this *SociatyListView) showSociatyDetailWin() {
|
||||
c := container.NewBorder(nil, nil, nil, nil, this.form)
|
||||
dconf := dialog.NewCustom("公会详情", "关闭", c, this.w)
|
||||
dconf.Resize(fyne.NewSize(800, 500))
|
||||
dconf.Show()
|
||||
this.form.Refresh()
|
||||
}
|
||||
|
||||
func (this *SociatyListView) formdataListen(item *entryItem) {
|
||||
if this.detailFlag {
|
||||
return
|
||||
}
|
||||
this.obs.AddListener(observer.EVENT_REQ_RSP, observer.Listener{
|
||||
OnNotify: func(d interface{}, args ...interface{}) {
|
||||
data := d.(*pb.UserMessage)
|
||||
if !(data.MainType == string(comm.ModuleSociaty) &&
|
||||
data.SubType == sociaty.SociatySubTypeMine) {
|
||||
return
|
||||
}
|
||||
rsp := &pb.SociatyMineResp{}
|
||||
|
||||
if rsp.Sociaty == nil {
|
||||
return
|
||||
}
|
||||
logrus.Debug(rsp.Sociaty)
|
||||
item.sociatyName.Text = rsp.Sociaty.Name
|
||||
item.notice.Text = rsp.Sociaty.Notice
|
||||
|
||||
this.form.Refresh()
|
||||
},
|
||||
})
|
||||
this.detailFlag = true
|
||||
}
|
||||
|
@ -207,7 +207,6 @@ func (this *SociatyMineView) CreateView(t *model.TestCase) fyne.CanvasObject {
|
||||
t.MainType,
|
||||
sociaty.SociatySubTypeSetting,
|
||||
&pb.SociatySettingReq{
|
||||
SociatyId: this.sociaty.Id,
|
||||
Icon: item.icon.Text,
|
||||
Notice: item.notice.Text,
|
||||
ApplyLv: cast.ToInt32(item.applyLv.Text),
|
||||
|
@ -214,8 +214,10 @@ type (
|
||||
ISociaty interface {
|
||||
//会长弹劾处理
|
||||
ProcessAccuse(uid, sociatyId string)
|
||||
// 公会成员
|
||||
Members(uid string) (list []*pb.SociatyMemberInfo)
|
||||
// 获取我的公会成员
|
||||
MembersByUid(uid string) (list []*pb.SociatyMemberInfo)
|
||||
// 获取公会成员
|
||||
MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo)
|
||||
}
|
||||
//星座图
|
||||
IHoroscope interface {
|
||||
|
@ -298,7 +298,7 @@ func (this *Chat) pushChatToWorld(msg *pb.DBChat) (err error) {
|
||||
|
||||
//推送消息到工会
|
||||
func (this *Chat) pushChatToUnion(msg *pb.DBChat) (err error) {
|
||||
if members := this.sociaty.Members(msg.Suid); members != nil {
|
||||
if members := this.sociaty.MembersBySociatyId(msg.UnionId); members != nil {
|
||||
users := make([]string, 0, len(members))
|
||||
for _, v := range members {
|
||||
if v.OfflineTime == 0 { //离线时间为0 表示在线
|
||||
|
@ -32,6 +32,7 @@ const (
|
||||
SociatySubTypeRank = "rank"
|
||||
SociatySubTypeTasklist = "tasklist"
|
||||
SociatySubTypeLog = "log"
|
||||
SociatySubTypeAgreePush = "agree"
|
||||
)
|
||||
|
||||
type apiComp struct {
|
||||
|
@ -35,13 +35,19 @@ func (this *apiComp) Agree(session comm.IUserSession, req *pb.SociatyAgreeReq) (
|
||||
code = pb.ErrorCode_SociatyNoRight
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
if err := this.module.modelSociaty.agree(req.Uid, sociaty); err != nil {
|
||||
code = pb.ErrorCode_SociatyAgree
|
||||
this.module.Errorf("申请同意失败:%v", err)
|
||||
return
|
||||
}
|
||||
|
||||
//审核通过推送
|
||||
this.module.SendMsgToUser(string(this.module.GetType()), "pagree", &pb.SociatyPAgreePush{
|
||||
Uid: uid,
|
||||
SociatyId: sociaty.Id,
|
||||
}, req.Uid)
|
||||
|
||||
rsp := &pb.SociatyAgreeResp{
|
||||
Uid: req.Uid,
|
||||
SociatyId: sociaty.Id,
|
||||
|
@ -13,7 +13,7 @@ import (
|
||||
|
||||
// 公会创建
|
||||
func (this *apiComp) CreateCheck(session comm.IUserSession, req *pb.SociatyCreateReq) (code pb.ErrorCode) {
|
||||
if len(req.Notice) > 150 {
|
||||
if len(req.Notice) > 150 || req.Name == ""{
|
||||
code = pb.ErrorCode_ReqParameterError
|
||||
}
|
||||
return
|
||||
|
@ -311,8 +311,19 @@ func (this *ModelSociaty) dismiss(sociaty *pb.DBSociaty) error {
|
||||
if err := this.memberClear(sociaty); err != nil {
|
||||
return err
|
||||
}
|
||||
err := this.DelListlds("", sociaty.Id)
|
||||
return err
|
||||
if err := this.DelListlds("", sociaty.Id); err != nil {
|
||||
return err
|
||||
}
|
||||
//推送
|
||||
if err := this.moduleSociaty.SendMsgToUsers(
|
||||
string(this.moduleSociaty.GetType()),
|
||||
"pdismiss",
|
||||
&pb.SociatyPDismissPush{SociatyId: sociaty.Id},
|
||||
this.getMemberIds(sociaty)...); err != nil {
|
||||
log.Errorf("公会解散推送 err:%v", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
//删除请求记录
|
||||
|
@ -144,7 +144,7 @@ func (this *ModelSociatyLog) addLog(tag Tag, sociatyId string, params ...string)
|
||||
}
|
||||
|
||||
// 发消息到公会聊天
|
||||
if module, err := this.moduleSociaty.service.GetModule(comm.ModuleChat); err == nil {
|
||||
if module, err := this.service.GetModule(comm.ModuleChat); err == nil {
|
||||
if chat, ok := module.(comm.IChat); ok {
|
||||
chat.SendUnionChat(&pb.DBChat{
|
||||
Channel: pb.ChatChannel_Union,
|
||||
|
@ -75,8 +75,14 @@ func (this *Sociaty) ProcessAccuse(uid, sociatyId string) {
|
||||
}
|
||||
}
|
||||
|
||||
// 公会成员
|
||||
func (this *Sociaty) Members(uid string) (list []*pb.SociatyMemberInfo) {
|
||||
// 获取我的公会成员
|
||||
func (this *Sociaty) MembersByUid(uid string) (list []*pb.SociatyMemberInfo) {
|
||||
sociaty := this.modelSociaty.getUserSociaty(uid)
|
||||
return this.modelSociaty.members(sociaty)
|
||||
}
|
||||
|
||||
// 获取公会成员
|
||||
func (this *Sociaty) MembersBySociatyId(sociatyId string) (list []*pb.SociatyMemberInfo) {
|
||||
sociaty := this.modelSociaty.getSociaty(sociatyId)
|
||||
return this.modelSociaty.members(sociaty)
|
||||
}
|
||||
|
@ -2621,6 +2621,110 @@ func (x *SociatyRankResp) GetRank() []*DBSociatyRank {
|
||||
return nil
|
||||
}
|
||||
|
||||
// 公会解散推送
|
||||
type SociatyPDismissPush struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
SociatyId string `protobuf:"bytes,1,opt,name=sociatyId,proto3" json:"sociatyId"`
|
||||
}
|
||||
|
||||
func (x *SociatyPDismissPush) Reset() {
|
||||
*x = SociatyPDismissPush{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_sociaty_sociaty_msg_proto_msgTypes[51]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *SociatyPDismissPush) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*SociatyPDismissPush) ProtoMessage() {}
|
||||
|
||||
func (x *SociatyPDismissPush) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_sociaty_sociaty_msg_proto_msgTypes[51]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use SociatyPDismissPush.ProtoReflect.Descriptor instead.
|
||||
func (*SociatyPDismissPush) Descriptor() ([]byte, []int) {
|
||||
return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{51}
|
||||
}
|
||||
|
||||
func (x *SociatyPDismissPush) GetSociatyId() string {
|
||||
if x != nil {
|
||||
return x.SociatyId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
// 审核通过推送
|
||||
type SociatyPAgreePush struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
unknownFields protoimpl.UnknownFields
|
||||
|
||||
Uid string `protobuf:"bytes,1,opt,name=uid,proto3" json:"uid"`
|
||||
SociatyId string `protobuf:"bytes,2,opt,name=sociatyId,proto3" json:"sociatyId"`
|
||||
}
|
||||
|
||||
func (x *SociatyPAgreePush) Reset() {
|
||||
*x = SociatyPAgreePush{}
|
||||
if protoimpl.UnsafeEnabled {
|
||||
mi := &file_sociaty_sociaty_msg_proto_msgTypes[52]
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
}
|
||||
|
||||
func (x *SociatyPAgreePush) String() string {
|
||||
return protoimpl.X.MessageStringOf(x)
|
||||
}
|
||||
|
||||
func (*SociatyPAgreePush) ProtoMessage() {}
|
||||
|
||||
func (x *SociatyPAgreePush) ProtoReflect() protoreflect.Message {
|
||||
mi := &file_sociaty_sociaty_msg_proto_msgTypes[52]
|
||||
if protoimpl.UnsafeEnabled && x != nil {
|
||||
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
|
||||
if ms.LoadMessageInfo() == nil {
|
||||
ms.StoreMessageInfo(mi)
|
||||
}
|
||||
return ms
|
||||
}
|
||||
return mi.MessageOf(x)
|
||||
}
|
||||
|
||||
// Deprecated: Use SociatyPAgreePush.ProtoReflect.Descriptor instead.
|
||||
func (*SociatyPAgreePush) Descriptor() ([]byte, []int) {
|
||||
return file_sociaty_sociaty_msg_proto_rawDescGZIP(), []int{52}
|
||||
}
|
||||
|
||||
func (x *SociatyPAgreePush) GetUid() string {
|
||||
if x != nil {
|
||||
return x.Uid
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func (x *SociatyPAgreePush) GetSociatyId() string {
|
||||
if x != nil {
|
||||
return x.SociatyId
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
var File_sociaty_sociaty_msg_proto protoreflect.FileDescriptor
|
||||
|
||||
var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
|
||||
@ -2810,13 +2914,20 @@ var file_sociaty_sociaty_msg_proto_rawDesc = []byte{
|
||||
0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x71, 0x22, 0x35, 0x0a, 0x0f, 0x53, 0x6f, 0x63, 0x69,
|
||||
0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x04, 0x72,
|
||||
0x61, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x44, 0x42, 0x53, 0x6f,
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x2a,
|
||||
0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69,
|
||||
0x6c, 0x74, 0x65, 0x72, 0x12, 0x07, 0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a,
|
||||
0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50,
|
||||
0x50, 0x4c, 0x59, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e,
|
||||
0x47, 0x10, 0x03, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f,
|
||||
0x74, 0x6f, 0x33,
|
||||
0x63, 0x69, 0x61, 0x74, 0x79, 0x52, 0x61, 0x6e, 0x6b, 0x52, 0x04, 0x72, 0x61, 0x6e, 0x6b, 0x22,
|
||||
0x33, 0x0a, 0x13, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50, 0x44, 0x69, 0x73, 0x6d, 0x69,
|
||||
0x73, 0x73, 0x50, 0x75, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74,
|
||||
0x79, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x73, 0x6f, 0x63, 0x69, 0x61,
|
||||
0x74, 0x79, 0x49, 0x64, 0x22, 0x43, 0x0a, 0x11, 0x53, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x50,
|
||||
0x41, 0x67, 0x72, 0x65, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64,
|
||||
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x73,
|
||||
0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
|
||||
0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x79, 0x49, 0x64, 0x2a, 0x42, 0x0a, 0x11, 0x53, 0x6f, 0x63,
|
||||
0x69, 0x61, 0x74, 0x79, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x12, 0x07,
|
||||
0x0a, 0x03, 0x41, 0x4c, 0x4c, 0x10, 0x00, 0x12, 0x09, 0x0a, 0x05, 0x43, 0x4f, 0x4e, 0x44, 0x49,
|
||||
0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4e, 0x4f, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x10, 0x02, 0x12,
|
||||
0x0c, 0x0a, 0x08, 0x41, 0x50, 0x50, 0x4c, 0x59, 0x49, 0x4e, 0x47, 0x10, 0x03, 0x42, 0x06, 0x5a,
|
||||
0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
@ -2832,7 +2943,7 @@ func file_sociaty_sociaty_msg_proto_rawDescGZIP() []byte {
|
||||
}
|
||||
|
||||
var file_sociaty_sociaty_msg_proto_enumTypes = make([]protoimpl.EnumInfo, 1)
|
||||
var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 51)
|
||||
var file_sociaty_sociaty_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 53)
|
||||
var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
|
||||
(SociatyListFilter)(0), // 0: SociatyListFilter
|
||||
(*SociatyCreateReq)(nil), // 1: SociatyCreateReq
|
||||
@ -2886,28 +2997,30 @@ var file_sociaty_sociaty_msg_proto_goTypes = []interface{}{
|
||||
(*SociatyActivityReceiveResp)(nil), // 49: SociatyActivityReceiveResp
|
||||
(*SociatyRankReq)(nil), // 50: SociatyRankReq
|
||||
(*SociatyRankResp)(nil), // 51: SociatyRankResp
|
||||
(*DBSociaty)(nil), // 52: DBSociaty
|
||||
(SociatyJob)(0), // 53: SociatyJob
|
||||
(*DBSociatyLog)(nil), // 54: DBSociatyLog
|
||||
(*SociatyTask)(nil), // 55: SociatyTask
|
||||
(*SociatyActivity)(nil), // 56: SociatyActivity
|
||||
(*DBSociatyRank)(nil), // 57: DBSociatyRank
|
||||
(*SociatyPDismissPush)(nil), // 52: SociatyPDismissPush
|
||||
(*SociatyPAgreePush)(nil), // 53: SociatyPAgreePush
|
||||
(*DBSociaty)(nil), // 54: DBSociaty
|
||||
(SociatyJob)(0), // 55: SociatyJob
|
||||
(*DBSociatyLog)(nil), // 56: DBSociatyLog
|
||||
(*SociatyTask)(nil), // 57: SociatyTask
|
||||
(*SociatyActivity)(nil), // 58: SociatyActivity
|
||||
(*DBSociatyRank)(nil), // 59: DBSociatyRank
|
||||
}
|
||||
var file_sociaty_sociaty_msg_proto_depIdxs = []int32{
|
||||
0, // 0: SociatyListReq.filter:type_name -> SociatyListFilter
|
||||
52, // 1: SociatyListResp.list:type_name -> DBSociaty
|
||||
52, // 2: SociatySearchResp.list:type_name -> DBSociaty
|
||||
52, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty
|
||||
54, // 1: SociatyListResp.list:type_name -> DBSociaty
|
||||
54, // 2: SociatySearchResp.list:type_name -> DBSociaty
|
||||
54, // 3: SociatyMineResp.sociaty:type_name -> DBSociaty
|
||||
11, // 4: SociatyMineResp.master:type_name -> SociatyMemberInfo
|
||||
53, // 5: SociatyMemberInfo.job:type_name -> SociatyJob
|
||||
55, // 5: SociatyMemberInfo.job:type_name -> SociatyJob
|
||||
11, // 6: SociatyApplyListResp.list:type_name -> SociatyMemberInfo
|
||||
11, // 7: SociatyMembersResp.list:type_name -> SociatyMemberInfo
|
||||
53, // 8: SociatySettingJobReq.job:type_name -> SociatyJob
|
||||
53, // 9: SociatySettingJobResp.job:type_name -> SociatyJob
|
||||
54, // 10: SociatyLogResp.log:type_name -> DBSociatyLog
|
||||
55, // 11: SociatyTaskListResp.list:type_name -> SociatyTask
|
||||
56, // 12: SociatyActivityListResp.list:type_name -> SociatyActivity
|
||||
57, // 13: SociatyRankResp.rank:type_name -> DBSociatyRank
|
||||
55, // 8: SociatySettingJobReq.job:type_name -> SociatyJob
|
||||
55, // 9: SociatySettingJobResp.job:type_name -> SociatyJob
|
||||
56, // 10: SociatyLogResp.log:type_name -> DBSociatyLog
|
||||
57, // 11: SociatyTaskListResp.list:type_name -> SociatyTask
|
||||
58, // 12: SociatyActivityListResp.list:type_name -> SociatyActivity
|
||||
59, // 13: SociatyRankResp.rank:type_name -> DBSociatyRank
|
||||
14, // [14:14] is the sub-list for method output_type
|
||||
14, // [14:14] is the sub-list for method input_type
|
||||
14, // [14:14] is the sub-list for extension type_name
|
||||
@ -3534,6 +3647,30 @@ func file_sociaty_sociaty_msg_proto_init() {
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_sociaty_sociaty_msg_proto_msgTypes[51].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*SociatyPDismissPush); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
file_sociaty_sociaty_msg_proto_msgTypes[52].Exporter = func(v interface{}, i int) interface{} {
|
||||
switch v := v.(*SociatyPAgreePush); i {
|
||||
case 0:
|
||||
return &v.state
|
||||
case 1:
|
||||
return &v.sizeCache
|
||||
case 2:
|
||||
return &v.unknownFields
|
||||
default:
|
||||
return nil
|
||||
}
|
||||
}
|
||||
}
|
||||
type x struct{}
|
||||
out := protoimpl.TypeBuilder{
|
||||
@ -3541,7 +3678,7 @@ func file_sociaty_sociaty_msg_proto_init() {
|
||||
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
|
||||
RawDescriptor: file_sociaty_sociaty_msg_proto_rawDesc,
|
||||
NumEnums: 1,
|
||||
NumMessages: 51,
|
||||
NumMessages: 53,
|
||||
NumExtensions: 0,
|
||||
NumServices: 0,
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user