添加时，搜索好友 然后右键 选择操作
后续页面改下 listView 下面 在加上验证div，平时hide 查询需要验证的时，show 考虑 打招呼 也向上个div一样 还是， 直接添加到临时会话， 添加到好友列表内？
This commit is contained in:
parent
53440de663
commit
65b659948a
@ -65,6 +65,7 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2eim_2eproto::offsets[] PRO
|
||||
~0u, // no _oneof_case_
|
||||
~0u, // no _weak_field_map_
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::notice, message_id_),
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::notice, time_),
|
||||
~0u, // no _has_bits_
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, _internal_metadata_),
|
||||
~0u, // no _extensions_
|
||||
@ -73,12 +74,13 @@ const ::PROTOBUF_NAMESPACE_ID::uint32 TableStruct_mp_2eim_2eproto::offsets[] PRO
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, msg_type_),
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, session_type_),
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, message_id_),
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, time_),
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, account_),
|
||||
PROTOBUF_FIELD_OFFSET(::mp::im::data, msg_data_),
|
||||
};
|
||||
static const ::PROTOBUF_NAMESPACE_ID::internal::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) = {
|
||||
{ 0, -1, sizeof(::mp::im::notice)},
|
||||
{ 6, -1, sizeof(::mp::im::data)},
|
||||
{ 7, -1, sizeof(::mp::im::data)},
|
||||
};
|
||||
|
||||
static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] = {
|
||||
@ -87,12 +89,12 @@ static ::PROTOBUF_NAMESPACE_ID::Message const * const file_default_instances[] =
|
||||
};
|
||||
|
||||
const char descriptor_table_protodef_mp_2eim_2eproto[] PROTOBUF_SECTION_VARIABLE(protodesc_cold) =
|
||||
"\n\013mp.im.proto\022\005mp.im\032\013mp.mp.proto\"\034\n\006not"
|
||||
"ice\022\022\n\nmessage_id\030\001 \001(\t\"\207\001\n\004data\022!\n\010msg_"
|
||||
"type\030\001 \001(\0162\017.mp.MP_SUB_TYPE\022%\n\014session_t"
|
||||
"ype\030\002 \001(\0162\017.mp.MP_SUB_TYPE\022\022\n\nmessage_id"
|
||||
"\030\003 \001(\t\022\017\n\007account\030\004 \001(\004\022\020\n\010msg_data\030\005 \001("
|
||||
"\tb\006proto3"
|
||||
"\n\013mp.im.proto\022\005mp.im\032\013mp.mp.proto\"*\n\006not"
|
||||
"ice\022\022\n\nmessage_id\030\001 \001(\004\022\014\n\004time\030\002 \001(\004\"\225\001"
|
||||
"\n\004data\022!\n\010msg_type\030\001 \001(\0162\017.mp.MP_SUB_TYP"
|
||||
"E\022%\n\014session_type\030\002 \001(\0162\017.mp.MP_SUB_TYPE"
|
||||
"\022\022\n\nmessage_id\030\003 \001(\004\022\014\n\004time\030\004 \001(\004\022\017\n\007ac"
|
||||
"count\030\005 \001(\004\022\020\n\010msg_data\030\006 \001(\tb\006proto3"
|
||||
;
|
||||
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2eim_2eproto_deps[1] = {
|
||||
&::descriptor_table_mp_2emp_2eproto,
|
||||
@ -103,7 +105,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_
|
||||
};
|
||||
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_mp_2eim_2eproto_once;
|
||||
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2eim_2eproto = {
|
||||
false, false, descriptor_table_protodef_mp_2eim_2eproto, "mp.im.proto", 209,
|
||||
false, false, descriptor_table_protodef_mp_2eim_2eproto, "mp.im.proto", 237,
|
||||
&descriptor_table_mp_2eim_2eproto_once, descriptor_table_mp_2eim_2eproto_sccs, descriptor_table_mp_2eim_2eproto_deps, 2, 1,
|
||||
schemas, file_default_instances, TableStruct_mp_2eim_2eproto::offsets,
|
||||
file_level_metadata_mp_2eim_2eproto, 2, file_level_enum_descriptors_mp_2eim_2eproto, file_level_service_descriptors_mp_2eim_2eproto,
|
||||
@ -131,17 +133,16 @@ notice::notice(::PROTOBUF_NAMESPACE_ID::Arena* arena)
|
||||
notice::notice(const notice& from)
|
||||
: ::PROTOBUF_NAMESPACE_ID::Message() {
|
||||
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
|
||||
message_id_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
if (!from._internal_message_id().empty()) {
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_message_id(),
|
||||
GetArena());
|
||||
}
|
||||
::memcpy(&message_id_, &from.message_id_,
|
||||
static_cast<size_t>(reinterpret_cast<char*>(&time_) -
|
||||
reinterpret_cast<char*>(&message_id_)) + sizeof(time_));
|
||||
// @@protoc_insertion_point(copy_constructor:mp.im.notice)
|
||||
}
|
||||
|
||||
void notice::SharedCtor() {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_notice_mp_2eim_2eproto.base);
|
||||
message_id_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
::memset(&message_id_, 0, static_cast<size_t>(
|
||||
reinterpret_cast<char*>(&time_) -
|
||||
reinterpret_cast<char*>(&message_id_)) + sizeof(time_));
|
||||
}
|
||||
|
||||
notice::~notice() {
|
||||
@ -152,7 +153,6 @@ notice::~notice() {
|
||||
|
||||
void notice::SharedDtor() {
|
||||
GOOGLE_DCHECK(GetArena() == nullptr);
|
||||
message_id_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
|
||||
void notice::ArenaDtor(void* object) {
|
||||
@ -176,7 +176,9 @@ void notice::Clear() {
|
||||
// Prevent compiler warnings about cached_has_bits being unused
|
||||
(void) cached_has_bits;
|
||||
|
||||
message_id_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
::memset(&message_id_, 0, static_cast<size_t>(
|
||||
reinterpret_cast<char*>(&time_) -
|
||||
reinterpret_cast<char*>(&message_id_)) + sizeof(time_));
|
||||
_internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
|
||||
}
|
||||
|
||||
@ -188,12 +190,17 @@ const char* notice::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::int
|
||||
ptr = ::PROTOBUF_NAMESPACE_ID::internal::ReadTag(ptr, &tag);
|
||||
CHK_(ptr);
|
||||
switch (tag >> 3) {
|
||||
// string message_id = 1;
|
||||
// uint64 message_id = 1;
|
||||
case 1:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 10)) {
|
||||
auto str = _internal_mutable_message_id();
|
||||
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
|
||||
CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.im.notice.message_id"));
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 8)) {
|
||||
message_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// uint64 time = 2;
|
||||
case 2:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 16)) {
|
||||
time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
@ -225,14 +232,16 @@ failure:
|
||||
::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
|
||||
(void) cached_has_bits;
|
||||
|
||||
// string message_id = 1;
|
||||
if (this->message_id().size() > 0) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
|
||||
this->_internal_message_id().data(), static_cast<int>(this->_internal_message_id().length()),
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
|
||||
"mp.im.notice.message_id");
|
||||
target = stream->WriteStringMaybeAliased(
|
||||
1, this->_internal_message_id(), target);
|
||||
// uint64 message_id = 1;
|
||||
if (this->message_id() != 0) {
|
||||
target = stream->EnsureSpace(target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(1, this->_internal_message_id(), target);
|
||||
}
|
||||
|
||||
// uint64 time = 2;
|
||||
if (this->time() != 0) {
|
||||
target = stream->EnsureSpace(target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(2, this->_internal_time(), target);
|
||||
}
|
||||
|
||||
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
|
||||
@ -251,13 +260,20 @@ size_t notice::ByteSizeLong() const {
|
||||
// Prevent compiler warnings about cached_has_bits being unused
|
||||
(void) cached_has_bits;
|
||||
|
||||
// string message_id = 1;
|
||||
if (this->message_id().size() > 0) {
|
||||
// uint64 message_id = 1;
|
||||
if (this->message_id() != 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
|
||||
this->_internal_message_id());
|
||||
}
|
||||
|
||||
// uint64 time = 2;
|
||||
if (this->time() != 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
|
||||
this->_internal_time());
|
||||
}
|
||||
|
||||
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
|
||||
return ::PROTOBUF_NAMESPACE_ID::internal::ComputeUnknownFieldsSize(
|
||||
_internal_metadata_, total_size, &_cached_size_);
|
||||
@ -289,9 +305,12 @@ void notice::MergeFrom(const notice& from) {
|
||||
::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
|
||||
(void) cached_has_bits;
|
||||
|
||||
if (from.message_id().size() > 0) {
|
||||
if (from.message_id() != 0) {
|
||||
_internal_set_message_id(from._internal_message_id());
|
||||
}
|
||||
if (from.time() != 0) {
|
||||
_internal_set_time(from._internal_time());
|
||||
}
|
||||
}
|
||||
|
||||
void notice::CopyFrom(const ::PROTOBUF_NAMESPACE_ID::Message& from) {
|
||||
@ -315,7 +334,12 @@ bool notice::IsInitialized() const {
|
||||
void notice::InternalSwap(notice* other) {
|
||||
using std::swap;
|
||||
_internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_);
|
||||
message_id_.Swap(&other->message_id_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
::PROTOBUF_NAMESPACE_ID::internal::memswap<
|
||||
PROTOBUF_FIELD_OFFSET(notice, time_)
|
||||
+ sizeof(notice::time_)
|
||||
- PROTOBUF_FIELD_OFFSET(notice, message_id_)>(
|
||||
reinterpret_cast<char*>(&message_id_),
|
||||
reinterpret_cast<char*>(&other->message_id_));
|
||||
}
|
||||
|
||||
::PROTOBUF_NAMESPACE_ID::Metadata notice::GetMetadata() const {
|
||||
@ -340,11 +364,6 @@ data::data(::PROTOBUF_NAMESPACE_ID::Arena* arena)
|
||||
data::data(const data& from)
|
||||
: ::PROTOBUF_NAMESPACE_ID::Message() {
|
||||
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
|
||||
message_id_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
if (!from._internal_message_id().empty()) {
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_message_id(),
|
||||
GetArena());
|
||||
}
|
||||
msg_data_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
if (!from._internal_msg_data().empty()) {
|
||||
msg_data_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), from._internal_msg_data(),
|
||||
@ -358,7 +377,6 @@ data::data(const data& from)
|
||||
|
||||
void data::SharedCtor() {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::InitSCC(&scc_info_data_mp_2eim_2eproto.base);
|
||||
message_id_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
msg_data_.UnsafeSetDefault(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
::memset(&msg_type_, 0, static_cast<size_t>(
|
||||
reinterpret_cast<char*>(&account_) -
|
||||
@ -373,7 +391,6 @@ data::~data() {
|
||||
|
||||
void data::SharedDtor() {
|
||||
GOOGLE_DCHECK(GetArena() == nullptr);
|
||||
message_id_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
msg_data_.DestroyNoArena(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited());
|
||||
}
|
||||
|
||||
@ -398,7 +415,6 @@ void data::Clear() {
|
||||
// Prevent compiler warnings about cached_has_bits being unused
|
||||
(void) cached_has_bits;
|
||||
|
||||
message_id_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
msg_data_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
::memset(&msg_type_, 0, static_cast<size_t>(
|
||||
reinterpret_cast<char*>(&account_) -
|
||||
@ -430,25 +446,30 @@ const char* data::_InternalParse(const char* ptr, ::PROTOBUF_NAMESPACE_ID::inter
|
||||
_internal_set_session_type(static_cast<::mp::MP_SUB_TYPE>(val));
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// string message_id = 3;
|
||||
// uint64 message_id = 3;
|
||||
case 3:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 26)) {
|
||||
auto str = _internal_mutable_message_id();
|
||||
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
|
||||
CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.im.data.message_id"));
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 24)) {
|
||||
message_id_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// uint64 account = 4;
|
||||
// uint64 time = 4;
|
||||
case 4:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 32)) {
|
||||
time_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// uint64 account = 5;
|
||||
case 5:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 40)) {
|
||||
account_ = ::PROTOBUF_NAMESPACE_ID::internal::ReadVarint64(&ptr);
|
||||
CHK_(ptr);
|
||||
} else goto handle_unusual;
|
||||
continue;
|
||||
// string msg_data = 5;
|
||||
case 5:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 42)) {
|
||||
// string msg_data = 6;
|
||||
case 6:
|
||||
if (PROTOBUF_PREDICT_TRUE(static_cast<::PROTOBUF_NAMESPACE_ID::uint8>(tag) == 50)) {
|
||||
auto str = _internal_mutable_msg_data();
|
||||
ptr = ::PROTOBUF_NAMESPACE_ID::internal::InlineGreedyStringParser(str, ptr, ctx);
|
||||
CHK_(::PROTOBUF_NAMESPACE_ID::internal::VerifyUTF8(str, "mp.im.data.msg_data"));
|
||||
@ -497,30 +518,32 @@ failure:
|
||||
2, this->_internal_session_type(), target);
|
||||
}
|
||||
|
||||
// string message_id = 3;
|
||||
if (this->message_id().size() > 0) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
|
||||
this->_internal_message_id().data(), static_cast<int>(this->_internal_message_id().length()),
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
|
||||
"mp.im.data.message_id");
|
||||
target = stream->WriteStringMaybeAliased(
|
||||
3, this->_internal_message_id(), target);
|
||||
// uint64 message_id = 3;
|
||||
if (this->message_id() != 0) {
|
||||
target = stream->EnsureSpace(target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(3, this->_internal_message_id(), target);
|
||||
}
|
||||
|
||||
// uint64 account = 4;
|
||||
// uint64 time = 4;
|
||||
if (this->time() != 0) {
|
||||
target = stream->EnsureSpace(target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(4, this->_internal_time(), target);
|
||||
}
|
||||
|
||||
// uint64 account = 5;
|
||||
if (this->account() != 0) {
|
||||
target = stream->EnsureSpace(target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(4, this->_internal_account(), target);
|
||||
target = ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::WriteUInt64ToArray(5, this->_internal_account(), target);
|
||||
}
|
||||
|
||||
// string msg_data = 5;
|
||||
// string msg_data = 6;
|
||||
if (this->msg_data().size() > 0) {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
|
||||
this->_internal_msg_data().data(), static_cast<int>(this->_internal_msg_data().length()),
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
|
||||
"mp.im.data.msg_data");
|
||||
target = stream->WriteStringMaybeAliased(
|
||||
5, this->_internal_msg_data(), target);
|
||||
6, this->_internal_msg_data(), target);
|
||||
}
|
||||
|
||||
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
|
||||
@ -539,14 +562,7 @@ size_t data::ByteSizeLong() const {
|
||||
// Prevent compiler warnings about cached_has_bits being unused
|
||||
(void) cached_has_bits;
|
||||
|
||||
// string message_id = 3;
|
||||
if (this->message_id().size() > 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
|
||||
this->_internal_message_id());
|
||||
}
|
||||
|
||||
// string msg_data = 5;
|
||||
// string msg_data = 6;
|
||||
if (this->msg_data().size() > 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
|
||||
@ -565,7 +581,21 @@ size_t data::ByteSizeLong() const {
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::EnumSize(this->_internal_session_type());
|
||||
}
|
||||
|
||||
// uint64 account = 4;
|
||||
// uint64 message_id = 3;
|
||||
if (this->message_id() != 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
|
||||
this->_internal_message_id());
|
||||
}
|
||||
|
||||
// uint64 time = 4;
|
||||
if (this->time() != 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
|
||||
this->_internal_time());
|
||||
}
|
||||
|
||||
// uint64 account = 5;
|
||||
if (this->account() != 0) {
|
||||
total_size += 1 +
|
||||
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::UInt64Size(
|
||||
@ -603,9 +633,6 @@ void data::MergeFrom(const data& from) {
|
||||
::PROTOBUF_NAMESPACE_ID::uint32 cached_has_bits = 0;
|
||||
(void) cached_has_bits;
|
||||
|
||||
if (from.message_id().size() > 0) {
|
||||
_internal_set_message_id(from._internal_message_id());
|
||||
}
|
||||
if (from.msg_data().size() > 0) {
|
||||
_internal_set_msg_data(from._internal_msg_data());
|
||||
}
|
||||
@ -615,6 +642,12 @@ void data::MergeFrom(const data& from) {
|
||||
if (from.session_type() != 0) {
|
||||
_internal_set_session_type(from._internal_session_type());
|
||||
}
|
||||
if (from.message_id() != 0) {
|
||||
_internal_set_message_id(from._internal_message_id());
|
||||
}
|
||||
if (from.time() != 0) {
|
||||
_internal_set_time(from._internal_time());
|
||||
}
|
||||
if (from.account() != 0) {
|
||||
_internal_set_account(from._internal_account());
|
||||
}
|
||||
@ -641,7 +674,6 @@ bool data::IsInitialized() const {
|
||||
void data::InternalSwap(data* other) {
|
||||
using std::swap;
|
||||
_internal_metadata_.Swap<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(&other->_internal_metadata_);
|
||||
message_id_.Swap(&other->message_id_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
msg_data_.Swap(&other->msg_data_, &::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
::PROTOBUF_NAMESPACE_ID::internal::memswap<
|
||||
PROTOBUF_FIELD_OFFSET(data, account_)
|
||||
|
||||
@ -188,30 +188,24 @@ class notice PROTOBUF_FINAL :
|
||||
|
||||
enum : int {
|
||||
kMessageIdFieldNumber = 1,
|
||||
kTimeFieldNumber = 2,
|
||||
};
|
||||
// string message_id = 1;
|
||||
// uint64 message_id = 1;
|
||||
void clear_message_id();
|
||||
const std::string& message_id() const;
|
||||
void set_message_id(const std::string& value);
|
||||
void set_message_id(std::string&& value);
|
||||
void set_message_id(const char* value);
|
||||
void set_message_id(const char* value, size_t size);
|
||||
std::string* mutable_message_id();
|
||||
std::string* release_message_id();
|
||||
void set_allocated_message_id(std::string* message_id);
|
||||
GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
|
||||
" string fields are deprecated and will be removed in a"
|
||||
" future release.")
|
||||
std::string* unsafe_arena_release_message_id();
|
||||
GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
|
||||
" string fields are deprecated and will be removed in a"
|
||||
" future release.")
|
||||
void unsafe_arena_set_allocated_message_id(
|
||||
std::string* message_id);
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 message_id() const;
|
||||
void set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
private:
|
||||
const std::string& _internal_message_id() const;
|
||||
void _internal_set_message_id(const std::string& value);
|
||||
std::string* _internal_mutable_message_id();
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 _internal_message_id() const;
|
||||
void _internal_set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
public:
|
||||
|
||||
// uint64 time = 2;
|
||||
void clear_time();
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 time() const;
|
||||
void set_time(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
private:
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 _internal_time() const;
|
||||
void _internal_set_time(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
public:
|
||||
|
||||
// @@protoc_insertion_point(class_scope:mp.im.notice)
|
||||
@ -221,7 +215,8 @@ class notice PROTOBUF_FINAL :
|
||||
template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
|
||||
typedef void InternalArenaConstructable_;
|
||||
typedef void DestructorSkippable_;
|
||||
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_id_;
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 message_id_;
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 time_;
|
||||
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
|
||||
friend struct ::TableStruct_mp_2eim_2eproto;
|
||||
};
|
||||
@ -340,38 +335,14 @@ class data PROTOBUF_FINAL :
|
||||
// accessors -------------------------------------------------------
|
||||
|
||||
enum : int {
|
||||
kMessageIdFieldNumber = 3,
|
||||
kMsgDataFieldNumber = 5,
|
||||
kMsgDataFieldNumber = 6,
|
||||
kMsgTypeFieldNumber = 1,
|
||||
kSessionTypeFieldNumber = 2,
|
||||
kAccountFieldNumber = 4,
|
||||
kMessageIdFieldNumber = 3,
|
||||
kTimeFieldNumber = 4,
|
||||
kAccountFieldNumber = 5,
|
||||
};
|
||||
// string message_id = 3;
|
||||
void clear_message_id();
|
||||
const std::string& message_id() const;
|
||||
void set_message_id(const std::string& value);
|
||||
void set_message_id(std::string&& value);
|
||||
void set_message_id(const char* value);
|
||||
void set_message_id(const char* value, size_t size);
|
||||
std::string* mutable_message_id();
|
||||
std::string* release_message_id();
|
||||
void set_allocated_message_id(std::string* message_id);
|
||||
GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
|
||||
" string fields are deprecated and will be removed in a"
|
||||
" future release.")
|
||||
std::string* unsafe_arena_release_message_id();
|
||||
GOOGLE_PROTOBUF_RUNTIME_DEPRECATED("The unsafe_arena_ accessors for"
|
||||
" string fields are deprecated and will be removed in a"
|
||||
" future release.")
|
||||
void unsafe_arena_set_allocated_message_id(
|
||||
std::string* message_id);
|
||||
private:
|
||||
const std::string& _internal_message_id() const;
|
||||
void _internal_set_message_id(const std::string& value);
|
||||
std::string* _internal_mutable_message_id();
|
||||
public:
|
||||
|
||||
// string msg_data = 5;
|
||||
// string msg_data = 6;
|
||||
void clear_msg_data();
|
||||
const std::string& msg_data() const;
|
||||
void set_msg_data(const std::string& value);
|
||||
@ -414,7 +385,25 @@ class data PROTOBUF_FINAL :
|
||||
void _internal_set_session_type(::mp::MP_SUB_TYPE value);
|
||||
public:
|
||||
|
||||
// uint64 account = 4;
|
||||
// uint64 message_id = 3;
|
||||
void clear_message_id();
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 message_id() const;
|
||||
void set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
private:
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 _internal_message_id() const;
|
||||
void _internal_set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
public:
|
||||
|
||||
// uint64 time = 4;
|
||||
void clear_time();
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 time() const;
|
||||
void set_time(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
private:
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 _internal_time() const;
|
||||
void _internal_set_time(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
public:
|
||||
|
||||
// uint64 account = 5;
|
||||
void clear_account();
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 account() const;
|
||||
void set_account(::PROTOBUF_NAMESPACE_ID::uint64 value);
|
||||
@ -430,10 +419,11 @@ class data PROTOBUF_FINAL :
|
||||
template <typename T> friend class ::PROTOBUF_NAMESPACE_ID::Arena::InternalHelper;
|
||||
typedef void InternalArenaConstructable_;
|
||||
typedef void DestructorSkippable_;
|
||||
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr message_id_;
|
||||
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr msg_data_;
|
||||
int msg_type_;
|
||||
int session_type_;
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 message_id_;
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 time_;
|
||||
::PROTOBUF_NAMESPACE_ID::uint64 account_;
|
||||
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
|
||||
friend struct ::TableStruct_mp_2eim_2eproto;
|
||||
@ -449,85 +439,44 @@ class data PROTOBUF_FINAL :
|
||||
#endif // __GNUC__
|
||||
// notice
|
||||
|
||||
// string message_id = 1;
|
||||
// uint64 message_id = 1;
|
||||
inline void notice::clear_message_id() {
|
||||
message_id_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
message_id_ = PROTOBUF_ULONGLONG(0);
|
||||
}
|
||||
inline const std::string& notice::message_id() const {
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 notice::_internal_message_id() const {
|
||||
return message_id_;
|
||||
}
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 notice::message_id() const {
|
||||
// @@protoc_insertion_point(field_get:mp.im.notice.message_id)
|
||||
return _internal_message_id();
|
||||
}
|
||||
inline void notice::set_message_id(const std::string& value) {
|
||||
inline void notice::_internal_set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
|
||||
message_id_ = value;
|
||||
}
|
||||
inline void notice::set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
_internal_set_message_id(value);
|
||||
// @@protoc_insertion_point(field_set:mp.im.notice.message_id)
|
||||
}
|
||||
inline std::string* notice::mutable_message_id() {
|
||||
// @@protoc_insertion_point(field_mutable:mp.im.notice.message_id)
|
||||
return _internal_mutable_message_id();
|
||||
|
||||
// uint64 time = 2;
|
||||
inline void notice::clear_time() {
|
||||
time_ = PROTOBUF_ULONGLONG(0);
|
||||
}
|
||||
inline const std::string& notice::_internal_message_id() const {
|
||||
return message_id_.Get();
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 notice::_internal_time() const {
|
||||
return time_;
|
||||
}
|
||||
inline void notice::_internal_set_message_id(const std::string& value) {
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 notice::time() const {
|
||||
// @@protoc_insertion_point(field_get:mp.im.notice.time)
|
||||
return _internal_time();
|
||||
}
|
||||
inline void notice::_internal_set_time(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
|
||||
time_ = value;
|
||||
}
|
||||
inline void notice::set_message_id(std::string&& value) {
|
||||
|
||||
message_id_.Set(
|
||||
&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
|
||||
// @@protoc_insertion_point(field_set_rvalue:mp.im.notice.message_id)
|
||||
}
|
||||
inline void notice::set_message_id(const char* value) {
|
||||
GOOGLE_DCHECK(value != nullptr);
|
||||
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
|
||||
GetArena());
|
||||
// @@protoc_insertion_point(field_set_char:mp.im.notice.message_id)
|
||||
}
|
||||
inline void notice::set_message_id(const char* value,
|
||||
size_t size) {
|
||||
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
|
||||
reinterpret_cast<const char*>(value), size), GetArena());
|
||||
// @@protoc_insertion_point(field_set_pointer:mp.im.notice.message_id)
|
||||
}
|
||||
inline std::string* notice::_internal_mutable_message_id() {
|
||||
|
||||
return message_id_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
}
|
||||
inline std::string* notice::release_message_id() {
|
||||
// @@protoc_insertion_point(field_release:mp.im.notice.message_id)
|
||||
return message_id_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
}
|
||||
inline void notice::set_allocated_message_id(std::string* message_id) {
|
||||
if (message_id != nullptr) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
message_id_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), message_id,
|
||||
GetArena());
|
||||
// @@protoc_insertion_point(field_set_allocated:mp.im.notice.message_id)
|
||||
}
|
||||
inline std::string* notice::unsafe_arena_release_message_id() {
|
||||
// @@protoc_insertion_point(field_unsafe_arena_release:mp.im.notice.message_id)
|
||||
GOOGLE_DCHECK(GetArena() != nullptr);
|
||||
|
||||
return message_id_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
|
||||
GetArena());
|
||||
}
|
||||
inline void notice::unsafe_arena_set_allocated_message_id(
|
||||
std::string* message_id) {
|
||||
GOOGLE_DCHECK(GetArena() != nullptr);
|
||||
if (message_id != nullptr) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
message_id_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
|
||||
message_id, GetArena());
|
||||
// @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.im.notice.message_id)
|
||||
inline void notice::set_time(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
_internal_set_time(value);
|
||||
// @@protoc_insertion_point(field_set:mp.im.notice.time)
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------
|
||||
@ -574,88 +523,47 @@ inline void data::set_session_type(::mp::MP_SUB_TYPE value) {
|
||||
// @@protoc_insertion_point(field_set:mp.im.data.session_type)
|
||||
}
|
||||
|
||||
// string message_id = 3;
|
||||
// uint64 message_id = 3;
|
||||
inline void data::clear_message_id() {
|
||||
message_id_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
message_id_ = PROTOBUF_ULONGLONG(0);
|
||||
}
|
||||
inline const std::string& data::message_id() const {
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 data::_internal_message_id() const {
|
||||
return message_id_;
|
||||
}
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 data::message_id() const {
|
||||
// @@protoc_insertion_point(field_get:mp.im.data.message_id)
|
||||
return _internal_message_id();
|
||||
}
|
||||
inline void data::set_message_id(const std::string& value) {
|
||||
inline void data::_internal_set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
|
||||
message_id_ = value;
|
||||
}
|
||||
inline void data::set_message_id(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
_internal_set_message_id(value);
|
||||
// @@protoc_insertion_point(field_set:mp.im.data.message_id)
|
||||
}
|
||||
inline std::string* data::mutable_message_id() {
|
||||
// @@protoc_insertion_point(field_mutable:mp.im.data.message_id)
|
||||
return _internal_mutable_message_id();
|
||||
|
||||
// uint64 time = 4;
|
||||
inline void data::clear_time() {
|
||||
time_ = PROTOBUF_ULONGLONG(0);
|
||||
}
|
||||
inline const std::string& data::_internal_message_id() const {
|
||||
return message_id_.Get();
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 data::_internal_time() const {
|
||||
return time_;
|
||||
}
|
||||
inline void data::_internal_set_message_id(const std::string& value) {
|
||||
inline ::PROTOBUF_NAMESPACE_ID::uint64 data::time() const {
|
||||
// @@protoc_insertion_point(field_get:mp.im.data.time)
|
||||
return _internal_time();
|
||||
}
|
||||
inline void data::_internal_set_time(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), value, GetArena());
|
||||
time_ = value;
|
||||
}
|
||||
inline void data::set_message_id(std::string&& value) {
|
||||
|
||||
message_id_.Set(
|
||||
&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::move(value), GetArena());
|
||||
// @@protoc_insertion_point(field_set_rvalue:mp.im.data.message_id)
|
||||
}
|
||||
inline void data::set_message_id(const char* value) {
|
||||
GOOGLE_DCHECK(value != nullptr);
|
||||
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(value),
|
||||
GetArena());
|
||||
// @@protoc_insertion_point(field_set_char:mp.im.data.message_id)
|
||||
}
|
||||
inline void data::set_message_id(const char* value,
|
||||
size_t size) {
|
||||
|
||||
message_id_.Set(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), ::std::string(
|
||||
reinterpret_cast<const char*>(value), size), GetArena());
|
||||
// @@protoc_insertion_point(field_set_pointer:mp.im.data.message_id)
|
||||
}
|
||||
inline std::string* data::_internal_mutable_message_id() {
|
||||
|
||||
return message_id_.Mutable(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
}
|
||||
inline std::string* data::release_message_id() {
|
||||
// @@protoc_insertion_point(field_release:mp.im.data.message_id)
|
||||
return message_id_.Release(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
}
|
||||
inline void data::set_allocated_message_id(std::string* message_id) {
|
||||
if (message_id != nullptr) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
message_id_.SetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), message_id,
|
||||
GetArena());
|
||||
// @@protoc_insertion_point(field_set_allocated:mp.im.data.message_id)
|
||||
}
|
||||
inline std::string* data::unsafe_arena_release_message_id() {
|
||||
// @@protoc_insertion_point(field_unsafe_arena_release:mp.im.data.message_id)
|
||||
GOOGLE_DCHECK(GetArena() != nullptr);
|
||||
|
||||
return message_id_.UnsafeArenaRelease(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
|
||||
GetArena());
|
||||
}
|
||||
inline void data::unsafe_arena_set_allocated_message_id(
|
||||
std::string* message_id) {
|
||||
GOOGLE_DCHECK(GetArena() != nullptr);
|
||||
if (message_id != nullptr) {
|
||||
|
||||
} else {
|
||||
|
||||
}
|
||||
message_id_.UnsafeArenaSetAllocated(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(),
|
||||
message_id, GetArena());
|
||||
// @@protoc_insertion_point(field_unsafe_arena_set_allocated:mp.im.data.message_id)
|
||||
inline void data::set_time(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
_internal_set_time(value);
|
||||
// @@protoc_insertion_point(field_set:mp.im.data.time)
|
||||
}
|
||||
|
||||
// uint64 account = 4;
|
||||
// uint64 account = 5;
|
||||
inline void data::clear_account() {
|
||||
account_ = PROTOBUF_ULONGLONG(0);
|
||||
}
|
||||
@ -675,7 +583,7 @@ inline void data::set_account(::PROTOBUF_NAMESPACE_ID::uint64 value) {
|
||||
// @@protoc_insertion_point(field_set:mp.im.data.account)
|
||||
}
|
||||
|
||||
// string msg_data = 5;
|
||||
// string msg_data = 6;
|
||||
inline void data::clear_msg_data() {
|
||||
msg_data_.ClearToEmpty(&::PROTOBUF_NAMESPACE_ID::internal::GetEmptyStringAlreadyInited(), GetArena());
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@ const char descriptor_table_protodef_mp_2emp_2eproto[] PROTOBUF_SECTION_VARIABLE
|
||||
"\022\024\n\020MP_RESPONSE_CODE\020\027\022\027\n\023MP_RESPONSE_FR"
|
||||
"IENDS\020\030\022\026\n\022MP_RESPONSE_GROUPS\020\031\022\021\n\014MP_IM"
|
||||
"_NOTICE\020\310\001\022\023\n\016MP_IM_PUSH_MSG\020\311\001\022\023\n\016MP_IM"
|
||||
"_PULL_MSG\020\312\001\022\016\n\tMP_IM_MSG\020\313\001*\353\006\n\013MP_SUB_"
|
||||
"_PULL_MSG\020\312\001\022\016\n\tMP_IM_MSG\020\313\001*\325\007\n\013MP_SUB_"
|
||||
"TYPE\022\022\n\016MP_LOGIN_EMAIL\020\000\022\022\n\016MP_LOGIN_PHO"
|
||||
"NE\020\001\022\024\n\020MP_LOGIN_ACCOUNT\020\002\022\025\n\021MP_REGISTE"
|
||||
"R_EMAIL\020\003\022\025\n\021MP_REGISTER_PHONE\020\004\022\024\n\020MP_L"
|
||||
@ -42,20 +42,23 @@ const char descriptor_table_protodef_mp_2emp_2eproto[] PROTOBUF_SECTION_VARIABLE
|
||||
"\022\021\n\rMP_CODE_EMAIL\020\017\022\021\n\rMP_CODE_PHONE\020\020\022\023"
|
||||
"\n\017MP_CODE_SUCCESS\020\021\022\020\n\014MP_CODE_FAIL\020\034\022\024\n"
|
||||
"\020MP_ADD_FRIENDS_0\0203\022\024\n\020MP_ADD_FRIENDS_1\020"
|
||||
"4\022\024\n\020MP_ADD_FRIENDS_2\0205\022\032\n\026MP_ADD_FRIEND"
|
||||
"S_ACCOUNT\0206\022\030\n\024MP_ADD_FRIENDS_EMAIL\0207\022\030\n"
|
||||
"\024MP_ADD_FRIENDS_PHONE\0208\022\025\n\021MP_ADD_BLACK_"
|
||||
"LIST\020;\022\025\n\021MP_ADD_WHITE_LIST\020<\022\024\n\020MP_REMO"
|
||||
"VE_FRIEND\020=\022\022\n\016MP_GET_FRIENDS\020>\022\022\n\016MP_AD"
|
||||
"D_GROUP_0\020\?\022\022\n\016MP_ADD_GROUP_1\020@\022\022\n\016MP_AD"
|
||||
"D_GROUP_2\020A\022\020\n\014MP_ADD_GROUP\020B\022\023\n\017MP_REMO"
|
||||
"VE_GROUP\020C\022\021\n\rMP_GET_GROUPS\020D\022\022\n\016MP_ADD_"
|
||||
"SUCCESS\020E\022\025\n\021MP_REMOVE_SUCCESS\020F\022\022\n\016MP_G"
|
||||
"ET_SUCCESS\020G\022\017\n\013MP_ADD_FAIL\020H\022\022\n\016MP_REMO"
|
||||
"VE_FAIL\020I\022\017\n\013MP_GET_FAIL\020J\022\020\n\014MP_ADD_CHE"
|
||||
"CK\020P\022\017\n\nMP_IM_TEXT\020\310\001\022\020\n\013MP_IM_PHOTO\020\311\001\022"
|
||||
"\020\n\013MP_IM_AUDIO\020\312\001\022\020\n\013MP_IM_VIDEO\020\313\001\022\016\n\tM"
|
||||
"P_FRIEND\020\254\002\022\r\n\010MP_GROUP\020\255\002b\006proto3"
|
||||
"4\022\024\n\020MP_ADD_FRIENDS_2\0205\022\035\n\031MP_SEARCH_FRI"
|
||||
"ENDS_ACCOUNT\0206\022\036\n\032MP_SEARCH_FRIENDS_USER"
|
||||
"NAME\0207\022\032\n\026MP_ADD_FRIENDS_ACCOUNT\0208\022\030\n\024MP"
|
||||
"_ADD_FRIENDS_EMAIL\0209\022\030\n\024MP_ADD_FRIENDS_P"
|
||||
"HONE\020:\022\025\n\021MP_ADD_BLACK_LIST\020;\022\025\n\021MP_ADD_"
|
||||
"WHITE_LIST\020<\022\024\n\020MP_REMOVE_FRIEND\020=\022\022\n\016MP"
|
||||
"_GET_FRIENDS\020>\022\022\n\016MP_ADD_GROUP_0\020\?\022\022\n\016MP"
|
||||
"_ADD_GROUP_1\020@\022\022\n\016MP_ADD_GROUP_2\020A\022\020\n\014MP"
|
||||
"_ADD_GROUP\020B\022\023\n\017MP_REMOVE_GROUP\020C\022\021\n\rMP_"
|
||||
"GET_GROUPS\020D\022\025\n\021MP_SEARCH_SUCCESS\020E\022\022\n\016M"
|
||||
"P_ADD_SUCCESS\020F\022\025\n\021MP_REMOVE_SUCCESS\020G\022\022"
|
||||
"\n\016MP_GET_SUCCESS\020H\022\017\n\013MP_ADD_FAIL\020I\022\022\n\016M"
|
||||
"P_REMOVE_FAIL\020J\022\017\n\013MP_GET_FAIL\020K\022\022\n\016MP_S"
|
||||
"EARCH_FAIL\020L\022\020\n\014MP_ADD_CHECK\020P\022\017\n\nMP_IM_"
|
||||
"TEXT\020\310\001\022\020\n\013MP_IM_PHOTO\020\311\001\022\020\n\013MP_IM_AUDIO"
|
||||
"\020\312\001\022\020\n\013MP_IM_VIDEO\020\313\001\022\016\n\tMP_FRIEND\020\254\002\022\r\n"
|
||||
"\010MP_GROUP\020\255\002b\006proto3"
|
||||
;
|
||||
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_mp_2emp_2eproto_deps[1] = {
|
||||
};
|
||||
@ -63,7 +66,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mp_
|
||||
};
|
||||
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_mp_2emp_2eproto_once;
|
||||
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_mp_2emp_2eproto = {
|
||||
false, false, descriptor_table_protodef_mp_2emp_2eproto, "mp.mp.proto", 1274,
|
||||
false, false, descriptor_table_protodef_mp_2emp_2eproto, "mp.mp.proto", 1380,
|
||||
&descriptor_table_mp_2emp_2eproto_once, descriptor_table_mp_2emp_2eproto_sccs, descriptor_table_mp_2emp_2eproto_deps, 0, 0,
|
||||
schemas, file_default_instances, TableStruct_mp_2emp_2eproto::offsets,
|
||||
file_level_metadata_mp_2emp_2eproto, 0, file_level_enum_descriptors_mp_2emp_2eproto, file_level_service_descriptors_mp_2emp_2eproto,
|
||||
@ -125,6 +128,8 @@ bool MP_SUB_TYPE_IsValid(int value) {
|
||||
case 54:
|
||||
case 55:
|
||||
case 56:
|
||||
case 57:
|
||||
case 58:
|
||||
case 59:
|
||||
case 60:
|
||||
case 61:
|
||||
@ -141,6 +146,8 @@ bool MP_SUB_TYPE_IsValid(int value) {
|
||||
case 72:
|
||||
case 73:
|
||||
case 74:
|
||||
case 75:
|
||||
case 76:
|
||||
case 80:
|
||||
case 200:
|
||||
case 201:
|
||||
|
||||
@ -113,9 +113,11 @@ enum MP_SUB_TYPE : int {
|
||||
MP_ADD_FRIENDS_0 = 51,
|
||||
MP_ADD_FRIENDS_1 = 52,
|
||||
MP_ADD_FRIENDS_2 = 53,
|
||||
MP_ADD_FRIENDS_ACCOUNT = 54,
|
||||
MP_ADD_FRIENDS_EMAIL = 55,
|
||||
MP_ADD_FRIENDS_PHONE = 56,
|
||||
MP_SEARCH_FRIENDS_ACCOUNT = 54,
|
||||
MP_SEARCH_FRIENDS_USERNAME = 55,
|
||||
MP_ADD_FRIENDS_ACCOUNT = 56,
|
||||
MP_ADD_FRIENDS_EMAIL = 57,
|
||||
MP_ADD_FRIENDS_PHONE = 58,
|
||||
MP_ADD_BLACK_LIST = 59,
|
||||
MP_ADD_WHITE_LIST = 60,
|
||||
MP_REMOVE_FRIEND = 61,
|
||||
@ -126,12 +128,14 @@ enum MP_SUB_TYPE : int {
|
||||
MP_ADD_GROUP = 66,
|
||||
MP_REMOVE_GROUP = 67,
|
||||
MP_GET_GROUPS = 68,
|
||||
MP_ADD_SUCCESS = 69,
|
||||
MP_REMOVE_SUCCESS = 70,
|
||||
MP_GET_SUCCESS = 71,
|
||||
MP_ADD_FAIL = 72,
|
||||
MP_REMOVE_FAIL = 73,
|
||||
MP_GET_FAIL = 74,
|
||||
MP_SEARCH_SUCCESS = 69,
|
||||
MP_ADD_SUCCESS = 70,
|
||||
MP_REMOVE_SUCCESS = 71,
|
||||
MP_GET_SUCCESS = 72,
|
||||
MP_ADD_FAIL = 73,
|
||||
MP_REMOVE_FAIL = 74,
|
||||
MP_GET_FAIL = 75,
|
||||
MP_SEARCH_FAIL = 76,
|
||||
MP_ADD_CHECK = 80,
|
||||
MP_IM_TEXT = 200,
|
||||
MP_IM_PHOTO = 201,
|
||||
|
||||
@ -111,7 +111,7 @@ std::optional<agreement_response> UserOperation::get_code(const std::string& acc
|
||||
return management::fetch_packet();
|
||||
}
|
||||
|
||||
std::optional<agreement_response> UserOperation::FetchFriends(uint64_t account) {
|
||||
std::optional<agreement_response> UserOperation::fetch_friends(uint64_t account) {
|
||||
std::regex pattern_account("[1-9](\\d{5,11})");
|
||||
|
||||
std::string packet;
|
||||
@ -126,6 +126,38 @@ std::optional<agreement_response> UserOperation::FetchFriends(uint64_t account)
|
||||
return management::fetch_packet();
|
||||
}
|
||||
|
||||
// 查询用户
|
||||
std::optional<agreement_response> UserOperation::fetch_user(uint64_t account) {
|
||||
std::regex pattern_account("[1-9](\\d{5,11})");
|
||||
|
||||
std::string packet;
|
||||
if (std::regex_match(std::to_string(account), pattern_account)) {
|
||||
packet = packet_base(mp::MP_TYPE::MP_REQUEST_FRIENDS, mp::MP_SUB_TYPE::MP_SEARCH_FRIENDS_ACCOUNT, std::to_string(account));
|
||||
} else {
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
client->send_data(packet);
|
||||
|
||||
return management::fetch_packet();
|
||||
}
|
||||
|
||||
// 添加用户
|
||||
std::optional<agreement_response> UserOperation::add_user(uint64_t account) {
|
||||
std::regex pattern_account("[1-9](\\d{5,11})");
|
||||
|
||||
std::string packet;
|
||||
if (std::regex_match(std::to_string(account), pattern_account)) {
|
||||
packet = packet_base(mp::MP_TYPE::MP_REQUEST_FRIENDS, mp::MP_SUB_TYPE::MP_SEARCH_FRIENDS_ACCOUNT, std::to_string(account));
|
||||
} else {
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
client->send_data(packet);
|
||||
|
||||
return management::fetch_packet();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -28,16 +28,26 @@ public:
|
||||
virtual ~UserOperation();
|
||||
|
||||
public:
|
||||
// 登陆
|
||||
std::optional<agreement_response> login(const std::string& account, const std::string& password);
|
||||
// 注册
|
||||
std::optional<agreement_response> register_(const std::string& account, const std::string& password, const std::string& code);
|
||||
// 请求验证码
|
||||
std::optional<agreement_response> get_code(const std::string& account);
|
||||
std::optional<agreement_response> FetchFriends(uint64_t account);
|
||||
// 查询账户好友
|
||||
std::optional<agreement_response> fetch_friends(uint64_t account);
|
||||
// 查询用户
|
||||
std::optional<agreement_response> fetch_user(uint64_t account);
|
||||
// 添加用户
|
||||
std::optional<agreement_response> add_user(uint64_t account);
|
||||
|
||||
private:
|
||||
// base 包
|
||||
std::string packet_base(mp::MP_TYPE, mp::MP_SUB_TYPE, const std::string &account, const std::string &password);
|
||||
std::string packet_base(mp::MP_TYPE, mp::MP_SUB_TYPE, const std::string &account, const std::string &password, const std::string &data);
|
||||
std::string packet_base(mp::MP_TYPE type, mp::MP_SUB_TYPE subType, const std::string& account);
|
||||
|
||||
// 操作报
|
||||
std::string login_packet(mp::MP_SUB_TYPE subType, const std::string &account, const std::string &password);
|
||||
std::string register_packet(mp::MP_SUB_TYPE subType, const std::string &account, const std::string &password, const std::string &code);
|
||||
private:
|
||||
|
||||
@ -6,7 +6,8 @@
|
||||
#define IM_ADDFRINDWINDOW_H
|
||||
|
||||
#include <QWidget>
|
||||
|
||||
#include "user/UserOperation.h"
|
||||
#include "user/User.h"
|
||||
|
||||
QT_BEGIN_NAMESPACE
|
||||
namespace Ui { class addfrindwindow; }
|
||||
@ -20,10 +21,24 @@ public:
|
||||
~addfrindwindow() override;
|
||||
|
||||
private slots:
|
||||
// add search user
|
||||
void get_search_input();
|
||||
// user show info 右键点击
|
||||
void contextMenuEvent(QContextMenuEvent*);
|
||||
|
||||
//// 右键的三种操作
|
||||
// 添加好友
|
||||
void add_friends_action();
|
||||
// 个人主页
|
||||
void user_home_action();
|
||||
// 打招呼
|
||||
void say_hello_action();
|
||||
|
||||
private:
|
||||
Ui::addfrindwindow *ui;
|
||||
UserOperation* userOperation = nullptr;
|
||||
bool user_show_info = false;
|
||||
User user;
|
||||
};
|
||||
|
||||
|
||||
|
||||
@ -5,11 +5,15 @@
|
||||
// You may need to build the project (run Qt uic code generator) to get "ui_addfrindwindow.h" resolved
|
||||
|
||||
#include <QStringListModel>
|
||||
#include <QMenuBar>
|
||||
#include "ui_addfrindwindow.h"
|
||||
#include "addfrindwindow.h"
|
||||
#include "ClientExample.h"
|
||||
|
||||
addfrindwindow::addfrindwindow(QWidget *parent) :
|
||||
QWidget(parent), ui(new Ui::addfrindwindow) {
|
||||
QWidget(parent),
|
||||
ui(new Ui::addfrindwindow),
|
||||
userOperation(new UserOperation(ClientExample::run())) {
|
||||
ui->setupUi(this);
|
||||
|
||||
connect(ui->search, SIGNAL(returnPressed()), this, SLOT(get_search_input()));
|
||||
@ -25,6 +29,31 @@ void addfrindwindow::get_search_input() {
|
||||
QString search_value = ui->search->text();
|
||||
// 开始搜索 暂时只显示
|
||||
|
||||
auto ret = userOperation->fetch_user(strtol(search_value.toStdString().c_str(), nullptr, 0));
|
||||
if (ret.has_value()) {
|
||||
if (ret.value().m_sri.subcommand() == mp::MP_SUB_TYPE::MP_SEARCH_SUCCESS) {
|
||||
search_value.append(" ");
|
||||
search_value.append(ret.value().m_sri.username().c_str());
|
||||
search_value.append(" ");
|
||||
search_value.append(ret.value().m_sri.msg().c_str());
|
||||
user_show_info = true;
|
||||
user.account = ret.value().m_sri.account();
|
||||
user.username = ret.value().m_sri.username();
|
||||
user.email = ret.value().m_sri.email();
|
||||
} else {
|
||||
search_value.append(" ");
|
||||
search_value.append(ret.value().m_sri.msg().c_str());
|
||||
search_value.append(" ");
|
||||
// 返回 查询 sql 为啥查不到的类型 后面 搞个映射吧
|
||||
search_value.append(std::to_string(ret.value().m_sri.subcommand()).c_str());
|
||||
user_show_info = false;
|
||||
}
|
||||
} else {
|
||||
user_show_info = false;
|
||||
search_value = "键入数据不合法！";
|
||||
}
|
||||
|
||||
// 添加显示数据
|
||||
QStringList list;
|
||||
list.append(search_value);
|
||||
|
||||
@ -34,8 +63,59 @@ void addfrindwindow::get_search_input() {
|
||||
ui->listView->setModel(model);
|
||||
//设置模型到listview上 不可编辑
|
||||
ui->listView->setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||
// 显示数据右键菜单
|
||||
// ui->listView->setContextMenuPolicy(Qt::CustomContextMenu);
|
||||
ui->listView->setContextMenuPolicy(Qt::ActionsContextMenu);
|
||||
|
||||
// void QWidget::contextMenuEvent ( QContextMenuEvent* );
|
||||
// void QWidget::customContextMenuRequested( const QPoint& pos );
|
||||
|
||||
//右击绑定事件
|
||||
// connect(ui->listView, SIGNAL(customContextMenuRequested(const QPoint&)),
|
||||
// this, SLOT(show_Contextmenu(const QPoint&)));
|
||||
}
|
||||
|
||||
|
||||
// 重载此函数 右键 菜单 内容
|
||||
// 但需要 ui->listView->setContextMenuPolicy(Qt::ActionsContextMenu); 绑定事件
|
||||
void addfrindwindow::contextMenuEvent(QContextMenuEvent *) {
|
||||
if (user_show_info) {
|
||||
QMenu *cmenu = new QMenu(ui->listView);
|
||||
|
||||
QAction *addAction = cmenu->addAction("添加");
|
||||
QAction *userHomeAction = cmenu->addAction("个人主页");
|
||||
QAction *sayHelloAction = cmenu->addAction("打招呼");
|
||||
|
||||
connect(addAction, SIGNAL(triggered(bool)), this, SLOT(add_friends_action()));
|
||||
connect(userHomeAction, SIGNAL(triggered(bool)), this, SLOT(user_home_action()));
|
||||
connect(sayHelloAction, SIGNAL(triggered(bool)), this, SLOT(say_hello_action()));
|
||||
|
||||
cmenu->exec(QCursor::pos());
|
||||
ui->listView->selectionModel()->clear();
|
||||
|
||||
delete cmenu;
|
||||
// 堆内的参数 不用delete 还有qt有文件树？ 用不上特严格的delete
|
||||
// delete addAction;
|
||||
// delete userHomeAction;
|
||||
// delete sayHelloAction;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void addfrindwindow::add_friends_action() {
|
||||
// userOperation;
|
||||
}
|
||||
|
||||
void addfrindwindow::user_home_action() {
|
||||
printf("222");
|
||||
|
||||
}
|
||||
|
||||
void addfrindwindow::say_hello_action() {
|
||||
printf("333");
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -32,7 +32,7 @@ void IMWindow::setUser(uint64_t account, const std::string &username) {
|
||||
void IMWindow::initFriendList() {
|
||||
// user.account;
|
||||
// 创建数据显示列表
|
||||
auto friends = userOperation->FetchFriends(user.account).value().m_sri.data();
|
||||
auto friends = userOperation->fetch_friends(user.account).value().m_sri.data();
|
||||
rapidjson::Document document;
|
||||
document.Parse(friends.c_str());
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user