Add remark

This commit is contained in:
Changhua 2023-04-13 00:05:21 +08:00
parent d17e2e4737
commit f2a141314d
6 changed files with 14 additions and 7 deletions

View File

@ -12,6 +12,7 @@ typedef struct {
int32_t gender;
string wxid;
string code;
string remark;
string name;
string country;
string province;

View File

@ -76,6 +76,9 @@ bool encode_contacts(pb_ostream_t *stream, const pb_field_t *field, void *const
message.code.funcs.encode = &encode_string;
message.code.arg = (void *)(*it).code.c_str();
message.remark.funcs.encode = &encode_string;
message.remark.arg = (void *)(*it).remark.c_str();
message.name.funcs.encode = &encode_string;
message.name.arg = (void *)(*it).name.c_str();

View File

@ -102,11 +102,12 @@ message RpcContact
{
string wxid = 1; // id
string code = 2; //
string name = 3; //
string country = 4; //
string province = 5; // /
string city = 6; //
int32 gender = 7; //
string remark = 3; //
string name = 4; //
string country = 5; //
string province = 6; // /
string city = 7; //
int32 gender = 8; //
}
message RpcContacts { repeated RpcContact contacts = 1; }

View File

@ -19,6 +19,7 @@ vector<RpcContact_t> GetContacts()
RpcContact_t cnt;
cnt.wxid = GetStringByAddress(node + g_WxCalls.contact.wxId);
cnt.code = GetStringByAddress(node + g_WxCalls.contact.wxCode);
cnt.remark = GetStringByAddress(node + g_WxCalls.contact.wxRemark);
cnt.name = GetStringByAddress(node + g_WxCalls.contact.wxName);
cnt.country = GetStringByAddress(node + g_WxCalls.contact.wxCountry);
cnt.province = GetStringByAddress(node + g_WxCalls.contact.wxProvince);

View File

@ -16,8 +16,8 @@ WxCalls_t wxCalls = {
{ 0xB8A70, 0x3ED5E0, 0x107F00, 0x3ED7B0, 0x2386FE4 }, // Send xml Message
{ 0x771980, 0x4777E0, 0x239E888 }, // Send Emotion Message
/* Get Contacts:
Base, head, wxId, Code, Name, Gender, Country, Province, City*/
{ 0x23668F4, 0x4C, 0x30, 0x44, 0x8C, 0x184, 0x1D0, 0x1E4, 0x1F8 },
Base, head, wxId, Code, Remark,Name, Gender, Country, Province, City*/
{ 0x23668F4, 0x4C, 0x30, 0x44, 0x78, 0x8C, 0x184, 0x1D0, 0x1E4, 0x1F8 },
/* Exec Sql:
Exec, base, start, end, slot, name*/
{ 0x141BDF0, 0x2366934, 0x1428, 0x142C, 0x3C, 0x50 },

View File

@ -34,6 +34,7 @@ typedef struct Contact {
DWORD head;
DWORD wxId;
DWORD wxCode;
DWORD wxRemark;
DWORD wxName;
DWORD wxGender;
DWORD wxCountry;