chore(grpc): add sound field. (#325)
This commit is contained in:
parent
651a2b76db
commit
df45f85a1c
|
@ -771,6 +771,7 @@ func main() {
|
||||||
Message: "test message",
|
Message: "test message",
|
||||||
Badge: 1,
|
Badge: 1,
|
||||||
Category: "test",
|
Category: "test",
|
||||||
|
Sound: "test",
|
||||||
Alert: &proto.Alert{
|
Alert: &proto.Alert{
|
||||||
Title: "Test Title",
|
Title: "Test Title",
|
||||||
Body: "Test Alert Body",
|
Body: "Test Alert Body",
|
||||||
|
@ -805,6 +806,7 @@ function main() {
|
||||||
request.setTitle("hello2");
|
request.setTitle("hello2");
|
||||||
request.setBadge(2);
|
request.setBadge(2);
|
||||||
request.setCategory("mycategory");
|
request.setCategory("mycategory");
|
||||||
|
request.setSound("sound")
|
||||||
alert.setTitle("title");
|
alert.setTitle("title");
|
||||||
request.setAlert(alert);
|
request.setAlert(alert);
|
||||||
client.send(request, function (err, response) {
|
client.send(request, function (err, response) {
|
||||||
|
@ -854,6 +856,7 @@ func main() {
|
||||||
Message: "test message",
|
Message: "test message",
|
||||||
Badge: 1,
|
Badge: 1,
|
||||||
Category: "test",
|
Category: "test",
|
||||||
|
Sound: "test",
|
||||||
Alert: &proto.Alert{
|
Alert: &proto.Alert{
|
||||||
Title: "Test Title",
|
Title: "Test Title",
|
||||||
Body: "Test Alert Body",
|
Body: "Test Alert Body",
|
||||||
|
|
|
@ -28,6 +28,7 @@ func main() {
|
||||||
Message: "test message",
|
Message: "test message",
|
||||||
Badge: 1,
|
Badge: 1,
|
||||||
Category: "test",
|
Category: "test",
|
||||||
|
Sound: "test",
|
||||||
Alert: &proto.Alert{
|
Alert: &proto.Alert{
|
||||||
Title: "Test Title",
|
Title: "Test Title",
|
||||||
Body: "Test Alert Body",
|
Body: "Test Alert Body",
|
||||||
|
|
|
@ -14,6 +14,7 @@ function main() {
|
||||||
request.setTitle("hello2");
|
request.setTitle("hello2");
|
||||||
request.setBadge(2);
|
request.setBadge(2);
|
||||||
request.setCategory("mycategory");
|
request.setCategory("mycategory");
|
||||||
|
request.setSound("sound")
|
||||||
alert.setTitle("title");
|
alert.setTitle("title");
|
||||||
request.setAlert(alert);
|
request.setAlert(alert);
|
||||||
client.send(request, function (err, response) {
|
client.send(request, function (err, response) {
|
||||||
|
|
|
@ -270,7 +270,8 @@ proto.proto.NotificationRequest.toObject = function(includeInstance, msg) {
|
||||||
key: jspb.Message.getFieldWithDefault(msg, 6, ""),
|
key: jspb.Message.getFieldWithDefault(msg, 6, ""),
|
||||||
badge: jspb.Message.getFieldWithDefault(msg, 7, 0),
|
badge: jspb.Message.getFieldWithDefault(msg, 7, 0),
|
||||||
category: jspb.Message.getFieldWithDefault(msg, 8, ""),
|
category: jspb.Message.getFieldWithDefault(msg, 8, ""),
|
||||||
alert: (f = msg.getAlert()) && proto.proto.Alert.toObject(includeInstance, f)
|
alert: (f = msg.getAlert()) && proto.proto.Alert.toObject(includeInstance, f),
|
||||||
|
sound: jspb.Message.getFieldWithDefault(msg, 10, "")
|
||||||
};
|
};
|
||||||
|
|
||||||
if (includeInstance) {
|
if (includeInstance) {
|
||||||
|
@ -344,6 +345,10 @@ proto.proto.NotificationRequest.deserializeBinaryFromReader = function(msg, read
|
||||||
reader.readMessage(value,proto.proto.Alert.deserializeBinaryFromReader);
|
reader.readMessage(value,proto.proto.Alert.deserializeBinaryFromReader);
|
||||||
msg.setAlert(value);
|
msg.setAlert(value);
|
||||||
break;
|
break;
|
||||||
|
case 10:
|
||||||
|
var value = /** @type {string} */ (reader.readString());
|
||||||
|
msg.setSound(value);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
reader.skipField();
|
reader.skipField();
|
||||||
break;
|
break;
|
||||||
|
@ -436,6 +441,13 @@ proto.proto.NotificationRequest.serializeBinaryToWriter = function(message, writ
|
||||||
proto.proto.Alert.serializeBinaryToWriter
|
proto.proto.Alert.serializeBinaryToWriter
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
f = message.getSound();
|
||||||
|
if (f.length > 0) {
|
||||||
|
writer.writeString(
|
||||||
|
10,
|
||||||
|
f
|
||||||
|
);
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
@ -605,6 +617,21 @@ proto.proto.NotificationRequest.prototype.hasAlert = function() {
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* optional string sound = 10;
|
||||||
|
* @return {string}
|
||||||
|
*/
|
||||||
|
proto.proto.NotificationRequest.prototype.getSound = function() {
|
||||||
|
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 10, ""));
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
/** @param {string} value */
|
||||||
|
proto.proto.NotificationRequest.prototype.setSound = function(value) {
|
||||||
|
jspb.Message.setField(this, 10, value);
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generated by JsPbCodeGenerator.
|
* Generated by JsPbCodeGenerator.
|
||||||
|
|
|
@ -104,6 +104,7 @@ type NotificationRequest struct {
|
||||||
Badge int32 `protobuf:"varint,7,opt,name=badge" json:"badge,omitempty"`
|
Badge int32 `protobuf:"varint,7,opt,name=badge" json:"badge,omitempty"`
|
||||||
Category string `protobuf:"bytes,8,opt,name=category" json:"category,omitempty"`
|
Category string `protobuf:"bytes,8,opt,name=category" json:"category,omitempty"`
|
||||||
Alert *Alert `protobuf:"bytes,9,opt,name=alert" json:"alert,omitempty"`
|
Alert *Alert `protobuf:"bytes,9,opt,name=alert" json:"alert,omitempty"`
|
||||||
|
Sound string `protobuf:"bytes,10,opt,name=sound" json:"sound,omitempty"`
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *NotificationRequest) Reset() { *m = NotificationRequest{} }
|
func (m *NotificationRequest) Reset() { *m = NotificationRequest{} }
|
||||||
|
@ -174,6 +175,13 @@ func (m *NotificationRequest) GetAlert() *Alert {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (m *NotificationRequest) GetSound() string {
|
||||||
|
if m != nil {
|
||||||
|
return m.Sound
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
type NotificationReply struct {
|
type NotificationReply struct {
|
||||||
Success bool `protobuf:"varint,1,opt,name=success" json:"success,omitempty"`
|
Success bool `protobuf:"varint,1,opt,name=success" json:"success,omitempty"`
|
||||||
Counts int32 `protobuf:"varint,2,opt,name=counts" json:"counts,omitempty"`
|
Counts int32 `protobuf:"varint,2,opt,name=counts" json:"counts,omitempty"`
|
||||||
|
@ -378,32 +386,33 @@ var _Health_serviceDesc = grpc.ServiceDesc{
|
||||||
func init() { proto1.RegisterFile("gorush.proto", fileDescriptor0) }
|
func init() { proto1.RegisterFile("gorush.proto", fileDescriptor0) }
|
||||||
|
|
||||||
var fileDescriptor0 = []byte{
|
var fileDescriptor0 = []byte{
|
||||||
// 424 bytes of a gzipped FileDescriptorProto
|
// 433 bytes of a gzipped FileDescriptorProto
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x8e, 0xd3, 0x30,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x8e, 0xd3, 0x30,
|
||||||
0x10, 0xc6, 0x37, 0xdb, 0x26, 0x6d, 0xa7, 0x0b, 0x94, 0x59, 0x84, 0x4c, 0x4f, 0x95, 0x4f, 0x3d,
|
0x10, 0xc6, 0x37, 0x6d, 0x93, 0xb6, 0xd3, 0x05, 0xca, 0x2c, 0x42, 0xa6, 0xa7, 0xca, 0xa7, 0x9e,
|
||||||
0xf5, 0x50, 0x6e, 0x1c, 0x56, 0x20, 0xb4, 0xda, 0x45, 0x88, 0xac, 0xe4, 0xf2, 0xe7, 0x88, 0x1c,
|
0x7a, 0x28, 0x37, 0x0e, 0x2b, 0x10, 0x5a, 0xed, 0x22, 0x44, 0x56, 0x72, 0xf9, 0x73, 0x44, 0xae,
|
||||||
0xd7, 0x9b, 0x46, 0xcd, 0xc6, 0x21, 0x76, 0x90, 0xf2, 0x1c, 0x3c, 0x2c, 0x57, 0x64, 0x3b, 0x5e,
|
0xeb, 0x4d, 0xa3, 0x66, 0xe3, 0x10, 0x3b, 0x48, 0x79, 0x08, 0x4e, 0xbc, 0x30, 0xb2, 0x1d, 0x17,
|
||||||
0xa8, 0x14, 0x4e, 0xf1, 0x6f, 0x66, 0x3c, 0x33, 0xdf, 0x17, 0xc3, 0x45, 0xae, 0x9a, 0x56, 0x1f,
|
0x2a, 0x85, 0x53, 0xfc, 0x9b, 0x19, 0xcf, 0x37, 0xf3, 0xc5, 0x70, 0x99, 0xa9, 0xba, 0xd1, 0x87,
|
||||||
0x36, 0x75, 0xa3, 0x8c, 0xc2, 0xd8, 0x7d, 0xe8, 0x27, 0x88, 0xdf, 0x95, 0xb2, 0x31, 0xf8, 0x02,
|
0x75, 0x55, 0x2b, 0xa3, 0x30, 0x76, 0x1f, 0xfa, 0x09, 0xe2, 0x77, 0x85, 0xac, 0x0d, 0xbe, 0x80,
|
||||||
0x62, 0x53, 0x98, 0x52, 0x92, 0x68, 0x15, 0xad, 0x67, 0xcc, 0x03, 0x22, 0x8c, 0x33, 0xb5, 0xef,
|
0xd8, 0xe4, 0xa6, 0x90, 0x24, 0x5a, 0x46, 0xab, 0x29, 0xf3, 0x80, 0x08, 0xa3, 0x9d, 0xda, 0xb7,
|
||||||
0xc8, 0xb9, 0x0b, 0xba, 0x33, 0x2e, 0x61, 0xaa, 0xdb, 0xcc, 0x17, 0x8f, 0x5c, 0xfc, 0x91, 0xe9,
|
0x64, 0xe0, 0x82, 0xee, 0x8c, 0x0b, 0x98, 0xe8, 0x66, 0xe7, 0x8b, 0x87, 0x2e, 0x7e, 0x62, 0xfa,
|
||||||
0xef, 0x08, 0x2e, 0x53, 0x65, 0x8a, 0xfb, 0x42, 0x70, 0x53, 0xa8, 0x8a, 0xc9, 0x1f, 0xad, 0xd4,
|
0x6b, 0x00, 0x57, 0xa9, 0x32, 0xf9, 0x43, 0x2e, 0xb8, 0xc9, 0x55, 0xc9, 0xe4, 0x8f, 0x46, 0x6a,
|
||||||
0x06, 0x5f, 0x42, 0x62, 0xd4, 0x51, 0x56, 0x9a, 0x44, 0xab, 0xd1, 0x7a, 0xc6, 0x7a, 0xb2, 0xbd,
|
0x83, 0x2f, 0x21, 0x31, 0xea, 0x28, 0x4b, 0x4d, 0xa2, 0xe5, 0x70, 0x35, 0x65, 0x1d, 0xd9, 0x5e,
|
||||||
0xea, 0x92, 0x9b, 0x7b, 0xd5, 0x3c, 0xb8, 0x19, 0x31, 0x7b, 0x64, 0x24, 0x30, 0x79, 0x90, 0x5a,
|
0x55, 0xc1, 0xcd, 0x83, 0xaa, 0x1f, 0x9d, 0x46, 0xcc, 0x4e, 0x8c, 0x04, 0xc6, 0x8f, 0x52, 0x6b,
|
||||||
0xf3, 0x3c, 0x8c, 0x09, 0xf8, 0x77, 0xd7, 0xf1, 0xbf, 0xbb, 0xda, 0xa8, 0xaa, 0x0b, 0x41, 0xe2,
|
0x9e, 0x05, 0x99, 0x80, 0x7f, 0x67, 0x1d, 0xfd, 0x3b, 0xab, 0x8d, 0xaa, 0x2a, 0x17, 0x24, 0xee,
|
||||||
0x3e, 0x6a, 0x01, 0x17, 0x30, 0x3a, 0xca, 0x8e, 0x24, 0x2e, 0x66, 0x8f, 0xb6, 0x2e, 0xe3, 0xfb,
|
0xa2, 0x16, 0x70, 0x0e, 0xc3, 0xa3, 0x6c, 0x49, 0xe2, 0x62, 0xf6, 0x68, 0xeb, 0x76, 0x7c, 0x9f,
|
||||||
0x5c, 0x92, 0x89, 0x1b, 0xe8, 0xc1, 0x6e, 0x22, 0xb8, 0x91, 0xb9, 0x6a, 0x3a, 0x32, 0xf5, 0xaa,
|
0x49, 0x32, 0x76, 0x82, 0x1e, 0xec, 0x24, 0x82, 0x1b, 0x99, 0xa9, 0xba, 0x25, 0x13, 0xbf, 0x55,
|
||||||
0x02, 0x23, 0x85, 0x98, 0x5b, 0x93, 0xc8, 0x6c, 0x15, 0xad, 0xe7, 0xdb, 0x0b, 0x6f, 0xe1, 0xc6,
|
0x60, 0xa4, 0x10, 0x73, 0x6b, 0x12, 0x99, 0x2e, 0xa3, 0xd5, 0x6c, 0x73, 0xe9, 0x2d, 0x5c, 0x3b,
|
||||||
0x19, 0xc7, 0x7c, 0x8a, 0x5e, 0xc3, 0xf3, 0x53, 0xe1, 0x75, 0xd9, 0x59, 0x09, 0xba, 0x15, 0x42,
|
0xe3, 0x98, 0x4f, 0xd9, 0xae, 0x5a, 0x35, 0xe5, 0x9e, 0x80, 0x57, 0x77, 0x40, 0x6f, 0xe0, 0xf9,
|
||||||
0x6a, 0xed, 0x6c, 0x9d, 0xb2, 0x80, 0xd6, 0x10, 0xa1, 0xda, 0xca, 0xe8, 0x5e, 0x76, 0x4f, 0x74,
|
0xb9, 0x1d, 0x55, 0xd1, 0xda, 0xc5, 0x74, 0x23, 0x84, 0xd4, 0xda, 0x99, 0x3d, 0x61, 0x01, 0xad,
|
||||||
0x03, 0x78, 0x2b, 0x79, 0x69, 0x0e, 0xef, 0x0f, 0x52, 0x1c, 0x83, 0x7d, 0xb6, 0x8f, 0x6c, 0x7e,
|
0x4d, 0x42, 0x35, 0xa5, 0xd1, 0x9d, 0x19, 0x1d, 0xd1, 0x35, 0xe0, 0x9d, 0xe4, 0x85, 0x39, 0xbc,
|
||||||
0x16, 0x22, 0xfc, 0x9e, 0x80, 0xf4, 0x57, 0x04, 0x97, 0x27, 0x17, 0x74, 0xad, 0x2a, 0x2d, 0xf1,
|
0x3f, 0x48, 0x71, 0x0c, 0xa6, 0xda, 0x3e, 0xb2, 0xfe, 0x99, 0x8b, 0xf0, 0xd3, 0x02, 0xd2, 0xdf,
|
||||||
0x2d, 0x24, 0xda, 0x70, 0xd3, 0xfa, 0xc1, 0x4f, 0xb7, 0xeb, 0x7e, 0xe7, 0x81, 0xda, 0xcd, 0xce,
|
0x11, 0x5c, 0x9d, 0x5d, 0xd0, 0x95, 0x2a, 0xb5, 0xc4, 0xb7, 0x90, 0x68, 0xc3, 0x4d, 0xe3, 0x85,
|
||||||
0xf6, 0xaa, 0xf2, 0x9d, 0xab, 0x67, 0xfd, 0x3d, 0xfa, 0x06, 0x9e, 0x9c, 0x24, 0x70, 0x0e, 0x93,
|
0x9f, 0x6e, 0x56, 0xdd, 0x26, 0x3d, 0xb5, 0xeb, 0xad, 0xed, 0x55, 0x66, 0x5b, 0x57, 0xcf, 0xba,
|
||||||
0x2f, 0xe9, 0xc7, 0xf4, 0xee, 0x5b, 0xba, 0x38, 0xb3, 0xb0, 0xbb, 0x66, 0x5f, 0x3f, 0xa4, 0x37,
|
0x7b, 0xf4, 0x0d, 0x3c, 0x39, 0x4b, 0xe0, 0x0c, 0xc6, 0x5f, 0xd2, 0x8f, 0xe9, 0xfd, 0xb7, 0x74,
|
||||||
0x8b, 0x08, 0x9f, 0xc1, 0x3c, 0xbd, 0xfb, 0xfc, 0x3d, 0x04, 0xce, 0xb7, 0xb7, 0x90, 0xdc, 0xb8,
|
0x7e, 0x61, 0x61, 0x7b, 0xc3, 0xbe, 0x7e, 0x48, 0x6f, 0xe7, 0x11, 0x3e, 0x83, 0x59, 0x7a, 0xff,
|
||||||
0xc7, 0x86, 0x57, 0x30, 0xde, 0xc9, 0x6a, 0x8f, 0xcb, 0x7e, 0xfe, 0xc0, 0xe3, 0x58, 0x92, 0xc1,
|
0xf9, 0x7b, 0x08, 0x0c, 0x36, 0x77, 0x90, 0xdc, 0xba, 0x27, 0x88, 0xd7, 0x30, 0xda, 0xca, 0x72,
|
||||||
0x5c, 0x5d, 0x76, 0xf4, 0xcc, 0x76, 0xf2, 0x2b, 0xe3, 0x15, 0xc4, 0x6e, 0x6d, 0x7c, 0x35, 0x24,
|
0x8f, 0x8b, 0x4e, 0xbf, 0xe7, 0xc9, 0x2c, 0x48, 0x6f, 0xae, 0x2a, 0x5a, 0x7a, 0x61, 0x3b, 0xf9,
|
||||||
0xc5, 0x77, 0x5a, 0xfe, 0x5f, 0x65, 0x96, 0xb8, 0xd4, 0xeb, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff,
|
0x91, 0xf1, 0x1a, 0x62, 0x37, 0x36, 0xbe, 0xea, 0x5b, 0xc5, 0x77, 0x5a, 0xfc, 0x7f, 0xcb, 0x5d,
|
||||||
0xd4, 0x3a, 0x7f, 0x33, 0x07, 0x03, 0x00, 0x00,
|
0xe2, 0x52, 0xaf, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xa8, 0xf6, 0xa7, 0x4d, 0x1d, 0x03, 0x00,
|
||||||
|
0x00,
|
||||||
}
|
}
|
||||||
|
|
|
@ -18,6 +18,7 @@ message NotificationRequest {
|
||||||
int32 badge = 7;
|
int32 badge = 7;
|
||||||
string category = 8;
|
string category = 8;
|
||||||
Alert alert = 9;
|
Alert alert = 9;
|
||||||
|
string sound = 10;
|
||||||
}
|
}
|
||||||
|
|
||||||
message NotificationReply {
|
message NotificationReply {
|
||||||
|
|
|
@ -57,6 +57,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot
|
||||||
Topic: in.Topic,
|
Topic: in.Topic,
|
||||||
APIKey: in.Key,
|
APIKey: in.Key,
|
||||||
Category: in.Category,
|
Category: in.Category,
|
||||||
|
Sound: in.Sound,
|
||||||
}
|
}
|
||||||
|
|
||||||
if badge > 0 {
|
if badge > 0 {
|
||||||
|
|
Loading…
Reference in New Issue