Commit 649bd5a3 by xjp0422

增加norad字段

parent a394487f
No preview for this file type
...@@ -37,24 +37,24 @@ namespace Satllite.Protobuf.Agi { ...@@ -37,24 +37,24 @@ namespace Satllite.Protobuf.Agi {
"GAcgASgBEg4KBm1heEF6aRgIIAEoARIOCgZtaW5FbGUYCSABKAESDgoGbWF4", "GAcgASgBEg4KBm1heEF6aRgIIAEoARIOCgZtaW5FbGUYCSABKAESDgoGbWF4",
"RWxlGAogASgBEg8KB21pbkRpc3QYCyABKAESDwoHbWF4RGlzdBgMIAEoARIS", "RWxlGAogASgBEg8KB21pbkRpc3QYCyABKAESDwoHbWF4RGlzdBgMIAEoARIS",
"Cgpwb2ludFNsaWNlGA0gASgBEhQKDHBvaW50Q29sbGVjdBgOIAEoBRINCgVs", "Cgpwb2ludFNsaWNlGA0gASgBEhQKDHBvaW50Q29sbGVjdBgOIAEoBRINCgVs",
"aW5lMBgPIAEoCRINCgVsaW5lMRgQIAEoCRINCgVsaW5lMhgRIAEoCSJlCg1D", "aW5lMBgPIAEoCRINCgVsaW5lMRgQIAEoCRINCgVsaW5lMhgRIAEoCSJ0Cg1D",
"YWxjUmVwb3J0UmV0EigKBHh4ZHMYASADKAsyGi5zYXRsbGl0ZS5wcm90b2J1", "YWxjUmVwb3J0UmV0EigKBHh4ZHMYASADKAsyGi5zYXRsbGl0ZS5wcm90b2J1",
"Zi5hZ2kuWHhkEioKBXRhc2tzGAIgAygLMhsuc2F0bGxpdGUucHJvdG9idWYu", "Zi5hZ2kuWHhkEioKBXRhc2tzGAIgAygLMhsuc2F0bGxpdGUucHJvdG9idWYu",
"YWdpLlRhc2siOwoDWHhkEgoKAmR0GAEgASgJEgsKA2xvbhgCIAEoARILCgNs", "YWdpLlRhc2sSDQoFbm9yYWQYAyABKAkiOwoDWHhkEgoKAmR0GAEgASgJEgsK",
"YXQYAyABKAESDgoGaGVpZ2h0GAQgASgBIrIBCgRUYXNrEg0KBXN0YXJ0GAEg", "A2xvbhgCIAEoARILCgNsYXQYAyABKAESDgoGaGVpZ2h0GAQgASgBIrIBCgRU",
"ASgJEgsKA2VuZBgCIAEoCRIQCghzdGFydEF6aRgDIAEoARIOCgZlbmRBemkY", "YXNrEg0KBXN0YXJ0GAEgASgJEgsKA2VuZBgCIAEoCRIQCghzdGFydEF6aRgD",
"BCABKAESEAoIc3RhcnRFbGUYBSABKAESDgoGbWF4RWxlGAYgASgBEg8KB21p", "IAEoARIOCgZlbmRBemkYBCABKAESEAoIc3RhcnRFbGUYBSABKAESDgoGbWF4",
"bkRpc3QYByABKAESDwoHbWF4RGlzdBgIIAEoARIoCgRvYnNzGAkgAygLMhou", "RWxlGAYgASgBEg8KB21pbkRpc3QYByABKAESDwoHbWF4RGlzdBgIIAEoARIo",
"c2F0bGxpdGUucHJvdG9idWYuYWdpLk9icyI6CgNPYnMSCgoCZHQYASABKAkS", "CgRvYnNzGAkgAygLMhouc2F0bGxpdGUucHJvdG9idWYuYWdpLk9icyI6CgNP",
"CwoDYXppGAIgASgBEgsKA2VsZRgDIAEoARINCgVyYW5nZRgEIAEoAUIMWgou", "YnMSCgoCZHQYASABKAkSCwoDYXppGAIgASgBEgsKA2VsZRgDIAEoARINCgVy",
"Li9wcm90b2dvYgZwcm90bzM=")); "YW5nZRgEIAEoAUIMWgouLi9wcm90b2dvYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleReq), global::Satllite.Protobuf.Agi.CalcTleReq.Parser, new[]{ "NoradID", "NoradName", "Year", "Month", "Day", "Hour", "Minute", "Second", "A", "Ee", "I", "Raan", "Arc", "M" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleReq), global::Satllite.Protobuf.Agi.CalcTleReq.Parser, new[]{ "NoradID", "NoradName", "Year", "Month", "Day", "Hour", "Minute", "Second", "A", "Ee", "I", "Raan", "Arc", "M" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleRet), global::Satllite.Protobuf.Agi.CalcTleRet.Parser, new[]{ "Line0", "Line1", "Line2" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleRet), global::Satllite.Protobuf.Agi.CalcTleRet.Parser, new[]{ "Line0", "Line1", "Line2" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportReq), global::Satllite.Protobuf.Agi.CalcReportReq.Parser, new[]{ "StartDateTime", "EndDateTime", "Latitude", "Longitude", "Altitude", "Slice", "MinAzi", "MaxAzi", "MinEle", "MaxEle", "MinDist", "MaxDist", "PointSlice", "PointCollect", "Line0", "Line1", "Line2" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportReq), global::Satllite.Protobuf.Agi.CalcReportReq.Parser, new[]{ "StartDateTime", "EndDateTime", "Latitude", "Longitude", "Altitude", "Slice", "MinAzi", "MaxAzi", "MinEle", "MaxEle", "MinDist", "MaxDist", "PointSlice", "PointCollect", "Line0", "Line1", "Line2" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportRet), global::Satllite.Protobuf.Agi.CalcReportRet.Parser, new[]{ "Xxds", "Tasks" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportRet), global::Satllite.Protobuf.Agi.CalcReportRet.Parser, new[]{ "Xxds", "Tasks", "Norad" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Xxd), global::Satllite.Protobuf.Agi.Xxd.Parser, new[]{ "Dt", "Lon", "Lat", "Height" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Xxd), global::Satllite.Protobuf.Agi.Xxd.Parser, new[]{ "Dt", "Lon", "Lat", "Height" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Task), global::Satllite.Protobuf.Agi.Task.Parser, new[]{ "Start", "End", "StartAzi", "EndAzi", "StartEle", "MaxEle", "MinDist", "MaxDist", "Obss" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Task), global::Satllite.Protobuf.Agi.Task.Parser, new[]{ "Start", "End", "StartAzi", "EndAzi", "StartEle", "MaxEle", "MinDist", "MaxDist", "Obss" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Obs), global::Satllite.Protobuf.Agi.Obs.Parser, new[]{ "Dt", "Azi", "Ele", "Range" }, null, null, null, null) new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Obs), global::Satllite.Protobuf.Agi.Obs.Parser, new[]{ "Dt", "Azi", "Ele", "Range" }, null, null, null, null)
...@@ -1928,6 +1928,7 @@ namespace Satllite.Protobuf.Agi { ...@@ -1928,6 +1928,7 @@ namespace Satllite.Protobuf.Agi {
public CalcReportRet(CalcReportRet other) : this() { public CalcReportRet(CalcReportRet other) : this() {
xxds_ = other.xxds_.Clone(); xxds_ = other.xxds_.Clone();
tasks_ = other.tasks_.Clone(); tasks_ = other.tasks_.Clone();
norad_ = other.norad_;
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
} }
...@@ -1942,6 +1943,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -1942,6 +1943,9 @@ namespace Satllite.Protobuf.Agi {
private static readonly pb::FieldCodec<global::Satllite.Protobuf.Agi.Xxd> _repeated_xxds_codec private static readonly pb::FieldCodec<global::Satllite.Protobuf.Agi.Xxd> _repeated_xxds_codec
= pb::FieldCodec.ForMessage(10, global::Satllite.Protobuf.Agi.Xxd.Parser); = pb::FieldCodec.ForMessage(10, global::Satllite.Protobuf.Agi.Xxd.Parser);
private readonly pbc::RepeatedField<global::Satllite.Protobuf.Agi.Xxd> xxds_ = new pbc::RepeatedField<global::Satllite.Protobuf.Agi.Xxd>(); private readonly pbc::RepeatedField<global::Satllite.Protobuf.Agi.Xxd> xxds_ = new pbc::RepeatedField<global::Satllite.Protobuf.Agi.Xxd>();
/// <summary>
///星下点
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::RepeatedField<global::Satllite.Protobuf.Agi.Xxd> Xxds { public pbc::RepeatedField<global::Satllite.Protobuf.Agi.Xxd> Xxds {
...@@ -1953,12 +1957,30 @@ namespace Satllite.Protobuf.Agi { ...@@ -1953,12 +1957,30 @@ namespace Satllite.Protobuf.Agi {
private static readonly pb::FieldCodec<global::Satllite.Protobuf.Agi.Task> _repeated_tasks_codec private static readonly pb::FieldCodec<global::Satllite.Protobuf.Agi.Task> _repeated_tasks_codec
= pb::FieldCodec.ForMessage(18, global::Satllite.Protobuf.Agi.Task.Parser); = pb::FieldCodec.ForMessage(18, global::Satllite.Protobuf.Agi.Task.Parser);
private readonly pbc::RepeatedField<global::Satllite.Protobuf.Agi.Task> tasks_ = new pbc::RepeatedField<global::Satllite.Protobuf.Agi.Task>(); private readonly pbc::RepeatedField<global::Satllite.Protobuf.Agi.Task> tasks_ = new pbc::RepeatedField<global::Satllite.Protobuf.Agi.Task>();
/// <summary>
///任务预报信息
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::RepeatedField<global::Satllite.Protobuf.Agi.Task> Tasks { public pbc::RepeatedField<global::Satllite.Protobuf.Agi.Task> Tasks {
get { return tasks_; } get { return tasks_; }
} }
/// <summary>Field number for the "norad" field.</summary>
public const int NoradFieldNumber = 3;
private string norad_ = "";
/// <summary>
///卫星编号
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string Norad {
get { return norad_; }
set {
norad_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) { public override bool Equals(object other) {
...@@ -1976,6 +1998,7 @@ namespace Satllite.Protobuf.Agi { ...@@ -1976,6 +1998,7 @@ namespace Satllite.Protobuf.Agi {
} }
if(!xxds_.Equals(other.xxds_)) return false; if(!xxds_.Equals(other.xxds_)) return false;
if(!tasks_.Equals(other.tasks_)) return false; if(!tasks_.Equals(other.tasks_)) return false;
if (Norad != other.Norad) return false;
return Equals(_unknownFields, other._unknownFields); return Equals(_unknownFields, other._unknownFields);
} }
...@@ -1985,6 +2008,7 @@ namespace Satllite.Protobuf.Agi { ...@@ -1985,6 +2008,7 @@ namespace Satllite.Protobuf.Agi {
int hash = 1; int hash = 1;
hash ^= xxds_.GetHashCode(); hash ^= xxds_.GetHashCode();
hash ^= tasks_.GetHashCode(); hash ^= tasks_.GetHashCode();
if (Norad.Length != 0) hash ^= Norad.GetHashCode();
if (_unknownFields != null) { if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode(); hash ^= _unknownFields.GetHashCode();
} }
...@@ -2005,6 +2029,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2005,6 +2029,10 @@ namespace Satllite.Protobuf.Agi {
#else #else
xxds_.WriteTo(output, _repeated_xxds_codec); xxds_.WriteTo(output, _repeated_xxds_codec);
tasks_.WriteTo(output, _repeated_tasks_codec); tasks_.WriteTo(output, _repeated_tasks_codec);
if (Norad.Length != 0) {
output.WriteRawTag(26);
output.WriteString(Norad);
}
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(output); _unknownFields.WriteTo(output);
} }
...@@ -2017,6 +2045,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2017,6 +2045,10 @@ namespace Satllite.Protobuf.Agi {
void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
xxds_.WriteTo(ref output, _repeated_xxds_codec); xxds_.WriteTo(ref output, _repeated_xxds_codec);
tasks_.WriteTo(ref output, _repeated_tasks_codec); tasks_.WriteTo(ref output, _repeated_tasks_codec);
if (Norad.Length != 0) {
output.WriteRawTag(26);
output.WriteString(Norad);
}
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(ref output); _unknownFields.WriteTo(ref output);
} }
...@@ -2029,6 +2061,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2029,6 +2061,9 @@ namespace Satllite.Protobuf.Agi {
int size = 0; int size = 0;
size += xxds_.CalculateSize(_repeated_xxds_codec); size += xxds_.CalculateSize(_repeated_xxds_codec);
size += tasks_.CalculateSize(_repeated_tasks_codec); size += tasks_.CalculateSize(_repeated_tasks_codec);
if (Norad.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Norad);
}
if (_unknownFields != null) { if (_unknownFields != null) {
size += _unknownFields.CalculateSize(); size += _unknownFields.CalculateSize();
} }
...@@ -2043,6 +2078,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2043,6 +2078,9 @@ namespace Satllite.Protobuf.Agi {
} }
xxds_.Add(other.xxds_); xxds_.Add(other.xxds_);
tasks_.Add(other.tasks_); tasks_.Add(other.tasks_);
if (other.Norad.Length != 0) {
Norad = other.Norad;
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
} }
...@@ -2066,6 +2104,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2066,6 +2104,10 @@ namespace Satllite.Protobuf.Agi {
tasks_.AddEntriesFrom(input, _repeated_tasks_codec); tasks_.AddEntriesFrom(input, _repeated_tasks_codec);
break; break;
} }
case 26: {
Norad = input.ReadString();
break;
}
} }
} }
#endif #endif
...@@ -2089,6 +2131,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2089,6 +2131,10 @@ namespace Satllite.Protobuf.Agi {
tasks_.AddEntriesFrom(ref input, _repeated_tasks_codec); tasks_.AddEntriesFrom(ref input, _repeated_tasks_codec);
break; break;
} }
case 26: {
Norad = input.ReadString();
break;
}
} }
} }
} }
...@@ -2149,6 +2195,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2149,6 +2195,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "dt" field.</summary> /// <summary>Field number for the "dt" field.</summary>
public const int DtFieldNumber = 1; public const int DtFieldNumber = 1;
private string dt_ = ""; private string dt_ = "";
/// <summary>
///时间
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string Dt { public string Dt {
...@@ -2161,6 +2210,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2161,6 +2210,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "lon" field.</summary> /// <summary>Field number for the "lon" field.</summary>
public const int LonFieldNumber = 2; public const int LonFieldNumber = 2;
private double lon_; private double lon_;
/// <summary>
///经度
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double Lon { public double Lon {
...@@ -2173,6 +2225,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2173,6 +2225,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "lat" field.</summary> /// <summary>Field number for the "lat" field.</summary>
public const int LatFieldNumber = 3; public const int LatFieldNumber = 3;
private double lat_; private double lat_;
/// <summary>
///纬度
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double Lat { public double Lat {
...@@ -2185,6 +2240,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2185,6 +2240,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "height" field.</summary> /// <summary>Field number for the "height" field.</summary>
public const int HeightFieldNumber = 4; public const int HeightFieldNumber = 4;
private double height_; private double height_;
/// <summary>
///高度
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double Height { public double Height {
...@@ -2457,6 +2515,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2457,6 +2515,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "start" field.</summary> /// <summary>Field number for the "start" field.</summary>
public const int StartFieldNumber = 1; public const int StartFieldNumber = 1;
private string start_ = ""; private string start_ = "";
/// <summary>
///开始时间
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string Start { public string Start {
...@@ -2469,6 +2530,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2469,6 +2530,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "end" field.</summary> /// <summary>Field number for the "end" field.</summary>
public const int EndFieldNumber = 2; public const int EndFieldNumber = 2;
private string end_ = ""; private string end_ = "";
/// <summary>
///结束时间
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string End { public string End {
...@@ -2481,6 +2545,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2481,6 +2545,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "startAzi" field.</summary> /// <summary>Field number for the "startAzi" field.</summary>
public const int StartAziFieldNumber = 3; public const int StartAziFieldNumber = 3;
private double startAzi_; private double startAzi_;
/// <summary>
///开始方位角
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double StartAzi { public double StartAzi {
...@@ -2493,6 +2560,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2493,6 +2560,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "endAzi" field.</summary> /// <summary>Field number for the "endAzi" field.</summary>
public const int EndAziFieldNumber = 4; public const int EndAziFieldNumber = 4;
private double endAzi_; private double endAzi_;
/// <summary>
///结束方位角
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double EndAzi { public double EndAzi {
...@@ -2505,6 +2575,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2505,6 +2575,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "startEle" field.</summary> /// <summary>Field number for the "startEle" field.</summary>
public const int StartEleFieldNumber = 5; public const int StartEleFieldNumber = 5;
private double startEle_; private double startEle_;
/// <summary>
///开始俯仰角
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double StartEle { public double StartEle {
...@@ -2517,6 +2590,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2517,6 +2590,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "maxEle" field.</summary> /// <summary>Field number for the "maxEle" field.</summary>
public const int MaxEleFieldNumber = 6; public const int MaxEleFieldNumber = 6;
private double maxEle_; private double maxEle_;
/// <summary>
///最大俯仰角
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double MaxEle { public double MaxEle {
...@@ -2529,6 +2605,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2529,6 +2605,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "minDist" field.</summary> /// <summary>Field number for the "minDist" field.</summary>
public const int MinDistFieldNumber = 7; public const int MinDistFieldNumber = 7;
private double minDist_; private double minDist_;
/// <summary>
///最短距离
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double MinDist { public double MinDist {
...@@ -2541,6 +2620,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2541,6 +2620,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "maxDist" field.</summary> /// <summary>Field number for the "maxDist" field.</summary>
public const int MaxDistFieldNumber = 8; public const int MaxDistFieldNumber = 8;
private double maxDist_; private double maxDist_;
/// <summary>
///最大距离
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double MaxDist { public double MaxDist {
...@@ -2555,6 +2637,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2555,6 +2637,9 @@ namespace Satllite.Protobuf.Agi {
private static readonly pb::FieldCodec<global::Satllite.Protobuf.Agi.Obs> _repeated_obss_codec private static readonly pb::FieldCodec<global::Satllite.Protobuf.Agi.Obs> _repeated_obss_codec
= pb::FieldCodec.ForMessage(74, global::Satllite.Protobuf.Agi.Obs.Parser); = pb::FieldCodec.ForMessage(74, global::Satllite.Protobuf.Agi.Obs.Parser);
private readonly pbc::RepeatedField<global::Satllite.Protobuf.Agi.Obs> obss_ = new pbc::RepeatedField<global::Satllite.Protobuf.Agi.Obs>(); private readonly pbc::RepeatedField<global::Satllite.Protobuf.Agi.Obs> obss_ = new pbc::RepeatedField<global::Satllite.Protobuf.Agi.Obs>();
/// <summary>
///方位角俯仰角信息
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public pbc::RepeatedField<global::Satllite.Protobuf.Agi.Obs> Obss { public pbc::RepeatedField<global::Satllite.Protobuf.Agi.Obs> Obss {
...@@ -2929,6 +3014,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2929,6 +3014,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "dt" field.</summary> /// <summary>Field number for the "dt" field.</summary>
public const int DtFieldNumber = 1; public const int DtFieldNumber = 1;
private string dt_ = ""; private string dt_ = "";
/// <summary>
///时间
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string Dt { public string Dt {
...@@ -2941,6 +3029,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2941,6 +3029,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "azi" field.</summary> /// <summary>Field number for the "azi" field.</summary>
public const int AziFieldNumber = 2; public const int AziFieldNumber = 2;
private double azi_; private double azi_;
/// <summary>
///方位角
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double Azi { public double Azi {
...@@ -2953,6 +3044,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2953,6 +3044,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "ele" field.</summary> /// <summary>Field number for the "ele" field.</summary>
public const int EleFieldNumber = 3; public const int EleFieldNumber = 3;
private double ele_; private double ele_;
/// <summary>
///俯仰角
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double Ele { public double Ele {
...@@ -2965,6 +3059,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2965,6 +3059,9 @@ namespace Satllite.Protobuf.Agi {
/// <summary>Field number for the "range" field.</summary> /// <summary>Field number for the "range" field.</summary>
public const int RangeFieldNumber = 4; public const int RangeFieldNumber = 4;
private double range_; private double range_;
/// <summary>
///距离
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public double Range { public double Range {
......
...@@ -409,7 +409,7 @@ namespace Mqtt_AGI ...@@ -409,7 +409,7 @@ namespace Mqtt_AGI
//protobuf CalcReportRet 回复包 //protobuf CalcReportRet 回复包
CalcReportRet CalcReport = new CalcReportRet(); CalcReportRet CalcReport = new CalcReportRet();
CalcReport.Norad = Tles.NoradNumber_Int32.ToString();
//JObject CalcRetJson = new JObject();//最后返回的预报信息 包含xxd data report //JObject CalcRetJson = new JObject();//最后返回的预报信息 包含xxd data report
//JArray ReportArray = new JArray();//生成report json对象 //JArray ReportArray = new JArray();//生成report json对象
Console.WriteLine("产生圈次任务总数:"+List_Forecast_Dots_Aer_Facility_0.Count); Console.WriteLine("产生圈次任务总数:"+List_Forecast_Dots_Aer_Facility_0.Count);
......
...@@ -37,24 +37,24 @@ namespace Satllite.Protobuf.Agi { ...@@ -37,24 +37,24 @@ namespace Satllite.Protobuf.Agi {
"GAcgASgBEg4KBm1heEF6aRgIIAEoARIOCgZtaW5FbGUYCSABKAESDgoGbWF4", "GAcgASgBEg4KBm1heEF6aRgIIAEoARIOCgZtaW5FbGUYCSABKAESDgoGbWF4",
"RWxlGAogASgBEg8KB21pbkRpc3QYCyABKAESDwoHbWF4RGlzdBgMIAEoARIS", "RWxlGAogASgBEg8KB21pbkRpc3QYCyABKAESDwoHbWF4RGlzdBgMIAEoARIS",
"Cgpwb2ludFNsaWNlGA0gASgBEhQKDHBvaW50Q29sbGVjdBgOIAEoBRINCgVs", "Cgpwb2ludFNsaWNlGA0gASgBEhQKDHBvaW50Q29sbGVjdBgOIAEoBRINCgVs",
"aW5lMBgPIAEoCRINCgVsaW5lMRgQIAEoCRINCgVsaW5lMhgRIAEoCSJlCg1D", "aW5lMBgPIAEoCRINCgVsaW5lMRgQIAEoCRINCgVsaW5lMhgRIAEoCSJ0Cg1D",
"YWxjUmVwb3J0UmV0EigKBHh4ZHMYASADKAsyGi5zYXRsbGl0ZS5wcm90b2J1", "YWxjUmVwb3J0UmV0EigKBHh4ZHMYASADKAsyGi5zYXRsbGl0ZS5wcm90b2J1",
"Zi5hZ2kuWHhkEioKBXRhc2tzGAIgAygLMhsuc2F0bGxpdGUucHJvdG9idWYu", "Zi5hZ2kuWHhkEioKBXRhc2tzGAIgAygLMhsuc2F0bGxpdGUucHJvdG9idWYu",
"YWdpLlRhc2siOwoDWHhkEgoKAmR0GAEgASgJEgsKA2xvbhgCIAEoARILCgNs", "YWdpLlRhc2sSDQoFbm9yYWQYAyABKAkiOwoDWHhkEgoKAmR0GAEgASgJEgsK",
"YXQYAyABKAESDgoGaGVpZ2h0GAQgASgBIrIBCgRUYXNrEg0KBXN0YXJ0GAEg", "A2xvbhgCIAEoARILCgNsYXQYAyABKAESDgoGaGVpZ2h0GAQgASgBIrIBCgRU",
"ASgJEgsKA2VuZBgCIAEoCRIQCghzdGFydEF6aRgDIAEoARIOCgZlbmRBemkY", "YXNrEg0KBXN0YXJ0GAEgASgJEgsKA2VuZBgCIAEoCRIQCghzdGFydEF6aRgD",
"BCABKAESEAoIc3RhcnRFbGUYBSABKAESDgoGbWF4RWxlGAYgASgBEg8KB21p", "IAEoARIOCgZlbmRBemkYBCABKAESEAoIc3RhcnRFbGUYBSABKAESDgoGbWF4",
"bkRpc3QYByABKAESDwoHbWF4RGlzdBgIIAEoARIoCgRvYnNzGAkgAygLMhou", "RWxlGAYgASgBEg8KB21pbkRpc3QYByABKAESDwoHbWF4RGlzdBgIIAEoARIo",
"c2F0bGxpdGUucHJvdG9idWYuYWdpLk9icyI6CgNPYnMSCgoCZHQYASABKAkS", "CgRvYnNzGAkgAygLMhouc2F0bGxpdGUucHJvdG9idWYuYWdpLk9icyI6CgNP",
"CwoDYXppGAIgASgBEgsKA2VsZRgDIAEoARINCgVyYW5nZRgEIAEoAUIMWgou", "YnMSCgoCZHQYASABKAkSCwoDYXppGAIgASgBEgsKA2VsZRgDIAEoARINCgVy",
"Li9wcm90b2dvYgZwcm90bzM=")); "YW5nZRgEIAEoAUIMWgouLi9wcm90b2dvYgZwcm90bzM="));
descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
new pbr::FileDescriptor[] { }, new pbr::FileDescriptor[] { },
new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] { new pbr::GeneratedClrTypeInfo(null, null, new pbr::GeneratedClrTypeInfo[] {
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleReq), global::Satllite.Protobuf.Agi.CalcTleReq.Parser, new[]{ "NoradID", "NoradName", "Year", "Month", "Day", "Hour", "Minute", "Second", "A", "Ee", "I", "Raan", "Arc", "M" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleReq), global::Satllite.Protobuf.Agi.CalcTleReq.Parser, new[]{ "NoradID", "NoradName", "Year", "Month", "Day", "Hour", "Minute", "Second", "A", "Ee", "I", "Raan", "Arc", "M" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleRet), global::Satllite.Protobuf.Agi.CalcTleRet.Parser, new[]{ "Line0", "Line1", "Line2" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcTleRet), global::Satllite.Protobuf.Agi.CalcTleRet.Parser, new[]{ "Line0", "Line1", "Line2" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportReq), global::Satllite.Protobuf.Agi.CalcReportReq.Parser, new[]{ "StartDateTime", "EndDateTime", "Latitude", "Longitude", "Altitude", "Slice", "MinAzi", "MaxAzi", "MinEle", "MaxEle", "MinDist", "MaxDist", "PointSlice", "PointCollect", "Line0", "Line1", "Line2" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportReq), global::Satllite.Protobuf.Agi.CalcReportReq.Parser, new[]{ "StartDateTime", "EndDateTime", "Latitude", "Longitude", "Altitude", "Slice", "MinAzi", "MaxAzi", "MinEle", "MaxEle", "MinDist", "MaxDist", "PointSlice", "PointCollect", "Line0", "Line1", "Line2" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportRet), global::Satllite.Protobuf.Agi.CalcReportRet.Parser, new[]{ "Xxds", "Tasks" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.CalcReportRet), global::Satllite.Protobuf.Agi.CalcReportRet.Parser, new[]{ "Xxds", "Tasks", "Norad" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Xxd), global::Satllite.Protobuf.Agi.Xxd.Parser, new[]{ "Dt", "Lon", "Lat", "Height" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Xxd), global::Satllite.Protobuf.Agi.Xxd.Parser, new[]{ "Dt", "Lon", "Lat", "Height" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Task), global::Satllite.Protobuf.Agi.Task.Parser, new[]{ "Start", "End", "StartAzi", "EndAzi", "StartEle", "MaxEle", "MinDist", "MaxDist", "Obss" }, null, null, null, null), new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Task), global::Satllite.Protobuf.Agi.Task.Parser, new[]{ "Start", "End", "StartAzi", "EndAzi", "StartEle", "MaxEle", "MinDist", "MaxDist", "Obss" }, null, null, null, null),
new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Obs), global::Satllite.Protobuf.Agi.Obs.Parser, new[]{ "Dt", "Azi", "Ele", "Range" }, null, null, null, null) new pbr::GeneratedClrTypeInfo(typeof(global::Satllite.Protobuf.Agi.Obs), global::Satllite.Protobuf.Agi.Obs.Parser, new[]{ "Dt", "Azi", "Ele", "Range" }, null, null, null, null)
...@@ -1928,6 +1928,7 @@ namespace Satllite.Protobuf.Agi { ...@@ -1928,6 +1928,7 @@ namespace Satllite.Protobuf.Agi {
public CalcReportRet(CalcReportRet other) : this() { public CalcReportRet(CalcReportRet other) : this() {
xxds_ = other.xxds_.Clone(); xxds_ = other.xxds_.Clone();
tasks_ = other.tasks_.Clone(); tasks_ = other.tasks_.Clone();
norad_ = other.norad_;
_unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields); _unknownFields = pb::UnknownFieldSet.Clone(other._unknownFields);
} }
...@@ -1965,6 +1966,21 @@ namespace Satllite.Protobuf.Agi { ...@@ -1965,6 +1966,21 @@ namespace Satllite.Protobuf.Agi {
get { return tasks_; } get { return tasks_; }
} }
/// <summary>Field number for the "norad" field.</summary>
public const int NoradFieldNumber = 3;
private string norad_ = "";
/// <summary>
///卫星编号
/// </summary>
[global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public string Norad {
get { return norad_; }
set {
norad_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
}
}
[global::System.Diagnostics.DebuggerNonUserCodeAttribute] [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
[global::System.CodeDom.Compiler.GeneratedCode("protoc", null)] [global::System.CodeDom.Compiler.GeneratedCode("protoc", null)]
public override bool Equals(object other) { public override bool Equals(object other) {
...@@ -1982,6 +1998,7 @@ namespace Satllite.Protobuf.Agi { ...@@ -1982,6 +1998,7 @@ namespace Satllite.Protobuf.Agi {
} }
if(!xxds_.Equals(other.xxds_)) return false; if(!xxds_.Equals(other.xxds_)) return false;
if(!tasks_.Equals(other.tasks_)) return false; if(!tasks_.Equals(other.tasks_)) return false;
if (Norad != other.Norad) return false;
return Equals(_unknownFields, other._unknownFields); return Equals(_unknownFields, other._unknownFields);
} }
...@@ -1991,6 +2008,7 @@ namespace Satllite.Protobuf.Agi { ...@@ -1991,6 +2008,7 @@ namespace Satllite.Protobuf.Agi {
int hash = 1; int hash = 1;
hash ^= xxds_.GetHashCode(); hash ^= xxds_.GetHashCode();
hash ^= tasks_.GetHashCode(); hash ^= tasks_.GetHashCode();
if (Norad.Length != 0) hash ^= Norad.GetHashCode();
if (_unknownFields != null) { if (_unknownFields != null) {
hash ^= _unknownFields.GetHashCode(); hash ^= _unknownFields.GetHashCode();
} }
...@@ -2011,6 +2029,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2011,6 +2029,10 @@ namespace Satllite.Protobuf.Agi {
#else #else
xxds_.WriteTo(output, _repeated_xxds_codec); xxds_.WriteTo(output, _repeated_xxds_codec);
tasks_.WriteTo(output, _repeated_tasks_codec); tasks_.WriteTo(output, _repeated_tasks_codec);
if (Norad.Length != 0) {
output.WriteRawTag(26);
output.WriteString(Norad);
}
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(output); _unknownFields.WriteTo(output);
} }
...@@ -2023,6 +2045,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2023,6 +2045,10 @@ namespace Satllite.Protobuf.Agi {
void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) { void pb::IBufferMessage.InternalWriteTo(ref pb::WriteContext output) {
xxds_.WriteTo(ref output, _repeated_xxds_codec); xxds_.WriteTo(ref output, _repeated_xxds_codec);
tasks_.WriteTo(ref output, _repeated_tasks_codec); tasks_.WriteTo(ref output, _repeated_tasks_codec);
if (Norad.Length != 0) {
output.WriteRawTag(26);
output.WriteString(Norad);
}
if (_unknownFields != null) { if (_unknownFields != null) {
_unknownFields.WriteTo(ref output); _unknownFields.WriteTo(ref output);
} }
...@@ -2035,6 +2061,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2035,6 +2061,9 @@ namespace Satllite.Protobuf.Agi {
int size = 0; int size = 0;
size += xxds_.CalculateSize(_repeated_xxds_codec); size += xxds_.CalculateSize(_repeated_xxds_codec);
size += tasks_.CalculateSize(_repeated_tasks_codec); size += tasks_.CalculateSize(_repeated_tasks_codec);
if (Norad.Length != 0) {
size += 1 + pb::CodedOutputStream.ComputeStringSize(Norad);
}
if (_unknownFields != null) { if (_unknownFields != null) {
size += _unknownFields.CalculateSize(); size += _unknownFields.CalculateSize();
} }
...@@ -2049,6 +2078,9 @@ namespace Satllite.Protobuf.Agi { ...@@ -2049,6 +2078,9 @@ namespace Satllite.Protobuf.Agi {
} }
xxds_.Add(other.xxds_); xxds_.Add(other.xxds_);
tasks_.Add(other.tasks_); tasks_.Add(other.tasks_);
if (other.Norad.Length != 0) {
Norad = other.Norad;
}
_unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields); _unknownFields = pb::UnknownFieldSet.MergeFrom(_unknownFields, other._unknownFields);
} }
...@@ -2072,6 +2104,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2072,6 +2104,10 @@ namespace Satllite.Protobuf.Agi {
tasks_.AddEntriesFrom(input, _repeated_tasks_codec); tasks_.AddEntriesFrom(input, _repeated_tasks_codec);
break; break;
} }
case 26: {
Norad = input.ReadString();
break;
}
} }
} }
#endif #endif
...@@ -2095,6 +2131,10 @@ namespace Satllite.Protobuf.Agi { ...@@ -2095,6 +2131,10 @@ namespace Satllite.Protobuf.Agi {
tasks_.AddEntriesFrom(ref input, _repeated_tasks_codec); tasks_.AddEntriesFrom(ref input, _repeated_tasks_codec);
break; break;
} }
case 26: {
Norad = input.ReadString();
break;
}
} }
} }
} }
......
...@@ -93,7 +93,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT ...@@ -93,7 +93,8 @@ PROTOBUF_ATTRIBUTE_NO_DESTROY PROTOBUF_CONSTINIT PROTOBUF_ATTRIBUTE_INIT_PRIORIT
PROTOBUF_CONSTEXPR CalcReportRet::CalcReportRet( PROTOBUF_CONSTEXPR CalcReportRet::CalcReportRet(
::_pbi::ConstantInitialized) ::_pbi::ConstantInitialized)
: xxds_() : xxds_()
, tasks_(){} , tasks_()
, norad_(&::_pbi::fixed_address_empty_string, ::_pbi::ConstantInitialized{}){}
struct CalcReportRetDefaultTypeInternal { struct CalcReportRetDefaultTypeInternal {
PROTOBUF_CONSTEXPR CalcReportRetDefaultTypeInternal() PROTOBUF_CONSTEXPR CalcReportRetDefaultTypeInternal()
: _instance(::_pbi::ConstantInitialized{}) {} : _instance(::_pbi::ConstantInitialized{}) {}
...@@ -221,6 +222,7 @@ const uint32_t TableStruct_mod_2dagi_2eproto::offsets[] PROTOBUF_SECTION_VARIABL ...@@ -221,6 +222,7 @@ const uint32_t TableStruct_mod_2dagi_2eproto::offsets[] PROTOBUF_SECTION_VARIABL
~0u, // no _inlined_string_donated_ ~0u, // no _inlined_string_donated_
PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::CalcReportRet, xxds_), PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::CalcReportRet, xxds_),
PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::CalcReportRet, tasks_), PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::CalcReportRet, tasks_),
PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::CalcReportRet, norad_),
~0u, // no _has_bits_ ~0u, // no _has_bits_
PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::Xxd, _internal_metadata_), PROTOBUF_FIELD_OFFSET(::satllite::protobuf::agi::Xxd, _internal_metadata_),
~0u, // no _extensions_ ~0u, // no _extensions_
...@@ -262,9 +264,9 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode ...@@ -262,9 +264,9 @@ static const ::_pbi::MigrationSchema schemas[] PROTOBUF_SECTION_VARIABLE(protode
{ 20, -1, -1, sizeof(::satllite::protobuf::agi::CalcTleRet)}, { 20, -1, -1, sizeof(::satllite::protobuf::agi::CalcTleRet)},
{ 29, -1, -1, sizeof(::satllite::protobuf::agi::CalcReportReq)}, { 29, -1, -1, sizeof(::satllite::protobuf::agi::CalcReportReq)},
{ 52, -1, -1, sizeof(::satllite::protobuf::agi::CalcReportRet)}, { 52, -1, -1, sizeof(::satllite::protobuf::agi::CalcReportRet)},
{ 60, -1, -1, sizeof(::satllite::protobuf::agi::Xxd)}, { 61, -1, -1, sizeof(::satllite::protobuf::agi::Xxd)},
{ 70, -1, -1, sizeof(::satllite::protobuf::agi::Task)}, { 71, -1, -1, sizeof(::satllite::protobuf::agi::Task)},
{ 85, -1, -1, sizeof(::satllite::protobuf::agi::Obs)}, { 86, -1, -1, sizeof(::satllite::protobuf::agi::Obs)},
}; };
static const ::_pb::Message* const file_default_instances[] = { static const ::_pb::Message* const file_default_instances[] = {
...@@ -293,22 +295,22 @@ const char descriptor_table_protodef_mod_2dagi_2eproto[] PROTOBUF_SECTION_VARIAB ...@@ -293,22 +295,22 @@ const char descriptor_table_protodef_mod_2dagi_2eproto[] PROTOBUF_SECTION_VARIAB
"le\030\t \001(\001\022\016\n\006maxEle\030\n \001(\001\022\017\n\007minDist\030\013 \001(" "le\030\t \001(\001\022\016\n\006maxEle\030\n \001(\001\022\017\n\007minDist\030\013 \001("
"\001\022\017\n\007maxDist\030\014 \001(\001\022\022\n\npointSlice\030\r \001(\001\022\024" "\001\022\017\n\007maxDist\030\014 \001(\001\022\022\n\npointSlice\030\r \001(\001\022\024"
"\n\014pointCollect\030\016 \001(\005\022\r\n\005line0\030\017 \001(\t\022\r\n\005l" "\n\014pointCollect\030\016 \001(\005\022\r\n\005line0\030\017 \001(\t\022\r\n\005l"
"ine1\030\020 \001(\t\022\r\n\005line2\030\021 \001(\t\"e\n\rCalcReportR" "ine1\030\020 \001(\t\022\r\n\005line2\030\021 \001(\t\"t\n\rCalcReportR"
"et\022(\n\004xxds\030\001 \003(\0132\032.satllite.protobuf.agi" "et\022(\n\004xxds\030\001 \003(\0132\032.satllite.protobuf.agi"
".Xxd\022*\n\005tasks\030\002 \003(\0132\033.satllite.protobuf." ".Xxd\022*\n\005tasks\030\002 \003(\0132\033.satllite.protobuf."
"agi.Task\";\n\003Xxd\022\n\n\002dt\030\001 \001(\t\022\013\n\003lon\030\002 \001(\001" "agi.Task\022\r\n\005norad\030\003 \001(\t\";\n\003Xxd\022\n\n\002dt\030\001 \001"
"\022\013\n\003lat\030\003 \001(\001\022\016\n\006height\030\004 \001(\001\"\262\001\n\004Task\022\r" "(\t\022\013\n\003lon\030\002 \001(\001\022\013\n\003lat\030\003 \001(\001\022\016\n\006height\030\004"
"\n\005start\030\001 \001(\t\022\013\n\003end\030\002 \001(\t\022\020\n\010startAzi\030\003" " \001(\001\"\262\001\n\004Task\022\r\n\005start\030\001 \001(\t\022\013\n\003end\030\002 \001("
" \001(\001\022\016\n\006endAzi\030\004 \001(\001\022\020\n\010startEle\030\005 \001(\001\022\016" "\t\022\020\n\010startAzi\030\003 \001(\001\022\016\n\006endAzi\030\004 \001(\001\022\020\n\010s"
"\n\006maxEle\030\006 \001(\001\022\017\n\007minDist\030\007 \001(\001\022\017\n\007maxDi" "tartEle\030\005 \001(\001\022\016\n\006maxEle\030\006 \001(\001\022\017\n\007minDist"
"st\030\010 \001(\001\022(\n\004obss\030\t \003(\0132\032.satllite.protob" "\030\007 \001(\001\022\017\n\007maxDist\030\010 \001(\001\022(\n\004obss\030\t \003(\0132\032."
"uf.agi.Obs\":\n\003Obs\022\n\n\002dt\030\001 \001(\t\022\013\n\003azi\030\002 \001" "satllite.protobuf.agi.Obs\":\n\003Obs\022\n\n\002dt\030\001"
"(\001\022\013\n\003ele\030\003 \001(\001\022\r\n\005range\030\004 \001(\001B\014Z\n../pro" " \001(\t\022\013\n\003azi\030\002 \001(\001\022\013\n\003ele\030\003 \001(\001\022\r\n\005range\030"
"togob\006proto3" "\004 \001(\001B\014Z\n../protogob\006proto3"
; ;
static ::_pbi::once_flag descriptor_table_mod_2dagi_2eproto_once; static ::_pbi::once_flag descriptor_table_mod_2dagi_2eproto_once;
const ::_pbi::DescriptorTable descriptor_table_mod_2dagi_2eproto = { const ::_pbi::DescriptorTable descriptor_table_mod_2dagi_2eproto = {
false, false, 1052, descriptor_table_protodef_mod_2dagi_2eproto, false, false, 1067, descriptor_table_protodef_mod_2dagi_2eproto,
"mod-agi.proto", "mod-agi.proto",
&descriptor_table_mod_2dagi_2eproto_once, nullptr, 0, 7, &descriptor_table_mod_2dagi_2eproto_once, nullptr, 0, 7,
schemas, file_default_instances, TableStruct_mod_2dagi_2eproto::offsets, schemas, file_default_instances, TableStruct_mod_2dagi_2eproto::offsets,
...@@ -2003,10 +2005,22 @@ CalcReportRet::CalcReportRet(const CalcReportRet& from) ...@@ -2003,10 +2005,22 @@ CalcReportRet::CalcReportRet(const CalcReportRet& from)
xxds_(from.xxds_), xxds_(from.xxds_),
tasks_(from.tasks_) { tasks_(from.tasks_) {
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
norad_.InitDefault();
#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
norad_.Set("", GetArenaForAllocation());
#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
if (!from._internal_norad().empty()) {
norad_.Set(from._internal_norad(),
GetArenaForAllocation());
}
// @@protoc_insertion_point(copy_constructor:satllite.protobuf.agi.CalcReportRet) // @@protoc_insertion_point(copy_constructor:satllite.protobuf.agi.CalcReportRet)
} }
inline void CalcReportRet::SharedCtor() { inline void CalcReportRet::SharedCtor() {
norad_.InitDefault();
#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
norad_.Set("", GetArenaForAllocation());
#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
} }
CalcReportRet::~CalcReportRet() { CalcReportRet::~CalcReportRet() {
...@@ -2020,6 +2034,7 @@ CalcReportRet::~CalcReportRet() { ...@@ -2020,6 +2034,7 @@ CalcReportRet::~CalcReportRet() {
inline void CalcReportRet::SharedDtor() { inline void CalcReportRet::SharedDtor() {
GOOGLE_DCHECK(GetArenaForAllocation() == nullptr); GOOGLE_DCHECK(GetArenaForAllocation() == nullptr);
norad_.Destroy();
} }
void CalcReportRet::SetCachedSize(int size) const { void CalcReportRet::SetCachedSize(int size) const {
...@@ -2034,6 +2049,7 @@ void CalcReportRet::Clear() { ...@@ -2034,6 +2049,7 @@ void CalcReportRet::Clear() {
xxds_.Clear(); xxds_.Clear();
tasks_.Clear(); tasks_.Clear();
norad_.ClearToEmpty();
_internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(); _internal_metadata_.Clear<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>();
} }
...@@ -2069,6 +2085,16 @@ const char* CalcReportRet::_InternalParse(const char* ptr, ::_pbi::ParseContext* ...@@ -2069,6 +2085,16 @@ const char* CalcReportRet::_InternalParse(const char* ptr, ::_pbi::ParseContext*
} else } else
goto handle_unusual; goto handle_unusual;
continue; continue;
// string norad = 3;
case 3:
if (PROTOBUF_PREDICT_TRUE(static_cast<uint8_t>(tag) == 26)) {
auto str = _internal_mutable_norad();
ptr = ::_pbi::InlineGreedyStringParser(str, ptr, ctx);
CHK_(ptr);
CHK_(::_pbi::VerifyUTF8(str, "satllite.protobuf.agi.CalcReportRet.norad"));
} else
goto handle_unusual;
continue;
default: default:
goto handle_unusual; goto handle_unusual;
} // switch } // switch
...@@ -2114,6 +2140,16 @@ uint8_t* CalcReportRet::_InternalSerialize( ...@@ -2114,6 +2140,16 @@ uint8_t* CalcReportRet::_InternalSerialize(
InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream); InternalWriteMessage(2, repfield, repfield.GetCachedSize(), target, stream);
} }
// string norad = 3;
if (!this->_internal_norad().empty()) {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::VerifyUtf8String(
this->_internal_norad().data(), static_cast<int>(this->_internal_norad().length()),
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::SERIALIZE,
"satllite.protobuf.agi.CalcReportRet.norad");
target = stream->WriteStringMaybeAliased(
3, this->_internal_norad(), target);
}
if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) { if (PROTOBUF_PREDICT_FALSE(_internal_metadata_.have_unknown_fields())) {
target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray( target = ::_pbi::WireFormat::InternalSerializeUnknownFieldsToArray(
_internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream); _internal_metadata_.unknown_fields<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(::PROTOBUF_NAMESPACE_ID::UnknownFieldSet::default_instance), target, stream);
...@@ -2144,6 +2180,13 @@ size_t CalcReportRet::ByteSizeLong() const { ...@@ -2144,6 +2180,13 @@ size_t CalcReportRet::ByteSizeLong() const {
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg); ::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::MessageSize(msg);
} }
// string norad = 3;
if (!this->_internal_norad().empty()) {
total_size += 1 +
::PROTOBUF_NAMESPACE_ID::internal::WireFormatLite::StringSize(
this->_internal_norad());
}
return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_); return MaybeComputeUnknownFieldsSize(total_size, &_cached_size_);
} }
...@@ -2168,6 +2211,9 @@ void CalcReportRet::MergeFrom(const CalcReportRet& from) { ...@@ -2168,6 +2211,9 @@ void CalcReportRet::MergeFrom(const CalcReportRet& from) {
xxds_.MergeFrom(from.xxds_); xxds_.MergeFrom(from.xxds_);
tasks_.MergeFrom(from.tasks_); tasks_.MergeFrom(from.tasks_);
if (!from._internal_norad().empty()) {
_internal_set_norad(from._internal_norad());
}
_internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_); _internal_metadata_.MergeFrom<::PROTOBUF_NAMESPACE_ID::UnknownFieldSet>(from._internal_metadata_);
} }
...@@ -2184,9 +2230,15 @@ bool CalcReportRet::IsInitialized() const { ...@@ -2184,9 +2230,15 @@ bool CalcReportRet::IsInitialized() const {
void CalcReportRet::InternalSwap(CalcReportRet* other) { void CalcReportRet::InternalSwap(CalcReportRet* other) {
using std::swap; using std::swap;
auto* lhs_arena = GetArenaForAllocation();
auto* rhs_arena = other->GetArenaForAllocation();
_internal_metadata_.InternalSwap(&other->_internal_metadata_); _internal_metadata_.InternalSwap(&other->_internal_metadata_);
xxds_.InternalSwap(&other->xxds_); xxds_.InternalSwap(&other->xxds_);
tasks_.InternalSwap(&other->tasks_); tasks_.InternalSwap(&other->tasks_);
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr::InternalSwap(
&norad_, lhs_arena,
&other->norad_, rhs_arena
);
} }
::PROTOBUF_NAMESPACE_ID::Metadata CalcReportRet::GetMetadata() const { ::PROTOBUF_NAMESPACE_ID::Metadata CalcReportRet::GetMetadata() const {
......
...@@ -1022,6 +1022,7 @@ class CalcReportRet final : ...@@ -1022,6 +1022,7 @@ class CalcReportRet final :
enum : int { enum : int {
kXxdsFieldNumber = 1, kXxdsFieldNumber = 1,
kTasksFieldNumber = 2, kTasksFieldNumber = 2,
kNoradFieldNumber = 3,
}; };
// repeated .satllite.protobuf.agi.Xxd xxds = 1; // repeated .satllite.protobuf.agi.Xxd xxds = 1;
int xxds_size() const; int xxds_size() const;
...@@ -1059,6 +1060,20 @@ class CalcReportRet final : ...@@ -1059,6 +1060,20 @@ class CalcReportRet final :
const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::satllite::protobuf::agi::Task >& const ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::satllite::protobuf::agi::Task >&
tasks() const; tasks() const;
// string norad = 3;
void clear_norad();
const std::string& norad() const;
template <typename ArgT0 = const std::string&, typename... ArgT>
void set_norad(ArgT0&& arg0, ArgT... args);
std::string* mutable_norad();
PROTOBUF_NODISCARD std::string* release_norad();
void set_allocated_norad(std::string* norad);
private:
const std::string& _internal_norad() const;
inline PROTOBUF_ALWAYS_INLINE void _internal_set_norad(const std::string& value);
std::string* _internal_mutable_norad();
public:
// @@protoc_insertion_point(class_scope:satllite.protobuf.agi.CalcReportRet) // @@protoc_insertion_point(class_scope:satllite.protobuf.agi.CalcReportRet)
private: private:
class _Internal; class _Internal;
...@@ -1068,6 +1083,7 @@ class CalcReportRet final : ...@@ -1068,6 +1083,7 @@ class CalcReportRet final :
typedef void DestructorSkippable_; typedef void DestructorSkippable_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::satllite::protobuf::agi::Xxd > xxds_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::satllite::protobuf::agi::Xxd > xxds_;
::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::satllite::protobuf::agi::Task > tasks_; ::PROTOBUF_NAMESPACE_ID::RepeatedPtrField< ::satllite::protobuf::agi::Task > tasks_;
::PROTOBUF_NAMESPACE_ID::internal::ArenaStringPtr norad_;
mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_; mutable ::PROTOBUF_NAMESPACE_ID::internal::CachedSize _cached_size_;
friend struct ::TableStruct_mod_2dagi_2eproto; friend struct ::TableStruct_mod_2dagi_2eproto;
}; };
...@@ -2736,6 +2752,56 @@ CalcReportRet::tasks() const { ...@@ -2736,6 +2752,56 @@ CalcReportRet::tasks() const {
return tasks_; return tasks_;
} }
// string norad = 3;
inline void CalcReportRet::clear_norad() {
norad_.ClearToEmpty();
}
inline const std::string& CalcReportRet::norad() const {
// @@protoc_insertion_point(field_get:satllite.protobuf.agi.CalcReportRet.norad)
return _internal_norad();
}
template <typename ArgT0, typename... ArgT>
inline PROTOBUF_ALWAYS_INLINE
void CalcReportRet::set_norad(ArgT0&& arg0, ArgT... args) {
norad_.Set(static_cast<ArgT0 &&>(arg0), args..., GetArenaForAllocation());
// @@protoc_insertion_point(field_set:satllite.protobuf.agi.CalcReportRet.norad)
}
inline std::string* CalcReportRet::mutable_norad() {
std::string* _s = _internal_mutable_norad();
// @@protoc_insertion_point(field_mutable:satllite.protobuf.agi.CalcReportRet.norad)
return _s;
}
inline const std::string& CalcReportRet::_internal_norad() const {
return norad_.Get();
}
inline void CalcReportRet::_internal_set_norad(const std::string& value) {
norad_.Set(value, GetArenaForAllocation());
}
inline std::string* CalcReportRet::_internal_mutable_norad() {
return norad_.Mutable(GetArenaForAllocation());
}
inline std::string* CalcReportRet::release_norad() {
// @@protoc_insertion_point(field_release:satllite.protobuf.agi.CalcReportRet.norad)
return norad_.Release();
}
inline void CalcReportRet::set_allocated_norad(std::string* norad) {
if (norad != nullptr) {
} else {
}
norad_.SetAllocated(norad, GetArenaForAllocation());
#ifdef PROTOBUF_FORCE_COPY_DEFAULT_STRING
if (norad_.IsDefault()) {
norad_.Set("", GetArenaForAllocation());
}
#endif // PROTOBUF_FORCE_COPY_DEFAULT_STRING
// @@protoc_insertion_point(field_set_allocated:satllite.protobuf.agi.CalcReportRet.norad)
}
// ------------------------------------------------------------------- // -------------------------------------------------------------------
// Xxd // Xxd
......
...@@ -48,6 +48,7 @@ message CalcReportReq{ ...@@ -48,6 +48,7 @@ message CalcReportReq{
message CalcReportRet{ message CalcReportRet{
repeated Xxd xxds = 1; //星下点 repeated Xxd xxds = 1; //星下点
repeated Task tasks = 2; //任务预报信息 repeated Task tasks = 2; //任务预报信息
string norad=3; //卫星编号
} }
//星下点 //星下点
message Xxd{ message Xxd{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment